patch 9.2.0552: GTK4: F10 does nothing when the menubar is hidden
Commit:
https://github.com/vim/vim/commit/99b51cf1213f9db723fb532b41f16159556b5e5d
Author: Yasuhiro Matsumoto <[email protected]>
Date: Thu May 28 20:41:14 2026 +0000
patch 9.2.0552: GTK4: F10 does nothing when the menubar is hidden
Problem: GTK4: F10 does nothing when the menubar is hidden
(lilydjwg)
Solution: Handle F10 explicitly (Yasuhiro Matsumoto).
In GTK3 (and on Windows) pressing F10 brings up the menu even when
the menubar is hidden via 'go-=m'. The GTK4 path passed F10 straight
through to Vim, so users who hide the menubar lost a way to reach it
via the keyboard.
If F10 is not currently mapped, pop up the full menubar GMenu model
as a transient GtkPopoverMenu at the top of the drawing area. A
user mapping still wins, so this only adds behaviour when F10 would
otherwise be inert.
fixes: #20259
closes: #20355
Co-Authored-by: Claude <[email protected]>
Signed-off-by: Yasuhiro Matsumoto <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/gui_gtk4.c b/src/gui_gtk4.c
index a4f5d1ee3..b8f3c53c3 100644
--- a/src/gui_gtk4.c
+++ b/src/gui_gtk4.c
@@ -287,6 +287,9 @@ static void drawarea_resize_cb(GtkDrawingArea *area, int
width, int height, gpoi
static void drawarea_scale_factor_cb(GObject *object, GParamSpec *pspec,
gpointer data);
static cairo_surface_t *create_backing_surface(int width, int height);
static void clipboard_changed_cb(GdkClipboard *clipboard, gpointer user_data);
+#ifdef FEAT_MENU
+static void show_menubar_popover(void);
+#endif
/*
* Parse the GUI related command-line arguments. Any arguments used are
@@ -1580,6 +1583,19 @@ key_press_event(GtkEventControllerKey *controller UNUSED,
}
#endif
+#ifdef FEAT_MENU
+ if (key_sym == GDK_KEY_F10 && gui.menubar != NULL)
+ {
+ static char_u k10[] = {K_SPECIAL, 'k', ';', 0};
+
+ if (check_map(k10, State, FALSE, TRUE, FALSE, NULL, NULL) == NULL)
+ {
+ show_menubar_popover();
+ return TRUE;
+ }
+ }
+#endif
+
len = keyval_to_string(key_sym, string2);
if (len > 1 && input_conv.vc_type != CONV_NONE)
@@ -3972,6 +3988,33 @@ gui_mch_show_popupmenu(vimmenu_T *menu)
gtk_popover_popup(GTK_POPOVER(popover));
}
+ static void
+show_menubar_popover(void)
+{
+ GMenu *gmenu;
+ GtkWidget *popover;
+ GdkRectangle rect;
+
+ if (gui.menubar == NULL || gui.drawarea == NULL)
+ return;
+ gmenu = (GMenu *)g_object_get_data(G_OBJECT(gui.menubar), "vim-gmenu");
+ if (gmenu == NULL || g_menu_model_get_n_items(G_MENU_MODEL(gmenu)) == 0)
+ return;
+
+ popover = gtk_popover_menu_new_from_model(G_MENU_MODEL(gmenu));
+ gtk_widget_set_parent(popover, gui.drawarea);
+ gtk_popover_set_has_arrow(GTK_POPOVER(popover), FALSE);
+ gtk_popover_set_position(GTK_POPOVER(popover), GTK_POS_BOTTOM);
+ rect.x = 0;
+ rect.y = 0;
+ rect.width = 1;
+ rect.height = 1;
+ gtk_popover_set_pointing_to(GTK_POPOVER(popover), &rect);
+ g_signal_connect(popover, "closed",
+ G_CALLBACK(popupmenu_closed_cb), NULL);
+ gtk_popover_popup(GTK_POPOVER(popover));
+}
+
/*
* ============================================================
* Scrollbar functions
diff --git a/src/version.c b/src/version.c
index 85fa5595c..6b91843f9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 552,
/**/
551,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1wShpl-00BV1d-32%40256bit.org.
