From patchwork Thu May 1 02:29:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Rogers X-Patchwork-Id: 344393 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 55BB014007D for ; Thu, 1 May 2014 12:55:46 +1000 (EST) Received: from localhost ([::1]:60102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfglQ-0006Jc-Ic for incoming@patchwork.ozlabs.org; Wed, 30 Apr 2014 22:30:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfgl8-0005wl-0U for qemu-devel@nongnu.org; Wed, 30 Apr 2014 22:30:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wfgl2-000181-UB for qemu-devel@nongnu.org; Wed, 30 Apr 2014 22:30:01 -0400 Received: from 63-248-68-104.static.sdyl0425.digis.net ([63.248.68.104]:46901 helo=suse.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfgl2-00017o-No for qemu-devel@nongnu.org; Wed, 30 Apr 2014 22:29:56 -0400 Received: by suse.com (Postfix, from userid 1000) id F233830C39D; Wed, 30 Apr 2014 20:29:45 -0600 (MDT) From: Bruce Rogers To: qemu-devel@nongnu.org Date: Wed, 30 Apr 2014 20:29:42 -0600 Message-Id: <1398911382-23291-1-git-send-email-brogers@suse.com> X-Mailer: git-send-email 1.9.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 63.248.68.104 Cc: kraxel@redhat.com, Bruce Rogers Subject: [Qemu-devel] [PATCH] gtk: Add handling for the xfree86 keycodes 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 Currently only evdev keycodes are handled by the gtk-ui. SDL has code to handle both. This patch adds similar processing so that both keycode types will be handled via the gtk-ui. Signed-off-by: Bruce Rogers --- ui/gtk.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/ui/gtk.c b/ui/gtk.c index 00fbbcc..461c65e 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -67,6 +67,10 @@ #include "x_keymap.h" #include "keymaps.h" #include "sysemu/char.h" +#ifndef _WIN32 +#include +#include +#endif #define MAX_VCS 10 @@ -173,6 +177,7 @@ typedef struct GtkDisplayState bool external_pause_update; bool modifier_pressed[ARRAY_SIZE(modifier_keycode)]; + bool has_evdev; } GtkDisplayState; static GtkDisplayState *global_state; @@ -757,7 +762,11 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) } else if (gdk_keycode < 97) { qemu_keycode = gdk_keycode - 8; } else if (gdk_keycode < 158) { - qemu_keycode = translate_evdev_keycode(gdk_keycode - 97); + if (s->has_evdev) { + qemu_keycode = translate_evdev_keycode(gdk_keycode - 97); + } else { + qemu_keycode = translate_xfree86_keycode(gdk_keycode - 97); + } } else if (gdk_keycode == 208) { /* Hiragana_Katakana */ qemu_keycode = 0x70; } else if (gdk_keycode == 211) { /* backslash */ @@ -1487,6 +1496,29 @@ static void gd_create_menus(GtkDisplayState *s) s->accel_group = accel_group; } +static void gd_set_keycode_type(GtkDisplayState *s) +{ +#ifndef _WIN32 + char *keycodes = NULL; + GdkDisplay *display = gtk_widget_get_display(s->drawing_area); + Display *x11_display = gdk_x11_display_get_xdisplay(display); + XkbDescPtr desc = XkbGetKeyboard(x11_display, XkbGBN_AllComponentsMask, + XkbUseCoreKbd); + + if (desc && desc->names) { + keycodes = XGetAtomName(x11_display, desc->names->keycodes); + } + if (keycodes == NULL) { + fprintf(stderr, "could not lookup keycode name\n"); + } else if (strstart(keycodes, "evdev", NULL)) { + s->has_evdev = true; + } else if (!strstart(keycodes, "xfree86", NULL)) { + fprintf(stderr, "unknown keycodes `%s', please report to " + "qemu-devel@nongnu.org\n", keycodes); + } +#endif +} + static const DisplayChangeListenerOps dcl_ops = { .dpy_name = "gtk", .dpy_gfx_update = gd_update, @@ -1581,5 +1613,7 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover) register_displaychangelistener(&s->dcl); + gd_set_keycode_type(s); + global_state = s; }