From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
Anthony Liguori <aliguori@amazon.com>,
Bruce Rogers <brogers@suse.com>
Subject: [Qemu-devel] [PULL 21/24] gtk: Add handling for the xfree86 keycodes
Date: Mon, 26 May 2014 10:14:16 +0200 [thread overview]
Message-ID: <1401092059-18503-22-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1401092059-18503-1-git-send-email-kraxel@redhat.com>
From: Bruce Rogers <brogers@suse.com>
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 <brogers@suse.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/gtk.c | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 79dc8db..a55ceb4 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -68,6 +68,10 @@
#include "keymaps.h"
#include "sysemu/char.h"
#include "qom/object.h"
+#ifndef _WIN32
+#include <gdk/gdkx.h>
+#include <X11/XKBlib.h>
+#endif
#define MAX_VCS 10
@@ -197,6 +201,7 @@ struct GtkDisplayState {
bool external_pause_update;
bool modifier_pressed[ARRAY_SIZE(modifier_keycode)];
+ bool has_evdev;
};
static GtkDisplayState *global_state;
@@ -842,7 +847,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 */
@@ -1719,6 +1728,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->window);
+ 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
+}
+
void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
{
GtkDisplayState *s = g_malloc0(sizeof(*s));
@@ -1782,6 +1814,8 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item));
}
+ gd_set_keycode_type(s);
+
global_state = s;
}
--
1.8.3.1
next prev parent reply other threads:[~2014-05-26 8:14 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-26 8:13 [Qemu-devel] [PULL 00/24] gtk: ui overhaul, multiwindow support Gerd Hoffmann
2014-05-26 8:13 ` [Qemu-devel] [PULL 01/24] gtk: zap scrolled_window Gerd Hoffmann
2014-05-26 8:13 ` [Qemu-devel] [PULL 02/24] gtk: zap vte size requests Gerd Hoffmann
2014-05-26 8:13 ` [Qemu-devel] [PULL 03/24] gtk: cleanup CONFIG_VTE ifdef a bit Gerd Hoffmann
2014-05-26 8:13 ` [Qemu-devel] [PULL 04/24] gtk: Add a scrollbar for text consoles Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 05/24] gtk: remove page numbering assumtions from the code Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 06/24] gtk: VirtualConsole restruction Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 07/24] gtk: move vga state into VirtualGfxConsole Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 08/24] gtk: support multiple gfx displays Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 09/24] gtk: use device type as label Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 10/24] gtk: simplify resize Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 11/24] gtk: allow moving tabs to windows and back Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 12/24] gtk: add tab to trace events Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 13/24] gtk: add gd_grab trace event Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 14/24] gtk: keep track of grab owner Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 15/24] gtk: skip keyboard grab when hover autograb is active Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 16/24] gtk: update gd_update_caption Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 17/24] gtk: fix grab checks Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 18/24] gtk: update all windows on mouse mode changes Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 19/24] gtk: detached window pointer grabs Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 20/24] gtk: enable untabify for gfx Gerd Hoffmann
2014-05-26 8:14 ` Gerd Hoffmann [this message]
2014-05-26 8:14 ` [Qemu-devel] [PULL 22/24] gtk: zap unused global_state Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 23/24] gtk: window sizing overhaul Gerd Hoffmann
2014-05-26 8:14 ` [Qemu-devel] [PULL 24/24] gtk: workaround gtk2 vte resize issue Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401092059-18503-22-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=aliguori@amazon.com \
--cc=brogers@suse.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).