From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCNrn-0001uW-UF for qemu-devel@nongnu.org; Thu, 01 Dec 2016 04:41:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCNrn-0000Ks-6I for qemu-devel@nongnu.org; Thu, 01 Dec 2016 04:41:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37122) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCNrn-0000Kk-0M for qemu-devel@nongnu.org; Thu, 01 Dec 2016 04:41:23 -0500 From: "Daniel P. Berrange" Date: Thu, 1 Dec 2016 09:41:17 +0000 Message-Id: <20161201094117.16407-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v2] ui: use evdev keymap when running under wayland List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Daniel P. Berrange" Wayland always uses evdev as its input source, so QEMU can use the existing evdev keymap data Signed-off-by: Daniel P. Berrange --- 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 #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 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