|
 |
6438461 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
6438461 |
Date: Thu, 1 Dec 2016 09:41:17 +0000
|
|
|
6438461 |
Subject: [PATCH] ui: use evdev keymap when running under wayland
|
|
|
6438461 |
|
|
|
6438461 |
Wayland always uses evdev as its input source, so QEMU
|
|
|
6438461 |
can use the existing evdev keymap data
|
|
|
6438461 |
|
|
|
6438461 |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
6438461 |
---
|
|
|
6438461 |
include/ui/gtk.h | 4 ++++
|
|
|
6438461 |
ui/gtk.c | 7 +++++++
|
|
|
6438461 |
2 files changed, 11 insertions(+)
|
|
|
6438461 |
|
|
|
6438461 |
diff --git a/include/ui/gtk.h b/include/ui/gtk.h
|
|
|
3d039dc |
index 42ca0fea8b..b3b50059c7 100644
|
|
|
6438461 |
--- a/include/ui/gtk.h
|
|
|
6438461 |
+++ b/include/ui/gtk.h
|
|
|
6438461 |
@@ -18,6 +18,10 @@
|
|
|
6438461 |
#include <X11/XKBlib.h>
|
|
|
6438461 |
#endif
|
|
|
6438461 |
|
|
|
6438461 |
+#ifdef GDK_WINDOWING_WAYLAND
|
|
|
6438461 |
+#include <gdk/gdkwayland.h>
|
|
|
6438461 |
+#endif
|
|
|
6438461 |
+
|
|
|
6438461 |
#if defined(CONFIG_OPENGL)
|
|
|
6438461 |
#include "ui/egl-helpers.h"
|
|
|
6438461 |
#include "ui/egl-context.h"
|
|
|
6438461 |
diff --git a/ui/gtk.c b/ui/gtk.c
|
|
|
3d039dc |
index 21ae4cbccc..c641e49033 100644
|
|
|
6438461 |
--- a/ui/gtk.c
|
|
|
6438461 |
+++ b/ui/gtk.c
|
|
|
6438461 |
@@ -90,6 +90,9 @@
|
|
|
6438461 |
#ifndef GDK_IS_X11_DISPLAY
|
|
|
6438461 |
#define GDK_IS_X11_DISPLAY(dpy) (dpy == dpy)
|
|
|
6438461 |
#endif
|
|
|
6438461 |
+#ifndef GDK_IS_WAYLAND_DISPLAY
|
|
|
6438461 |
+#define GDK_IS_WAYLAND_DISPLAY(dpy) (dpy == dpy)
|
|
|
6438461 |
+#endif
|
|
|
6438461 |
#ifndef GDK_IS_WIN32_DISPLAY
|
|
|
6438461 |
#define GDK_IS_WIN32_DISPLAY(dpy) (dpy == dpy)
|
|
|
6438461 |
#endif
|
|
|
6438461 |
@@ -1034,6 +1037,10 @@ static int gd_map_keycode(GtkDisplayState *s, GdkDisplay *dpy, int gdk_keycode)
|
|
|
6438461 |
qemu_keycode = translate_xfree86_keycode(gdk_keycode - 97);
|
|
|
6438461 |
}
|
|
|
6438461 |
#endif
|
|
|
6438461 |
+#ifdef GDK_WINDOWING_WAYLAND
|
|
|
6438461 |
+ } else if (GDK_IS_WAYLAND_DISPLAY(dpy) && gdk_keycode < 158) {
|
|
|
6438461 |
+ qemu_keycode = translate_evdev_keycode(gdk_keycode - 97);
|
|
|
6438461 |
+#endif
|
|
|
6438461 |
} else if (gdk_keycode == 208) { /* Hiragana_Katakana */
|
|
|
6438461 |
qemu_keycode = 0x70;
|
|
|
6438461 |
} else if (gdk_keycode == 211) { /* backslash */
|