From e8e362b92b5d847ef011e0adefb96a12be1326d4 Mon Sep 17 00:00:00 2001
From: pnodet <paul.nodet@gmail.com>
Date: Sun, 29 Dec 2024 02:54:04 +0100
Subject: [PATCH] chore: cleanup and improve mem handling

---
 src/Surface.zig             | 12 +++++-------
 src/apprt/glfw.zig          | 17 ++++++++++-------
 src/terminal/closedtabs.zig | 16 +++++-----------
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/Surface.zig b/src/Surface.zig
index 12adde808..175a1f9ce 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -727,27 +727,25 @@ pub fn close(self: *Surface) void {
     // Save tab data before closing
     const cwd = self.io.terminal.getPwd();
     const cwd_copy = if (cwd) |c| self.alloc.dupe(u8, c) catch null else null;
+    errdefer if (cwd_copy) |c| self.alloc.free(c);
 
     const title = self.rt_surface.getTitle();
     const title_copy = if (title) |t| self.alloc.dupe(u8, t) catch null else null;
+    errdefer if (title_copy) |t| self.alloc.free(t);
 
     // Save terminal contents including scrollback buffer
     const contents = self.io.terminal.screen.dumpStringAlloc(self.alloc, .{ .screen = .{} }) catch null;
+    errdefer if (contents) |c| self.alloc.free(c);
 
     // Save to last closed tabs
     self.app.last_closed_tabs.push(.{
         .title = title_copy,
         .cwd = cwd_copy,
         .contents = contents,
-    }, self.alloc);
-
-    log.debug("closing tab - pwd: {s}, title: {s}", .{
-        cwd_copy orelse "(null)",
-        title_copy orelse "(null)",
     });
 
-    log.debug("close from surface ptr={X}", .{@intFromPtr(self)});
-    self.rt_surface.close(self.needsConfirmQuit());
+    // Close the surface
+    self.rt_surface.close(true);
 }
 
 /// Forces the surface to render. This is useful for when the surface
diff --git a/src/apprt/glfw.zig b/src/apprt/glfw.zig
index ad0548c3a..a460c78f6 100644
--- a/src/apprt/glfw.zig
+++ b/src/apprt/glfw.zig
@@ -363,27 +363,27 @@ pub const App = struct {
             return;
         };
 
-        // Get the last closed tab from the app-level storage
-        const last_tab: LastClosedTab = parent.app.last_closed_tabs.pop() orelse {
+        const last_tab_opt = parent.app.last_closed_tabs.pop() orelse {
             log.warn("No last closed tab found", .{});
             return;
         };
 
-        // Create a new tab
+        // Make a mutable copy
+        var last_tab = last_tab_opt;
+        defer last_tab.deinit(parent.app.alloc);
+
         const window = try self.newSurface(parent);
 
-        // Set the working directory and title if available
         if (last_tab.cwd) |cwd| {
             try window.core_surface.io.terminal.setPwd(cwd);
         }
+
         if (last_tab.title) |title| {
-            // Ensure we have a null-terminated string for the title
             const title_z = try window.core_surface.alloc.dupeZ(u8, title);
-            errdefer window.core_surface.alloc.free(title_z);
+            defer window.core_surface.alloc.free(title_z);
             try window.core_surface.rt_surface.setTitle(title_z);
         }
 
-        // Restore terminal contents if available
         if (last_tab.contents) |contents| {
             try window.core_surface.io.terminal.printString(contents);
         }
@@ -656,6 +656,9 @@ pub const Surface = struct {
     }
 
     pub fn deinit(self: *Surface) void {
+        // Free the title text if it exists
+        if (self.title_text) |t| self.core_surface.alloc.free(t);
+
         // Remove ourselves from the list of known surfaces in the app.
         self.app.app.deleteSurface(self);
 
diff --git a/src/terminal/closedtabs.zig b/src/terminal/closedtabs.zig
index 7744c97f4..705fe8364 100644
--- a/src/terminal/closedtabs.zig
+++ b/src/terminal/closedtabs.zig
@@ -18,16 +18,14 @@ pub const LastClosedTab = struct {
 pub const LastClosedTabs = struct {
     this: std.BoundedArray(LastClosedTab, max_closed_tabs) = std.BoundedArray(LastClosedTab, max_closed_tabs).init(0) catch unreachable,
 
-    pub fn push(self: *LastClosedTabs, tab: LastClosedTab, alloc: Allocator) void {
+    pub fn push(self: *LastClosedTabs, tab: LastClosedTab) void {
         if (self.this.len == max_closed_tabs) {
             // Remove oldest tab and free its memory
-            self.this.buffer[0].deinit(alloc);
+            self.this.buffer[0] = tab;
             // Shift all elements left
             for (0..self.this.len - 1) |i| {
                 self.this.buffer[i] = self.this.buffer[i + 1];
             }
-            // Add new tab at the end
-            self.this.buffer[self.this.len - 1] = tab;
         } else {
             self.this.append(tab) catch unreachable;
         }
@@ -41,17 +39,13 @@ pub const LastClosedTabs = struct {
     }
 
     pub fn get(self: *LastClosedTabs, index: usize) ?*LastClosedTab {
-        return self.this.get(index);
-    }
-
-    pub fn len(self: *LastClosedTabs) usize {
-        return self.this.len;
+        if (index >= self.this.len) return null;
+        return &self.this.buffer[index];
     }
 
     pub fn pop(self: *LastClosedTabs) ?LastClosedTab {
         if (self.this.len == 0) return null;
-        const last = self.this.buffer[self.this.len - 1];
         self.this.len -= 1;
-        return last;
+        return self.this.buffer[self.this.len];
     }
 };