From patchwork Sun Feb 24 10:46:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 222764 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 ECE352C0294 for ; Sun, 24 Feb 2013 22:05:45 +1100 (EST) Received: from localhost ([::1]:43960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9Z6q-00031J-DK for incoming@patchwork.ozlabs.org; Sun, 24 Feb 2013 05:47:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9Z6V-0002nC-AB for qemu-devel@nongnu.org; Sun, 24 Feb 2013 05:46:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U9Z6T-0005UE-Va for qemu-devel@nongnu.org; Sun, 24 Feb 2013 05:46:47 -0500 Received: from mout.web.de ([212.227.15.3]:61177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9Z6T-0005U1-M4 for qemu-devel@nongnu.org; Sun, 24 Feb 2013 05:46:45 -0500 Received: from mchn199C.mchp.siemens.de ([95.157.56.37]) by smtp.web.de (mrweb003) with ESMTPSA (Nemesis) id 0LecN4-1Uddvx2jXS-00phj7; Sun, 24 Feb 2013 11:46:44 +0100 Message-ID: <5129EF92.4010904@web.de> Date: Sun, 24 Feb 2013 11:46:42 +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 X-Provags-ID: V02:K0:2BtziaPzvSq2CtN76/+2fYcDdEcNbgEXNib1Ot36t1p jXmjmxNzehGvEQdWZP2kcofZ1lgnqbsee4VhY9FGLc+/LpygBo zutzIluMu6Q4ubZWBXtualjQqELus8Wbus6aoomGaF2f1DrWpC sVCVQjRHrF7Hu8zmBtQB/yRNhvJKe3VZ+xnRNhr27+x5zmo1p4 Ddjn39S3DjoBHjrpOX2eQ== 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 Subject: [Qemu-devel] [PATCH] 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 --- ui/gtk.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 50 insertions(+), 2 deletions(-) @@ -553,8 +581,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; @@ -576,6 +606,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); } @@ -631,6 +667,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); @@ -840,6 +877,15 @@ 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) @@ -1018,6 +1064,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) diff --git a/ui/gtk.c b/ui/gtk.c index 7115cf6..daffc30 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -74,6 +74,11 @@ #define MAX_VCS 10 +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; @@ -133,6 +138,8 @@ typedef struct GtkDisplayState gboolean free_scale; bool external_pause_update; + + bool modifier_pressed[ARRAY_SIZE(modifier_keycode)]; } GtkDisplayState; static GtkDisplayState *global_state; @@ -201,6 +208,26 @@ static void gd_update_caption(GtkDisplayState *s) g_free(title); } +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(DisplayState *ds, int x, int y, int w, int h) @@ -328,8 +355,9 @@ static gboolean gd_window_key_event(GtkWidget *widget, GdkEventKey *key, void *o key->state == (GDK_CONTROL_MASK | GDK_MOD1_MASK)) { 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); }