From patchwork Mon Feb 18 23:57:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 221593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9C5AC2C0079 for ; Tue, 19 Feb 2013 11:33:27 +1100 (EST) Received: from localhost ([::1]:42774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7abj-0008HH-Vs for incoming@patchwork.ozlabs.org; Mon, 18 Feb 2013 18:58:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7aah-0006Ai-Ti for qemu-devel@nongnu.org; Mon, 18 Feb 2013 18:57:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7aae-0003dW-TC for qemu-devel@nongnu.org; Mon, 18 Feb 2013 18:57:47 -0500 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:54297) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7aae-0003cr-Bs for qemu-devel@nongnu.org; Mon, 18 Feb 2013 18:57:44 -0500 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Feb 2013 05:24:22 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 19 Feb 2013 05:24:21 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 99AD81258054 for ; Tue, 19 Feb 2013 05:28:26 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r1INvbBP31981676 for ; Tue, 19 Feb 2013 05:27:37 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r1INve9E014694 for ; Tue, 19 Feb 2013 10:57:40 +1100 Received: from titi.austin.rr.com (sig-9-49-157-221.mts.ibm.com [9.49.157.221]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r1INv8Ex013654; Tue, 19 Feb 2013 10:57:39 +1100 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2013 17:57:05 -0600 Message-Id: <1361231825-12037-10-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1361231825-12037-1-git-send-email-aliguori@us.ibm.com> References: <1361231825-12037-1-git-send-email-aliguori@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13021823-2000-0000-0000-00000AFF4C09 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.8 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH 9/9] gtk: suppress accelerators from the File menu when grab is active X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- ui/gtk.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index 8ef6e46..dbfb30e 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -78,6 +78,8 @@ typedef struct GtkDisplayState GtkWidget *menu_bar; + GtkAccelGroup *accel_group; + GtkWidget *file_menu_item; GtkWidget *file_menu; GtkWidget *quit_item; @@ -296,6 +298,35 @@ static void gd_mouse_mode_change(Notifier *notify, void *data) /** 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, "/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) { @@ -906,6 +937,8 @@ static void gd_connect_signals(GtkDisplayState *s) 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); @@ -1036,6 +1069,7 @@ static void gd_create_menus(GtkDisplayState *s) 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);