From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCPYw-00048T-S8 for qemu-devel@nongnu.org; Thu, 01 Dec 2016 06:30:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCPYt-0004kC-3Y for qemu-devel@nongnu.org; Thu, 01 Dec 2016 06:30:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55138) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCPYs-0004k0-Qj for qemu-devel@nongnu.org; Thu, 01 Dec 2016 06:29:59 -0500 Date: Thu, 1 Dec 2016 11:29:53 +0000 From: "Daniel P. Berrange" Message-ID: <20161201112953.GF9191@redhat.com> Reply-To: "Daniel P. Berrange" References: <20161201094117.16407-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Subject: Re: [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: Stefan Hajnoczi Cc: qemu-devel On Thu, Dec 01, 2016 at 11:20:36AM +0000, Stefan Hajnoczi wrote: > On Thu, Dec 1, 2016 at 9:41 AM, Daniel P. Berrange wrote: > > 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 > > > > 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. We had a discussion on IRC a few weeks back about default UI frontends. We should certainly prefer GTK3 over GTK2 if both a present, since GTK2 is essentially a dead technology at this time. > Tested-by: Stefan Hajnoczi Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|