From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wv0Ws-0007iX-7c for qemu-devel@nongnu.org; Thu, 12 Jun 2014 04:38:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wv0Wk-0005QS-8Y for qemu-devel@nongnu.org; Thu, 12 Jun 2014 04:38:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61535) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wv0Wj-0005Px-Ni for qemu-devel@nongnu.org; Thu, 12 Jun 2014 04:38:29 -0400 From: Gerd Hoffmann Date: Thu, 12 Jun 2014 10:38:20 +0200 Message-Id: <1402562303-16930-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1402562303-16930-1-git-send-email-kraxel@redhat.com> References: <1402562303-16930-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 1/4] gtk: factor out keycode mapping List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index b908936..01d48cc 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -877,22 +877,18 @@ static gboolean gd_scroll_event(GtkWidget *widget, GdkEventScroll *scroll, return TRUE; } -static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) +static int gd_map_keycode(GtkDisplayState *s, int gdk_keycode) { - VirtualConsole *vc = opaque; - GtkDisplayState *s = vc->s; - int gdk_keycode = key->hardware_keycode; - int i; + int qemu_keycode; #ifdef _WIN32 - UINT qemu_keycode = MapVirtualKey(gdk_keycode, MAPVK_VK_TO_VSC); + qemu_keycode = MapVirtualKey(gdk_keycode, MAPVK_VK_TO_VSC); switch (qemu_keycode) { case 103: /* alt gr */ qemu_keycode = 56 | SCANCODE_GREY; break; } #else - int qemu_keycode; if (gdk_keycode < 9) { qemu_keycode = 0; @@ -913,6 +909,19 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) } #endif + return qemu_keycode; +} + +static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) +{ + VirtualConsole *vc = opaque; + GtkDisplayState *s = vc->s; + int gdk_keycode = key->hardware_keycode; + int qemu_keycode; + int i; + + qemu_keycode = gd_map_keycode(s, gdk_keycode); + trace_gd_key_event(vc->label, gdk_keycode, qemu_keycode, (key->type == GDK_KEY_PRESS) ? "down" : "up"); -- 1.8.3.1