From 67efe7fe428ba41ae4e11cbf139fd86dd3fd0801 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Mon, 29 Jul 2024 12:08:29 -0500 Subject: [PATCH 1/2] Additions to GTK context menu Add "New Window", "New Tab", and "Reset" to GTK context menu. --- src/apprt/gtk/App.zig | 4 ++++ src/apprt/gtk/Window.zig | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/apprt/gtk/App.zig b/src/apprt/gtk/App.zig index 60fefc6de..17853cbc1 100644 --- a/src/apprt/gtk/App.zig +++ b/src/apprt/gtk/App.zig @@ -370,6 +370,7 @@ fn syncActionAccelerators(self: *App) !void { try self.syncActionAccelerator("win.split_down", .{ .new_split = .down }); try self.syncActionAccelerator("win.copy", .{ .copy_to_clipboard = {} }); try self.syncActionAccelerator("win.paste", .{ .paste_from_clipboard = {} }); + try self.syncActionAccelerator("win.reset", .{ .reset = {} }); } fn syncActionAccelerator( @@ -803,6 +804,9 @@ fn initContextMenu(self: *App) void { const section = c.g_menu_new(); defer c.g_object_unref(section); c.g_menu_append_section(menu, null, @ptrCast(@alignCast(section))); + c.g_menu_append(section, "Reset", "win.reset"); + c.g_menu_append(section, "New Window", "win.new_window"); + c.g_menu_append(section, "New Tab", "win.new_tab"); c.g_menu_append(section, "Split Right", "win.split_right"); c.g_menu_append(section, "Split Down", "win.split_down"); } diff --git a/src/apprt/gtk/Window.zig b/src/apprt/gtk/Window.zig index 384145332..c388e0092 100644 --- a/src/apprt/gtk/Window.zig +++ b/src/apprt/gtk/Window.zig @@ -184,6 +184,7 @@ fn initActions(self: *Window) void { .{ "toggle_inspector", >kActionToggleInspector }, .{ "copy", >kActionCopy }, .{ "paste", >kActionPaste }, + .{ "reset", >kActionReset }, }; inline for (actions) |entry| { @@ -629,6 +630,19 @@ fn gtkActionPaste( }; } +fn gtkActionReset( + _: *c.GSimpleAction, + _: *c.GVariant, + ud: ?*anyopaque, +) callconv(.C) void { + const self: *Window = @ptrCast(@alignCast(ud orelse return)); + const surface = self.actionSurface() orelse return; + _ = surface.performBindingAction(.{ .reset = {} }) catch |err| { + log.warn("error performing binding action error={}", .{err}); + return; + }; +} + /// Returns the surface to use for an action. fn actionSurface(self: *Window) ?*CoreSurface { const page_idx = c.gtk_notebook_get_current_page(self.notebook); From 99b1b6305f5e3782737003f286edbb092b55856d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 1 Aug 2024 14:54:39 -0700 Subject: [PATCH 2/2] reset only --- src/apprt/gtk/App.zig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/apprt/gtk/App.zig b/src/apprt/gtk/App.zig index 17853cbc1..462c46067 100644 --- a/src/apprt/gtk/App.zig +++ b/src/apprt/gtk/App.zig @@ -804,9 +804,6 @@ fn initContextMenu(self: *App) void { const section = c.g_menu_new(); defer c.g_object_unref(section); c.g_menu_append_section(menu, null, @ptrCast(@alignCast(section))); - c.g_menu_append(section, "Reset", "win.reset"); - c.g_menu_append(section, "New Window", "win.new_window"); - c.g_menu_append(section, "New Tab", "win.new_tab"); c.g_menu_append(section, "Split Right", "win.split_right"); c.g_menu_append(section, "Split Down", "win.split_down"); } @@ -815,6 +812,7 @@ fn initContextMenu(self: *App) void { const section = c.g_menu_new(); defer c.g_object_unref(section); c.g_menu_append_section(menu, null, @ptrCast(@alignCast(section))); + c.g_menu_append(section, "Reset", "win.reset"); c.g_menu_append(section, "Terminal Inspector", "win.toggle_inspector"); }