[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/9] ui: Use XkbGetMap and XkbGetNames instead of Xkb
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 7/9] ui: Use XkbGetMap and XkbGetNames instead of XkbGetKeyboard |
Date: |
Mon, 27 Feb 2017 17:18:41 +0100 |
From: "Daniel P. Berrange" <address@hidden>
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 address@hidden"
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 <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 7 ++++---
ui/sdl.c | 10 ++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 640ff84..a86848f 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) {
diff --git a/ui/sdl.c b/ui/sdl.c
index 19e8a84..37c21a0 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -233,10 +233,12 @@ static int check_for_evdev(void)
if (!SDL_GetWMInfo(&info)) {
return 0;
}
- desc = XkbGetKeyboard(info.info.x11.display,
- XkbGBN_AllComponentsMask,
- XkbUseCoreKbd);
- if (desc && desc->names) {
+ desc = XkbGetMap(info.info.x11.display,
+ XkbGBN_AllComponentsMask,
+ XkbUseCoreKbd);
+ if (desc &&
+ (XkbGetNames(info.info.x11.display,
+ XkbKeycodesNameMask, desc) == Success)) {
keycodes = XGetAtomName(info.info.x11.display, desc->names->keycodes);
if (keycodes == NULL) {
fprintf(stderr, "could not lookup keycode name\n");
--
1.8.3.1
- [Qemu-devel] [PULL 0/9] ui patch queue, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 2/9] console: add dpy_gl_scanout_disable, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 3/9] virtio-gpu: use dpy_gl_scanout_disable, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 5/9] sdl2: add scanout_disable support, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 4/9] spice: add scanout_disable support, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 6/9] gtk-egl: add scanout_disable support, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 8/9] spice: add display & head options, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 9/9] vnc: fix double free issues, Gerd Hoffmann, 2017/02/27
- [Qemu-devel] [PULL 7/9] ui: Use XkbGetMap and XkbGetNames instead of XkbGetKeyboard,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 1/9] console: rename dpy_gl_scanout to dpy_gl_scanout_texture, Gerd Hoffmann, 2017/02/27
- Re: [Qemu-devel] [PULL 0/9] ui patch queue, Peter Maydell, 2017/02/28