[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/11] ui: use evdev keymap when running under waylan
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 02/11] ui: use evdev keymap when running under wayland |
Date: |
Wed, 4 Jan 2017 12:21:14 +0100 |
From: "Daniel P. Berrange" <address@hidden>
Wayland always uses evdev as its input source, so QEMU
can use the existing evdev keymap data
Signed-off-by: Daniel P. Berrange <address@hidden>
Tested-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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 406de4f..356f400 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 */
--
1.8.3.1
- [Qemu-devel] [PULL 00/11] ui patch queue, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 01/11] ui/gtk: fix crash at startup when no console is available, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 04/11] console: add API to get underlying gui window ID, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 03/11] ps2: Fix lost scancodes by recent changes, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 07/11] egl-helpers: Change file licensing to LGPLv2, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 10/11] ui/vnc: Fix problem with sending too many bytes as server name, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 02/11] ui: use evdev keymap when running under wayland,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 08/11] gtk: avoid oob array access, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 06/11] sdl2: set window ID, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 05/11] console: move window ID code from baum to sdl, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 09/11] ui: drop unused MOUSE_EVENT_WHEEL{UP, DN} defines, Gerd Hoffmann, 2017/01/04
- [Qemu-devel] [PULL 11/11] curses: Fix compiler warnings (Mingw-w64 redefinition of macro KEY_EVENT), Gerd Hoffmann, 2017/01/04