commit 73d4dc71f3a41131541c73b3ac2a8b160a51842b
author Anthony Liguori <aliguori@us.ibm.com> Wed Feb 20 07:43:26 2013 -0600
committer Anthony Liguori <aliguori@us.ibm.com> Thu Feb 21 16:34:49 2013 -0600
tree 38fc856cd607ac574a03e58087a600b115358d4c
parent 15546425c5527ebb08ede399373b705866f1ff84

gtk: suppress accelerators from the File menu when grab is active

If you're full screen, you probably expect Ctrl-Q to go to the guest,
not the host.  I think restricting certain menus is the right way to
handle this generally speaking.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-id: 1361367806-4599-10-git-send-email-aliguori@us.ibm.com

ui/gtk.c

diff --git a/ui/gtk.c b/ui/gtk.c
index ffa9baa..29156be 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -78,6 +78,8 @@
 
     GtkWidget *menu_bar;
 
+    GtkAccelGroup *accel_group;
+
     GtkWidget *file_menu_item;
     GtkWidget *file_menu;
     GtkWidget *quit_item;
@@ -296,6 +298,35 @@
 
 /** GTK Events **/
 
+static gboolean gd_window_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque)
+{
+    GtkDisplayState *s = opaque;
+    GtkAccelGroupEntry *entries;
+    guint n_entries = 0;
+    gboolean propagate_accel = TRUE;
+    gboolean handled = FALSE;
+
+    entries = gtk_accel_group_query(s->accel_group, key->keyval,
+                                    key->state, &n_entries);
+    if (n_entries) {
+        const char *quark = g_quark_to_string(entries[0].accel_path_quark);
+
+        if (gd_is_grab_active(s) && strstart(quark, "<QEMU>/File/", NULL)) {
+            propagate_accel = FALSE;
+        }
+    }
+
+    if (!handled && propagate_accel) {
+        handled = gtk_window_activate_key(GTK_WINDOW(widget), key);
+    }
+
+    if (!handled) {
+        handled = gtk_window_propagate_key_event(GTK_WINDOW(widget), key);
+    }
+
+    return handled;
+}
+
 static gboolean gd_window_close(GtkWidget *widget, GdkEvent *event,
                                 void *opaque)
 {
@@ -903,6 +934,8 @@
     g_signal_connect(s->show_tabs_item, "activate",
                      G_CALLBACK(gd_menu_show_tabs), s);
 
+    g_signal_connect(s->window, "key-press-event",
+                     G_CALLBACK(gd_window_key_event), s);
     g_signal_connect(s->window, "delete-event",
                      G_CALLBACK(gd_window_close), s);
 
@@ -1033,6 +1066,7 @@
 
     g_object_set_data(G_OBJECT(s->window), "accel_group", accel_group);
     gtk_window_add_accel_group(GTK_WINDOW(s->window), accel_group);
+    s->accel_group = accel_group;
 
     gtk_menu_append(GTK_MENU(s->file_menu), s->quit_item);
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(s->file_menu_item), s->file_menu);