ui: use evdev keymap when running under wayland

PATCH Superseded Daniel P. Berrange 1 participant 1 message Dec 1, 2016

lore

Share & tools

lore

Daniel P. Berrange

author

2016-12-01 09:34 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 ui/gtk.c | 7 +++++++
 1 file changed, 7 insertions(+)

ui/gtk.c +7 -0

index e816428..81dba57 100644
@@ -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 */

Signature · 1 line

2.9.3