From patchwork Sun Mar 24 18:10:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 230473 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 9A6142C00BE for ; Mon, 25 Mar 2013 05:11:10 +1100 (EST) Received: from localhost ([::1]:55396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJpNs-00071O-Q5 for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2013 14:11:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJpNQ-00070X-8Q for qemu-devel@nongnu.org; Sun, 24 Mar 2013 14:10:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJpNN-0005R4-89 for qemu-devel@nongnu.org; Sun, 24 Mar 2013 14:10:40 -0400 Received: from mout.web.de ([212.227.15.3]:53599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJpNM-0005Qs-Ur for qemu-devel@nongnu.org; Sun, 24 Mar 2013 14:10:37 -0400 Received: from mchn199C.mchp.siemens.de ([95.157.56.37]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MhUbO-1U61pw2Awk-00MzIq; Sun, 24 Mar 2013 19:10:02 +0100 Message-ID: <514F417A.6010908@web.de> Date: Sun, 24 Mar 2013 19:10:02 +0100 From: Jan Kiszka 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 MIME-Version: 1.0 To: Anthony Liguori X-Enigmail-Version: 1.5.1 X-Provags-ID: V02:K0:XsYXTt1MBinfpgumCx1GhVpof9i2vTJjqs4L80UH42w Z0I/vhXQgGKAFCZw42C3gRp1olnK1Sl/QN551zUPh+gCULRZN3 QT6TTi90eX2Tkspa+2ZZFwURMoAgH6ZlQtph7XBbt/HXeMdo26 3lY2dbmNUeLpUqFFcMo9KzEbSlo3vw795+cx788SZGAzOWiO2L GPAtetRy9G//A8tQwyRtg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.15.3 Cc: qemu-devel , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v3] gtk: Release modifier when graphic console loses keyboard focus 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 From: Jan Kiszka This solves, e.g., sticky ALT when selecting a GTK menu, switching to a different window or selecting a different virtual console. Signed-off-by: Jan Kiszka Tested-by: Stefan Hajnoczi --- Changes in v3: - rebased ui/gtk.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index a249059..c04656a 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -102,6 +102,11 @@ static inline void gdk_drawable_get_size(GdkWindow *w, gint *ww, gint *wh) #define IGNORE_MODIFIER_MASK \ (GDK_MODIFIER_MASK & ~(GDK_LOCK_MASK | GDK_MOD2_MASK)) +static const int modifier_keycode[] = { + /* shift, control, alt keys, meta keys, both left & right */ + 0x2a, 0x36, 0x1d, 0x9d, 0x38, 0xb8, 0xdb, 0xdd, +}; + typedef struct VirtualConsole { GtkWidget *menu_item; @@ -161,6 +166,8 @@ typedef struct GtkDisplayState gboolean free_scale; bool external_pause_update; + + bool modifier_pressed[ARRAY_SIZE(modifier_keycode)]; } GtkDisplayState; static GtkDisplayState *global_state; @@ -267,6 +274,26 @@ static void gd_update_full_redraw(GtkDisplayState *s) gtk_widget_queue_draw_area(s->drawing_area, 0, 0, ww, wh); } +static void gtk_release_modifiers(GtkDisplayState *s) +{ + int i, keycode; + + if (!gd_on_vga(s)) { + return; + } + for (i = 0; i < ARRAY_SIZE(modifier_keycode); i++) { + keycode = modifier_keycode[i]; + if (!s->modifier_pressed[i]) { + continue; + } + if (keycode & SCANCODE_GREY) { + kbd_put_keycode(SCANCODE_EMUL0); + } + kbd_put_keycode(keycode | SCANCODE_UP); + s->modifier_pressed[i] = false; + } +} + /** DisplayState Callbacks **/ static void gd_update(DisplayChangeListener *dcl, @@ -385,8 +412,9 @@ static gboolean gd_window_key_event(GtkWidget *widget, GdkEventKey *key, void *o (key->state & IGNORE_MODIFIER_MASK) == HOTKEY_MODIFIERS) { handled = gtk_window_activate_key(GTK_WINDOW(widget), key); } - - if (!handled) { + if (handled) { + gtk_release_modifiers(s); + } else { handled = gtk_window_propagate_key_event(GTK_WINDOW(widget), key); } @@ -616,8 +644,10 @@ static gboolean gd_button_event(GtkWidget *widget, GdkEventButton *button, static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) { + GtkDisplayState *s = opaque; int gdk_keycode; int qemu_keycode; + int i; gdk_keycode = key->hardware_keycode; @@ -639,6 +669,12 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) gdk_keycode, qemu_keycode, (key->type == GDK_KEY_PRESS) ? "down" : "up"); + for (i = 0; i < ARRAY_SIZE(modifier_keycode); i++) { + if (qemu_keycode == modifier_keycode[i]) { + s->modifier_pressed[i] = (key->type == GDK_KEY_PRESS); + } + } + if (qemu_keycode & SCANCODE_GREY) { kbd_put_keycode(SCANCODE_EMUL0); } @@ -694,6 +730,7 @@ static void gd_menu_switch_vc(GtkMenuItem *item, void *opaque) } else { int i; + gtk_release_modifiers(s); for (i = 0; i < s->nb_vcs; i++) { if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->vc[i].menu_item))) { gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), i + 1); @@ -994,6 +1031,16 @@ static gboolean gd_leave_event(GtkWidget *widget, GdkEventCrossing *crossing, gp return TRUE; } +static gboolean gd_focus_out_event(GtkWidget *widget, + GdkEventCrossing *crossing, gpointer data) +{ + GtkDisplayState *s = data; + + gtk_release_modifiers(s); + + return TRUE; +} + /** Virtual Console Callbacks **/ static int gd_vc_chr_write(CharDriverState *chr, const uint8_t *buf, int len) @@ -1177,6 +1224,8 @@ static void gd_connect_signals(GtkDisplayState *s) G_CALLBACK(gd_enter_event), s); g_signal_connect(s->drawing_area, "leave-notify-event", G_CALLBACK(gd_leave_event), s); + g_signal_connect(s->drawing_area, "focus-out-event", + G_CALLBACK(gd_focus_out_event), s); } static void gd_create_menus(GtkDisplayState *s)