diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2017-02-27 13:23:43 +0000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-02-27 16:19:47 +0100 |
| commit | 857e479552cd092edf0f7af09ac5073d76e11057 (patch) | |
| tree | 93cac0bc0a8984b2ad5a0ea36a73da8cf18ef0e6 /ui/gtk.c | |
| parent | 543a7a161f51636f0c6a98f00cccab43f3a23993 (diff) | |
| download | focaccia-qemu-857e479552cd092edf0f7af09ac5073d76e11057.tar.gz focaccia-qemu-857e479552cd092edf0f7af09ac5073d76e11057.zip | |
ui: Use XkbGetMap and XkbGetNames instead of XkbGetKeyboard
XkbGetKeyboard does not work in XWayland and even on non-Wayland X11 servers its use is discouraged: https://bugs.freedesktop.org/show_bug.cgi?id=89240 This resolves a problem whereby QEMU prints "could not lookup keycode name" on startup when running under XWayland. Keymap handling is however still broken after this commit, since Xwayland is reporting a keymap we can't handle "unknown keycodes `(unnamed)', please report to qemu-devel@nongnu.org" NB, native Wayland support (which is the default under GTK3) is not affected - only XWayland (which can be requested with GDK_BACKEND on GTK3, and is the only option for GTK2). Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-id: 20170227132343.30824-1-berrange@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/gtk.c')
| -rw-r--r-- | ui/gtk.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/gtk.c b/ui/gtk.c index 640ff84368..a86848f3b0 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2201,11 +2201,12 @@ static void gd_set_keycode_type(GtkDisplayState *s) GdkDisplay *display = gtk_widget_get_display(s->window); if (GDK_IS_X11_DISPLAY(display)) { Display *x11_display = gdk_x11_display_get_xdisplay(display); - XkbDescPtr desc = XkbGetKeyboard(x11_display, XkbGBN_AllComponentsMask, - XkbUseCoreKbd); + XkbDescPtr desc = XkbGetMap(x11_display, XkbGBN_AllComponentsMask, + XkbUseCoreKbd); char *keycodes = NULL; - if (desc && desc->names) { + if (desc && + (XkbGetNames(x11_display, XkbKeycodesNameMask, desc) == Success)) { keycodes = XGetAtomName(x11_display, desc->names->keycodes); } if (keycodes == NULL) { |