[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/22] gtk: Add handling for the xfree86 keycodes
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 21/22] gtk: Add handling for the xfree86 keycodes |
Date: |
Tue, 6 May 2014 14:05:57 +0200 |
From: Bruce Rogers <address@hidden>
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 37fe4a2..a9136ed 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 "
+ "address@hidden", 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
- [Qemu-devel] [PATCH 00/22] gtk: ui overhaul, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 04/22] gtk: Add a scrollbar for text consoles, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 05/22] gtk: remove page numbering assumtions from the code, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 21/22] gtk: Add handling for the xfree86 keycodes,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 01/22] gtk: zap scrolled_window, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 03/22] gtk: cleanup CONFIG_VTE ifdef a bit., Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 02/22] gtk: zap vte size requests, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 13/22] gtk: add gd_grab trace event, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 10/22] gtk: simplify resize, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 09/22] gtk: use device type as label, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 15/22] gtk: skip keyboard grab when hover autograb is active, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 08/22] gtk: support multiple gfx displays, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 19/22] gtk: enable window pointer grabs, Gerd Hoffmann, 2014/05/06
- [Qemu-devel] [PATCH 06/22] gtk: VirtualConsole restruction, Gerd Hoffmann, 2014/05/06