Merge pull request #2485 from axdank/move_current_Tab

gui: add move_current_tab action

src/Surface.zig

@@ -3913,6 +3913,12 @@ pub fn performBindingAction(self: *Surface, action: input.Binding.Action) !bool
             },
         ),
 
+        .move_tab => |position| try self.rt_app.performAction(
+            .{ .surface = self },
+            .move_tab,
+            .{ .amount = position },
+        ),
+
         .new_split => |direction| try self.rt_app.performAction(
             .{ .surface = self },
             .new_split,

src/apprt/action.zig

@@ -100,6 +100,13 @@ pub const Action = union(Key) {
     /// Toggle the visibility of all Ghostty terminal windows.
     toggle_visibility,
 
+    /// Moves a tab by a relative offset.
+    ///
+    /// Adjusts the tab position based on `offset` (e.g., -1 for left, +1
+    /// for right). If the new position is out of bounds, it wraps around
+    /// cyclically within the tab range.
+    move_tab: MoveTab,
+
     /// Jump to a specific tab. Must handle the scenario that the tab
     /// value is invalid.
     goto_tab: GotoTab,
@@ -190,6 +197,7 @@ pub const Action = union(Key) {
         toggle_window_decorations,
         toggle_quick_terminal,
         toggle_visibility,
+        move_tab,
         goto_tab,
         goto_split,
         resize_split,
@@ -308,6 +316,10 @@ pub const ResizeSplit = extern struct {
     };
 };
 
+pub const MoveTab = extern struct {
+    amount: isize,
+};
+
 /// The tab to jump to. This is non-exhaustive so that integer values represent
 /// the index (zero-based) of the tab to jump to. Negative values are special
 /// values.

src/apprt/glfw.zig

@@ -213,6 +213,7 @@ pub const App = struct {
             .toggle_quick_terminal,
             .toggle_visibility,
             .goto_tab,
+            .move_tab,
             .inspector,
             .render_inspector,
             .quit_timer,

src/apprt/gtk/App.zig

@@ -456,6 +456,7 @@ pub fn performAction(
 
         .new_tab => try self.newTab(target),
         .goto_tab => self.gotoTab(target, value),
+        .move_tab => self.moveTab(target, value),
         .new_split => try self.newSplit(target, value),
         .resize_split => self.resizeSplit(target, value),
         .equalize_splits => self.equalizeSplits(target),
@@ -527,6 +528,23 @@ fn gotoTab(_: *App, target: apprt.Target, tab: apprt.action.GotoTab) void {
     }
 }
 
+fn moveTab(_: *App, target: apprt.Target, move_tab: apprt.action.MoveTab) void {
+    switch (target) {
+        .app => {},
+        .surface => |v| {
+            const window = v.rt_surface.container.window() orelse {
+                log.info(
+                    "moveTab invalid for container={s}",
+                    .{@tagName(v.rt_surface.container)},
+                );
+                return;
+            };
+
+            window.moveTab(v.rt_surface, @intCast(move_tab.amount));
+        },
+    }
+}
+
 fn newSplit(
     self: *App,
     target: apprt.Target,

src/apprt/gtk/Window.zig

@@ -456,6 +456,15 @@ pub fn gotoNextTab(self: *Window, surface: *Surface) void {
     self.focusCurrentTab();
 }
 
+/// Move the current tab for a surface.
+pub fn moveTab(self: *Window, surface: *Surface, position: c_int) void {
+    const tab = surface.container.tab() orelse {
+        log.info("surface is not attached to a tab bar, cannot navigate", .{});
+        return;
+    };
+    self.notebook.moveTab(tab, position);
+}
+
 /// Go to the next tab for a surface.
 pub fn gotoLastTab(self: *Window) void {
     const max = self.notebook.nPages() -| 1;

src/apprt/gtk/notebook.zig

@@ -183,6 +183,35 @@ pub const Notebook = union(enum) {
         self.gotoNthTab(next_idx);
     }
 
+    pub fn moveTab(self: Notebook, tab: *Tab, position: c_int) void {
+        const page_idx = self.getTabPosition(tab) orelse return;
+
+        const max = self.nPages() -| 1;
+        var new_position: c_int = page_idx + position;
+
+        if (new_position < 0) {
+            new_position = max + new_position + 1;
+        } else if (new_position > max) {
+            new_position = new_position - max - 1;
+        }
+
+        if (new_position == page_idx) return;
+        self.reorderPage(tab, new_position);
+    }
+
+    pub fn reorderPage(self: Notebook, tab: *Tab, position: c_int) void {
+        switch (self) {
+            .gtk_notebook => |notebook| {
+                c.gtk_notebook_reorder_child(notebook, @ptrCast(tab.box), position);
+            },
+            .adw_tab_view => |tab_view| {
+                if (comptime !adwaita.versionAtLeast(0, 0, 0)) unreachable;
+                const page = c.adw_tab_view_get_page(tab_view, @ptrCast(tab.box));
+                _ = c.adw_tab_view_reorder_page(tab_view, page, position);
+            },
+        }
+    }
+
     pub fn setTabLabel(self: Notebook, tab: *Tab, title: [:0]const u8) void {
         switch (self) {
             .adw_tab_view => |tab_view| {

src/input/Binding.zig

@@ -301,6 +301,11 @@ pub const Action = union(enum) {
     /// is higher than the number of tabs, this will go to the last tab.
     goto_tab: usize,
 
+    /// Moves a tab by a relative offset.
+    /// Adjusts the tab position based on `offset` (e.g., -1 for left, +1 for right).
+    /// If the new position is out of bounds, it wraps around cyclically within the tab range.
+    move_tab: isize,
+
     /// Toggle the tab overview.
     /// This only works with libadwaita enabled currently.
     toggle_tab_overview: void,
@@ -648,6 +653,7 @@ pub const Action = union(enum) {
             .next_tab,
             .last_tab,
             .goto_tab,
+            .move_tab,
             .toggle_tab_overview,
             .new_split,
             .goto_split,