diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2013-05-13 01:11:07 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2013-05-13 01:13:11 +0200 |
| commit | 577263aaf4cffe260e31d19eb4b8bca1c253eff3 (patch) | |
| tree | db7ce1709725e1855dc14692d2a2cecda0ee86ca | |
| parent | 120ceac2e9494c47e806aa514de5e143606c79b8 (diff) | |
vncdisplaykeymap: add wayland support
The Wayland keycode are just Linux evdev, but the Gdk backend
add the +8 offset used by Xorg evdev.
| -rw-r--r-- | gtk/vncdisplaykeymap.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/gtk/vncdisplaykeymap.c b/gtk/vncdisplaykeymap.c index 8b01294..6d75424 100644 --- a/gtk/vncdisplaykeymap.c +++ b/gtk/vncdisplaykeymap.c @@ -59,10 +59,19 @@ static struct { static unsigned int ref_count_for_untranslated_keys = 0; +#ifdef GDK_WINDOWING_WAYLAND +#include <gdk/gdkwayland.h> +#endif + #ifdef GDK_WINDOWING_BROADWAY #include <gdk/gdkbroadway.h> #endif +#if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND) +/* Xorg Linux + evdev (offset evdev keycodes) */ +#include "vncdisplaykeymap_xorgevdev2xtkbd.c" +#endif + #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> #include <X11/XKBlib.h> @@ -225,6 +234,14 @@ const guint16 const *vnc_display_keymap_gdk2xtkbd_table(GdkWindow *window, } #endif +#ifdef GDK_WINDOWING_WAYLAND + if (GDK_IS_WAYLAND_WINDOW(window)) { + VNC_DEBUG("Using Wayland Xorg/evdev virtual keycode mapping"); + *maplen = G_N_ELEMENTS(keymap_xorgevdev2xtkbd); + return keymap_xorgevdev2xtkbd; + } +#endif + #ifdef GDK_WINDOWING_BROADWAY if (GDK_IS_BROADWAY_WINDOW(window)) { g_warning("experimental: using broadway, x11 virtual keysym mapping - with very limited support. See also https://bugzilla.gnome.org/show_bug.cgi?id=700105"); |