From 10198d88dcab0d660422f9addf83e826d0890f28 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 19 Jul 2024 20:16:17 -0700
Subject: [PATCH] core: make the write scrollback file logic more generic

---
 src/Surface.zig | 125 +++++++++++++++++++++++++++++-------------------
 1 file changed, 76 insertions(+), 49 deletions(-)

diff --git a/src/Surface.zig b/src/Surface.zig
index 351f61c5f..b4fcc2a10 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -3324,55 +3324,10 @@ pub fn performBindingAction(self: *Surface, action: input.Binding.Action) !bool
             }, .unlocked);
         },
 
-        .write_scrollback_file => |write_action| write_scrollback_file: {
-            // Create a temporary directory to store our scrollback.
-            var tmp_dir = try internal_os.TempDir.init();
-            errdefer tmp_dir.deinit();
-
-            // Open our scrollback file
-            var file = try tmp_dir.dir.createFile("scrollback", .{});
-            defer file.close();
-            // Screen.dumpString writes byte-by-byte, so buffer it
-            var buf_writer = std.io.bufferedWriter(file.writer());
-
-            // Write the scrollback contents. This requires a lock.
-            {
-                self.renderer_state.mutex.lock();
-                defer self.renderer_state.mutex.unlock();
-
-                // We do not support this for alternate screens
-                // because they don't have scrollback anyways.
-                if (self.io.terminal.active_screen == .alternate) {
-                    tmp_dir.deinit();
-                    break :write_scrollback_file;
-                }
-
-                // We only dump history if we have history. We still keep
-                // the file and write the empty file to the pty so that this
-                // command always works on the primary screen.
-                const pages = &self.io.terminal.screen.pages;
-                if (pages.getBottomRight(.active)) |br| {
-                    const tl = pages.getTopLeft(.history);
-                    try self.io.terminal.screen.dumpString(
-                        buf_writer.writer(),
-                        .{ .tl = tl, .br = br, .unwrap = true },
-                    );
-                }
-            }
-            try buf_writer.flush();
-
-            // Get the final path
-            var path_buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
-            const path = try tmp_dir.dir.realpath("scrollback", &path_buf);
-
-            switch (write_action) {
-                .open => try internal_os.open(self.alloc, path),
-                .paste => self.io.queueMessage(try termio.Message.writeReq(
-                    self.alloc,
-                    path,
-                ), .unlocked),
-            }
-        },
+        .write_scrollback_file => |v| try self.writeScreenFile(
+            .history,
+            v,
+        ),
 
         .new_window => try self.app.newWindow(self.rt_app, .{ .parent = self }),
 
@@ -3550,6 +3505,78 @@ fn closingAction(action: input.Binding.Action) bool {
     };
 }
 
+/// The portion of the screen to write for writeScreenFile.
+const WriteScreenLoc = enum {
+    history,
+};
+
+fn writeScreenFile(
+    self: *Surface,
+    loc: WriteScreenLoc,
+    write_action: input.Binding.Action.WriteScreenAction,
+) !void {
+    // Create a temporary directory to store our scrollback.
+    var tmp_dir = try internal_os.TempDir.init();
+    errdefer tmp_dir.deinit();
+
+    // Open our scrollback file
+    var file = try tmp_dir.dir.createFile(@tagName(loc), .{});
+    defer file.close();
+    // Screen.dumpString writes byte-by-byte, so buffer it
+    var buf_writer = std.io.bufferedWriter(file.writer());
+
+    // Write the scrollback contents. This requires a lock.
+    {
+        self.renderer_state.mutex.lock();
+        defer self.renderer_state.mutex.unlock();
+
+        // We only dump history if we have history. We still keep
+        // the file and write the empty file to the pty so that this
+        // command always works on the primary screen.
+        const pages = &self.io.terminal.screen.pages;
+        const tl: terminal.Pin, const br: ?terminal.Pin = switch (loc) {
+            .history => history: {
+                // We do not support this for alternate screens
+                // because they don't have scrollback anyways.
+                if (self.io.terminal.active_screen == .alternate) {
+                    tmp_dir.deinit();
+                    return;
+                }
+
+                break :history .{
+                    pages.getTopLeft(.history),
+                    pages.getBottomRight(.history),
+                };
+            },
+        };
+
+        try self.io.terminal.screen.dumpString(
+            buf_writer.writer(),
+            .{
+                .tl = tl,
+                .br = br orelse {
+                    tmp_dir.deinit();
+                    return;
+                },
+                .unwrap = true,
+            },
+        );
+    }
+    try buf_writer.flush();
+
+    // Get the final path
+    var path_buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
+    const path = try tmp_dir.dir.realpath(@tagName(loc), &path_buf);
+
+    switch (write_action) {
+        .open => try internal_os.open(self.alloc, path),
+        .paste => self.io.queueMessage(try termio.Message.writeReq(
+            self.alloc,
+            path,
+        ), .unlocked),
+    }
+}
+
 /// Call this to complete a clipboard request sent to apprt. This should
 /// only be called once for each request. The data is immediately copied so
 /// it is safe to free the data after this call.