[gtk-vnc] Remove previous hack for xwayland
- From: Daniel P. Berrange <dberrange src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-vnc] Remove previous hack for xwayland
- Date: Sat, 28 Feb 2015 16:38:10 +0000 (UTC)
commit b4e9d95da0e95e5aba7ac1683863bc9a1dd35b32
Author: Daniel P. Berrange <berrange redhat com>
Date: Sat Feb 28 16:37:07 2015 +0000
Remove previous hack for xwayland
With the new Xkb functions we don't need a special check for
xwayland.
src/vncdisplaykeymap.c | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/src/vncdisplaykeymap.c b/src/vncdisplaykeymap.c
index 4f076ce..4ed058d 100644
--- a/src/vncdisplaykeymap.c
+++ b/src/vncdisplaykeymap.c
@@ -155,18 +155,6 @@ static gboolean check_for_xquartz(GdkDisplay *dpy)
return match;
}
-
-static gboolean check_for_xwayland(GdkDisplay *dpy G_GNUC_UNUSED)
-{
- /* There is no obvious extension name or root window property
- * that identifies as Xwayland. It also does not report any
- * XKB info. So this env var check is least-worst option left
- */
- char *dpystr = getenv("WAYLAND_DISPLAY");
-
- VNC_DEBUG("Wayland display '%s'", dpystr ? dpystr : "<none>");
- return dpystr != NULL;
-}
#endif
const guint16 *vnc_display_keymap_gdk2rfb_table(size_t *maplen)
@@ -214,10 +202,6 @@ const guint16 *vnc_display_keymap_gdk2rfb_table(size_t *maplen)
VNC_DEBUG("Using xquartz keycode mapping");
*maplen = G_N_ELEMENTS(keymap_xorgxquartz2rfb);
return keymap_xorgxquartz2rfb;
- } else if (check_for_xwayland(dpy)) {
- VNC_DEBUG("Using wayland evdec keycode mapping");
- *maplen = G_N_ELEMENTS(keymap_xorgevdev2rfb);
- return keymap_xorgevdev2rfb;
} else if (keycodes && STRPREFIX(keycodes, "evdev")) {
VNC_DEBUG("Using evdev keycode mapping");
*maplen = G_N_ELEMENTS(keymap_xorgevdev2rfb);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]