diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-10 14:04:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-10 14:04:27 +0100 |
| commit | df6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8 (patch) | |
| tree | c2b5757d53b6c108d5974501101ec8c7085fd00f /ui/x_keymap.c | |
| parent | daf6b59be8c703264765a533bc63421caef95225 (diff) | |
| parent | c6093a05d6a84d2144bb6462cf20e907eddf8aeb (diff) | |
| download | focaccia-qemu-df6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8.tar.gz focaccia-qemu-df6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180410-pull-request' into staging
configure: don't warn on old sdl/gtk versions if disabled. keymap + gtk fixes. # gpg: Signature made Tue 10 Apr 2018 10:23:37 BST # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20180410-pull-request: configure: don't warn SDL abi if disabled configure: don't warn GTK if disabled gtk: drop pointless code from gd_window_close ui: fix keymap detection under Xwayland Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/x_keymap.c')
| -rw-r--r-- | ui/x_keymap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/x_keymap.c b/ui/x_keymap.c index 22e0e77c4d..2bc01432e5 100644 --- a/ui/x_keymap.c +++ b/ui/x_keymap.c @@ -17,6 +17,7 @@ #include "ui/input.h" #include <X11/XKBlib.h> +#include <X11/Xutil.h> static gboolean check_for_xwin(Display *dpy) { @@ -87,11 +88,13 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy, size_t *maplen) trace_xkeymap_keymap("xquartz"); *maplen = qemu_input_map_xorgxquartz_to_qcode_len; return qemu_input_map_xorgxquartz_to_qcode; - } else if (keycodes && g_str_has_prefix(keycodes, "evdev")) { + } else if ((keycodes && g_str_has_prefix(keycodes, "evdev")) || + (XKeysymToKeycode(dpy, XK_Page_Up) == 0x70)) { trace_xkeymap_keymap("evdev"); *maplen = qemu_input_map_xorgevdev_to_qcode_len; return qemu_input_map_xorgevdev_to_qcode; - } else if (keycodes && g_str_has_prefix(keycodes, "xfree86")) { + } else if ((keycodes && g_str_has_prefix(keycodes, "xfree86")) || + (XKeysymToKeycode(dpy, XK_Page_Up) == 0x63)) { trace_xkeymap_keymap("kbd"); *maplen = qemu_input_map_xorgkbd_to_qcode_len; return qemu_input_map_xorgkbd_to_qcode; |