On Thu, Dec 1, 2016 at 11:25 AM, Stefan Hajnoczi <stefa...@gmail.com> wrote: > On Thu, Dec 1, 2016 at 11:20 AM, Stefan Hajnoczi <stefa...@gmail.com> wrote: >> On Thu, Dec 1, 2016 at 9:41 AM, Daniel P. Berrange <berra...@redhat.com> >> wrote: >>> Wayland always uses evdev as its input source, so QEMU >>> can use the existing evdev keymap data >>> >>> Signed-off-by: Daniel P. Berrange <berra...@redhat.com> >>> --- >>> >>> Changed in v2 >>> >>> - Actually add all changed files to commit - gtk.h :-) >>> >>> include/ui/gtk.h | 4 ++++ >>> ui/gtk.c | 7 +++++++ >>> 2 files changed, 11 insertions(+) >>> >>> diff --git a/include/ui/gtk.h b/include/ui/gtk.h >>> index 42ca0fe..b3b5005 100644 >>> --- a/include/ui/gtk.h >>> +++ b/include/ui/gtk.h >>> @@ -18,6 +18,10 @@ >>> #include <X11/XKBlib.h> >>> #endif >>> >>> +#ifdef GDK_WINDOWING_WAYLAND >>> +#include <gdk/gdkwayland.h> >>> +#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 e816428..81dba57 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 >>> @@ -1054,6 +1057,10 @@ static int gd_map_keycode(GtkDisplayState *s, >>> GdkDisplay *dpy, int gdk_keycode) >>> 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; >>> } else if (gdk_keycode == 211) { /* backslash */ >>> -- >>> 2.9.3 >>> >> >> Great, you've fixed Wayland! >> >> This is GTK3-only so I used ./configure --with-gtkabi=3.0 on my system >> that has both GTK2 and GTK3 headers installed. ./configure will >> select GTK2 by default and I'm not sure if that is a good idea >> nowadays. >> >> Tested-by: Stefan Hajnoczi <stefa...@redhat.com>
Sorry, Cole. I pressed Send too quickly :). I meant to add: This patch is especially relevant for Fedora 25 where Wayland is the default. Without the GTK UI will not handle cursor and other keys correctly. Dan: Come to think of it, ui/sdl.c also has X11 keycode mangling. Perhaps that is broken too... :( Stefan