From: Daniel P. Berrange Date: Thu, 1 Dec 2016 09:41:17 +0000 (+0000) Subject: ui: use evdev keymap when running under wayland X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a8ffb372a2202c65f42fdb69891ea68a2f274b55;p=qemu.git ui: use evdev keymap when running under wayland Wayland always uses evdev as its input source, so QEMU can use the existing evdev keymap data Signed-off-by: Daniel P. Berrange Tested-by: Stefan Hajnoczi Message-id: 20161201094117.16407-1-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- diff --git a/include/ui/gtk.h b/include/ui/gtk.h index 42ca0fea8b..b3b50059c7 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -18,6 +18,10 @@ #include #endif +#ifdef GDK_WINDOWING_WAYLAND +#include +#endif + #if defined(CONFIG_OPENGL) #include "ui/egl-helpers.h" #include "ui/egl-context.h" diff --git a/ui/gtk.c b/ui/gtk.c index 406de4f940..356f400af5 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -90,6 +90,9 @@ #ifndef GDK_IS_X11_DISPLAY #define GDK_IS_X11_DISPLAY(dpy) (dpy == dpy) #endif +#ifndef GDK_IS_WAYLAND_DISPLAY +#define GDK_IS_WAYLAND_DISPLAY(dpy) (dpy == dpy) +#endif #ifndef GDK_IS_WIN32_DISPLAY #define GDK_IS_WIN32_DISPLAY(dpy) (dpy == dpy) #endif @@ -1053,6 +1056,10 @@ static int gd_map_keycode(GtkDisplayState *s, GdkDisplay *dpy, int gdk_keycode) } else { qemu_keycode = translate_xfree86_keycode(gdk_keycode - 97); } +#endif +#ifdef GDK_WINDOWING_WAYLAND + } else if (GDK_IS_WAYLAND_DISPLAY(dpy) && gdk_keycode < 158) { + qemu_keycode = translate_evdev_keycode(gdk_keycode - 97); #endif } else if (gdk_keycode == 208) { /* Hiragana_Katakana */ qemu_keycode = 0x70;