turn zoom into a toggle rather than an explicit zoom/unzoom

include/ghostty.h

@@ -262,7 +262,7 @@ typedef void (*ghostty_runtime_new_tab_cb)(void *, ghostty_surface_config_s);
 typedef void (*ghostty_runtime_new_window_cb)(void *, ghostty_surface_config_s);
 typedef void (*ghostty_runtime_close_surface_cb)(void *, bool);
 typedef void (*ghostty_runtime_focus_split_cb)(void *, ghostty_split_focus_direction_e);
-typedef void (*ghostty_runtime_zoom_split_cb)(void *, bool);
+typedef void (*ghostty_runtime_toggle_split_zoom_cb)(void *);
 typedef void (*ghostty_runtime_goto_tab_cb)(void *, int32_t);
 typedef void (*ghostty_runtime_toggle_fullscreen_cb)(void *, ghostty_non_native_fullscreen_e);
 
@@ -279,7 +279,7 @@ typedef struct {
     ghostty_runtime_new_window_cb new_window_cb;
     ghostty_runtime_close_surface_cb close_surface_cb;
     ghostty_runtime_focus_split_cb focus_split_cb;
-    ghostty_runtime_zoom_split_cb zoom_split_cb;
+    ghostty_runtime_toggle_split_zoom_cb toggle_split_zoom_cb;
     ghostty_runtime_goto_tab_cb goto_tab_cb;
     ghostty_runtime_toggle_fullscreen_cb toggle_fullscreen_cb;
 } ghostty_runtime_config_s;

macos/Sources/Ghostty/AppState.swift

@@ -73,7 +73,7 @@ extension Ghostty {
                 new_window_cb: { userdata, surfaceConfig in AppState.newWindow(userdata, config: surfaceConfig) },
                 close_surface_cb: { userdata, processAlive in AppState.closeSurface(userdata, processAlive: processAlive) },
                 focus_split_cb: { userdata, direction in AppState.focusSplit(userdata, direction: direction) },
-                zoom_split_cb: { userdata, zoom in AppState.zoomSplit(userdata, zoom: zoom) },
+                toggle_split_zoom_cb: { userdata in AppState.toggleSplitZoom(userdata) },
                 goto_tab_cb: { userdata, n in AppState.gotoTab(userdata, n: n) },
                 toggle_fullscreen_cb: { userdata, nonNativeFullscreen in AppState.toggleFullscreen(userdata, nonNativeFullscreen: nonNativeFullscreen) }
             )
@@ -206,16 +206,11 @@ extension Ghostty {
             )
         }
         
-        static func zoomSplit(_ userdata: UnsafeMutableRawPointer?, zoom: Bool) {
+        static func toggleSplitZoom(_ userdata: UnsafeMutableRawPointer?) {
             guard let surface = self.surfaceUserdata(from: userdata) else { return }
             
-            var name = Notification.didZoomSplit
-            if (!zoom) {
-                name = Notification.didZoomResetSplit
-            }
-            
             NotificationCenter.default.post(
-                name: name,
+                name: Notification.didToggleSplitZoom,
                 object: surface
             )
         }

macos/Sources/Ghostty/Ghostty.SplitView.swift

@@ -199,14 +199,13 @@ extension Ghostty {
         
         var body: some View {
             let center = NotificationCenter.default
+            let pubZoom = center.publisher(for: Notification.didToggleSplitZoom)
             
             // If we're zoomed, we don't render anything, we are transparent. This
             // ensures that the View stays around so we don't lose our state, but
             // also that the zoomed view on top can see through if background transparency
             // is enabled.
             if (zoomedSurface == nil) {
-                let pubZoom = center.publisher(for: Notification.didZoomSplit)
-                
                 ZStack {
                     switch (node) {
                     case .noSplit(let leaf):
@@ -248,11 +247,8 @@ extension Ghostty {
                 }
                 .navigationTitle(surfaceTitle ?? "Ghostty")
             } else {
-                // If we're zoomed, we want to listen for zoom resets.
-                let pubZoomReset = center.publisher(for: Notification.didZoomResetSplit)
-                
                 ZStack {}
-                    .onReceive(pubZoomReset) { onZoomReset(notification: $0) }
+                    .onReceive(pubZoom) { onZoomReset(notification: $0) }
             }
         }
         

macos/Sources/Ghostty/Package.swift

@@ -96,11 +96,8 @@ extension Ghostty.Notification {
     /// work around bugs. macOS 13+ should use the ".focused()" attribute.
     static let didBecomeFocusedSurface = Notification.Name("com.mitchellh.ghostty.didBecomeFocusedSurface")
     
-    /// Notification that a surface is being zoomed or unzoomed. Note that these are sent
+    /// Notification sent to toggle split maximize/unmaximize.
-    /// regardless of if the surface is part of a split or not. It is up to the receiver to validate
+    static let didToggleSplitZoom = Notification.Name("com.mitchellh.ghostty.didToggleSplitZoom")
-    /// this.
-    static let didZoomSplit = Notification.Name("com.mitchellh.ghostty.didZoomSplit")
-    static let didZoomResetSplit = Notification.Name("com.mitchellh.ghostty.didZoomResetSplit")
 }
 
 // Make the input enum hashable.

src/Surface.zig

@@ -2118,16 +2118,10 @@ pub fn performBindingAction(self: *Surface, action: input.Binding.Action) !void
             } else log.warn("runtime doesn't implement gotoSplit", .{});
         },
 
-        .zoom_split => {
+        .toggle_split_zoom => {
-            if (@hasDecl(apprt.Surface, "zoomSplit")) {
+            if (@hasDecl(apprt.Surface, "toggleSplitZoom")) {
-                self.rt_surface.zoomSplit(true);
+                self.rt_surface.toggleSplitZoom();
-            } else log.warn("runtime doesn't implement zoomSplit", .{});
+            } else log.warn("runtime doesn't implement toggleSplitZoom", .{});
-        },
-
-        .unzoom_split => {
-            if (@hasDecl(apprt.Surface, "zoomSplit")) {
-                self.rt_surface.zoomSplit(false);
-            } else log.warn("runtime doesn't implement zoomSplit", .{});
         },
 
         .toggle_fullscreen => {

src/apprt/embedded.zig

@@ -73,7 +73,7 @@ pub const App = struct {
         focus_split: ?*const fn (SurfaceUD, input.SplitFocusDirection) callconv(.C) void = null,
 
         /// Zoom the current split.
-        zoom_split: ?*const fn (SurfaceUD, bool) callconv(.C) void = null,
+        toggle_split_zoom: ?*const fn (SurfaceUD) callconv(.C) void = null,
 
         /// Goto tab
         goto_tab: ?*const fn (SurfaceUD, usize) callconv(.C) void = null,
@@ -273,13 +273,13 @@ pub const Surface = struct {
         func(self.opts.userdata, direction);
     }
 
-    pub fn zoomSplit(self: *const Surface, zoom: bool) void {
+    pub fn toggleSplitZoom(self: *const Surface) void {
-        const func = self.app.opts.zoom_split orelse {
+        const func = self.app.opts.toggle_split_zoom orelse {
-            log.info("runtime embedder does not support zoom split", .{});
+            log.info("runtime embedder does not support split zoom", .{});
             return;
         };
 
-        func(self.opts.userdata, zoom);
+        func(self.opts.userdata);
     }
 
     pub fn getContentScale(self: *const Surface) !apprt.ContentScale {

src/config.zig

@@ -563,6 +563,13 @@ pub const Config = struct {
             .{ .toggle_fullscreen = {} },
         );
 
+        // Toggle zoom a split
+        try result.keybind.set.put(
+            alloc,
+            .{ .key = .enter, .mods = ctrlOrSuper(.{ .shift = true }) },
+            .{ .toggle_split_zoom = {} },
+        );
+
         // Mac-specific keyboard bindings.
         if (comptime builtin.target.isDarwin()) {
             try result.keybind.set.put(
@@ -682,17 +689,6 @@ pub const Config = struct {
                 .{ .key = .right, .mods = .{ .super = true, .alt = true } },
                 .{ .goto_split = .right },
             );
-
-            try result.keybind.set.put(
-                alloc,
-                .{ .key = .equal, .mods = .{ .super = true, .shift = true } },
-                .{ .zoom_split = {} },
-            );
-            try result.keybind.set.put(
-                alloc,
-                .{ .key = .minus, .mods = .{ .super = true, .shift = true } },
-                .{ .unzoom_split = {} },
-            );
         }
 
         return result;

src/input/Binding.zig

@@ -158,9 +158,8 @@ pub const Action = union(enum) {
     /// Focus on a split in a given direction.
     goto_split: SplitFocusDirection,
 
-    /// Zoom and unzoom the current split.
+    /// zoom/unzoom the current split.
-    zoom_split: void,
+    toggle_split_zoom: void,
-    unzoom_split: void,
 
     /// Reload the configuration. The exact meaning depends on the app runtime
     /// in use but this usually involves re-reading the configuration file