[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] gtk: Fix accelerator filtering
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH] gtk: Fix accelerator filtering |
Date: |
Fri, 22 Feb 2013 19:41:05 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
This is in fact very simply: When the input in grabbed, everything
should be exclusively passed to the guest - except it has our magic
CTRL-ALT modifier set. Then let GTK filter out those accels that are in
use.
Signed-off-by: Jan Kiszka <address@hidden>
---
ui/gtk.c | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 8eedd0d..f693478 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -311,22 +311,10 @@ static void gd_mouse_mode_change(Notifier *notify, void
*data)
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) {
+ if (!gd_is_grab_active(s) ||
+ key->state == (GDK_CONTROL_MASK | GDK_MOD1_MASK)) {
handled = gtk_window_activate_key(GTK_WINDOW(widget), key);
}
--
1.7.3.4
- Re: [Qemu-devel] [PATCH 7/9] gtk: add translation support (v5), (continued)
- Re: [Qemu-devel] [PATCH 7/9] gtk: add translation support (v5), Andreas Färber, 2013/02/20
- Re: [Qemu-devel] [PATCH 7/9] gtk: add translation support (v5), Kevin Wolf, 2013/02/21
- Re: [Qemu-devel] [PATCH 7/9] gtk: add translation support (v5), Andreas Färber, 2013/02/22
- Re: [Qemu-devel] [PATCH 7/9] gtk: add translation support (v5), Paolo Bonzini, 2013/02/22
- Re: [Qemu-devel] [PATCH 7/9] gtk: add translation support (v5), Andreas Färber, 2013/02/22
- Re: [Qemu-devel] [PATCH 7/9] gtk: add translation support (v5), Stefan Weil, 2013/02/22
- Re: [Qemu-devel] [PATCH 7/9] gtk: add translation support (v5), Anthony Liguori, 2013/02/22
[Qemu-devel] [PATCH 8/9] gtk: make default UI (v5), Anthony Liguori, 2013/02/20
[Qemu-devel] [PATCH 9/9] gtk: suppress accelerators from the File menu when grab is active, Anthony Liguori, 2013/02/20
Re: [Qemu-devel] [PATCH 0/9] Add GTK UI to enable basic accessibility (v5), Andreas Färber, 2013/02/20
Re: [Qemu-devel] [PATCH 0/9] Add GTK UI to enable basic accessibility (v5), Anthony Liguori, 2013/02/22