mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtk: Add handling for the xfree86 keycodes

Browse Source 
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>
This commit is contained in:
Bruce Rogers 2014-04-30 20:29:42 -06:00 committed by Gerd Hoffmann
parent aa0a55d42d
commit 3158a3482b
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ui/gtk.c
View File

@ -68,6 +68,10 @@
#include "keymaps.h" #include "keymaps.h"
#include "sysemu/char.h" #include "sysemu/char.h"
#include "qom/object.h" #include "qom/object.h"
#ifndef _WIN32
#include <gdk/gdkx.h>
#include <X11/XKBlib.h>
#endif
#define MAX_VCS 10 #define MAX_VCS 10
@ -197,6 +201,7 @@ struct GtkDisplayState {
bool external_pause_update; bool external_pause_update;
bool modifier_pressed[ARRAY_SIZE(modifier_keycode)]; bool modifier_pressed[ARRAY_SIZE(modifier_keycode)];
bool has_evdev;
}; };
static GtkDisplayState *global_state; static GtkDisplayState *global_state;
@ -842,7 +847,11 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque)
} else if (gdk_keycode < 97) { } else if (gdk_keycode < 97) {
qemu_keycode = gdk_keycode - 8; qemu_keycode = gdk_keycode - 8;
} else if (gdk_keycode < 158) { } 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 */ } else if (gdk_keycode == 208) { /* Hiragana_Katakana */
qemu_keycode = 0x70; qemu_keycode = 0x70;
} else if (gdk_keycode == 211) { /* backslash */ } else if (gdk_keycode == 211) { /* backslash */
@ -1719,6 +1728,29 @@ static void gd_create_menus(GtkDisplayState *s)
s->accel_group = accel_group; 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) void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
{ {
GtkDisplayState *s = g_malloc0(sizeof(*s)); 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)); gtk_menu_item_activate(GTK_MENU_ITEM(s->grab_on_hover_item));
} }
gd_set_keycode_type(s);
global_state = s; global_state = s;
} }