Commit a8ffb372 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Gerd Hoffmann
Browse files

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: default avatarDaniel P. Berrange <berrange@redhat.com>
Tested-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 20161201094117.16407-1-berrange@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 3d4da9d6

include/ui/gtk.h

+4 −0
Original line number Diff line number Diff line
@@ -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"

ui/gtk.c

+7 −0
Original line number Diff line number Diff line
@@ -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
@@ -1053,6 +1056,10 @@ static int gd_map_keycode(GtkDisplayState *s, GdkDisplay *dpy, int gdk_keycode) 
        } else {

            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;