From 2489ef4c13e8e0a8e3d724cf942e86a1329d1061 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sat, 11 Nov 2023 15:15:52 -0800
Subject: [PATCH] stylistic tweaks

---
 macos/Sources/Ghostty/AppState.swift | 19 ++++++++++---------
 src/Surface.zig                      | 14 ++++++++++++--
 src/apprt/embedded.zig               |  4 +---
 src/apprt/gtk/Surface.zig            | 19 ++++++++++---------
 4 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/macos/Sources/Ghostty/AppState.swift b/macos/Sources/Ghostty/AppState.swift
index f7c3d3bff..0b61fbcb6 100644
--- a/macos/Sources/Ghostty/AppState.swift
+++ b/macos/Sources/Ghostty/AppState.swift
@@ -472,16 +472,17 @@ extension Ghostty {
                 let pb = NSPasteboard.general
                 pb.declareTypes([.string], owner: nil)
                 pb.setString(valueStr, forType: .string)
-            } else {
-                NotificationCenter.default.post(
-                    name: Notification.confirmClipboard,
-                    object: surface,
-                    userInfo: [
-                        Notification.ConfirmClipboardStrKey: valueStr,
-                        Notification.ConfirmClipboardRequestKey: Ghostty.ClipboardRequest.osc_52_write,
-                    ]
-                )
+                return
             }
+            
+            NotificationCenter.default.post(
+                name: Notification.confirmClipboard,
+                object: surface,
+                userInfo: [
+                    Notification.ConfirmClipboardStrKey: valueStr,
+                    Notification.ConfirmClipboardRequestKey: Ghostty.ClipboardRequest.osc_52_write,
+                ]
+            )
         }
 
         static func reloadConfig(_ userdata: UnsafeMutableRawPointer?) -> ghostty_config_t? {
diff --git a/src/Surface.zig b/src/Surface.zig
index 7ce729a97..38d1c6bcb 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -2532,8 +2532,18 @@ pub fn completeClipboardRequest(
 ) !void {
     switch (req) {
         .paste => try self.completeClipboardPaste(data, confirmed),
-        .osc_52_read => |clipboard| try self.completeClipboardReadOSC52(data, clipboard, confirmed),
-        .osc_52_write => |clipboard| try self.rt_surface.setClipboardString(data, clipboard, !confirmed),
+
+        .osc_52_read => |clipboard| try self.completeClipboardReadOSC52(
+            data,
+            clipboard,
+            confirmed,
+        ),
+
+        .osc_52_write => |clipboard| try self.rt_surface.setClipboardString(
+            data,
+            clipboard,
+            !confirmed,
+        ),
     }
 }
 
diff --git a/src/apprt/embedded.zig b/src/apprt/embedded.zig
index 7d239e99f..2e417a92e 100644
--- a/src/apprt/embedded.zig
+++ b/src/apprt/embedded.zig
@@ -507,8 +507,6 @@ pub const Surface = struct {
     ) void {
         const alloc = self.app.core_app.alloc;
 
-        const request_type: apprt.ClipboardRequestType = state.*;
-
         // Attempt to complete the request, but we may request
         // confirmation.
         self.core_surface.completeClipboardRequest(
@@ -523,7 +521,7 @@ pub const Surface = struct {
                     self.opts.userdata,
                     str.ptr,
                     state,
-                    request_type,
+                    state.*,
                 );
 
                 return;
diff --git a/src/apprt/gtk/Surface.zig b/src/apprt/gtk/Surface.zig
index 9cc253b63..ec7e99196 100644
--- a/src/apprt/gtk/Surface.zig
+++ b/src/apprt/gtk/Surface.zig
@@ -520,16 +520,17 @@ pub fn setClipboardString(
     if (!confirm) {
         const clipboard = getClipboard(@ptrCast(self.gl_area), clipboard_type);
         c.gdk_clipboard_set_text(clipboard, val.ptr);
-    } else {
-        ClipboardConfirmationWindow.create(
-            self.app,
-            val,
-            self.core_surface,
-            .{ .osc_52_write = clipboard_type },
-        ) catch |window_err| {
-            log.err("failed to create clipboard confirmation window err={}", .{window_err});
-        };
+        return;
     }
+
+    ClipboardConfirmationWindow.create(
+        self.app,
+        val,
+        self.core_surface,
+        .{ .osc_52_write = clipboard_type },
+    ) catch |window_err| {
+        log.err("failed to create clipboard confirmation window err={}", .{window_err});
+    };
 }
 
 const ClipboardRequest = struct {