qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 1e70de: ui: fix keymap detection under Xwayla


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 1e70de: ui: fix keymap detection under Xwayland
Date: Tue, 10 Apr 2018 07:18:43 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1e70de679d2e7e1312d9c9debed8d11612d469d9
      
https://github.com/qemu/qemu/commit/1e70de679d2e7e1312d9c9debed8d11612d469d9
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M ui/x_keymap.c

  Log Message:
  -----------
  ui: fix keymap detection under Xwayland

The X11 code currently detects the keymap by looking for the keycode
name property. Unfortunately due to the way Xwayland handles keyboards,
this property gets unset almost immediately after the first application
starts using Xwayland resulting in

  ** (qemu-system-x86_64:19644): WARNING **: Unknown X11 keycode mapping 
'(unnamed)'.
  Please report to address@hidden
  including the following information:

    - Operating system
    - X11 Server
    - xprop -root
    - xdpyinfo

Fortunately people will only see this problem if they built QEMU with
GTK2, or have told GTK3 to prefer X11 by setting the GDK_BACKEND=x11
env variable.

To workaround the problem, we add a heuristic that looks at what
scancode the XK_Page_Up keysymbol maps to, to determine if we've
likely got the X11 kbd or evdev driver.

Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: fa2d039b2cda314e83cc9fd8fd5b9d41c09a0993
      
https://github.com/qemu/qemu/commit/fa2d039b2cda314e83cc9fd8fd5b9d41c09a0993
  Author: Gerd Hoffmann <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  gtk: drop pointless code from gd_window_close

Unregistering the display change listener looks like a pointless
excercise given we'll exit in a moment.  When exiting qemu via
menu/file/quit this will not happen either.  Just drop the code.

Also return TRUE unconditionally.  This will tell gtk to ignore the
close request, so gtk will not start destroying widgets and causing
warnings due to UI code trying to talk to widgets which are gone.
Just depend on qmp_quit() doing it's job instead.

Reported-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-Id: <address@hidden>


  Commit: 5a464e6ce83907b72149cc6f504dd69c504ffa52
      
https://github.com/qemu/qemu/commit/5a464e6ce83907b72149cc6f504dd69c504ffa52
  Author: Peter Xu <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: don't warn GTK if disabled

We don't need to detect GTK ABI if GTK is disabled in general.
Otherwise we could get this warning (when host is installed with GTK ABI
version 2) even when configure with "--disable-gtk":

    WARNING: Use of GTK 2.0 is deprecated and will be removed in
    WARNING: future releases. Please switch to using GTK 3.0

CC: Paolo Bonzini <address@hidden>
CC: Gerd Hoffmann <address@hidden>
CC: Peter Maydell <address@hidden>
CC: Fam Zheng <address@hidden>
CC: "Philippe Mathieu-Daudé" <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c6093a05d6a84d2144bb6462cf20e907eddf8aeb
      
https://github.com/qemu/qemu/commit/c6093a05d6a84d2144bb6462cf20e907eddf8aeb
  Author: Peter Xu <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: don't warn SDL abi if disabled

SDL has the same problem as GTK that we might get warnings on SDL ABI
version even if SDL is disabled.  Fix that by only probing SDL if SDL is
enabled.  Also this should let configure be a little bit faster since we
don't really need to probe SDL stuff when it's off.

CC: Paolo Bonzini <address@hidden>
CC: Gerd Hoffmann <address@hidden>
CC: Peter Maydell <address@hidden>
CC: Daniel P. Berrange <address@hidden>
CC: Fam Zheng <address@hidden>
CC: "Philippe Mathieu-Daudé" <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: df6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8
      
https://github.com/qemu/qemu/commit/df6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8
  Author: Peter Maydell <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M configure
    M ui/gtk.c
    M ui/x_keymap.c

  Log Message:
  -----------
  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) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/daf6b59be8c7...df6378eb0e6c

reply via email to

[Prev in Thread] Current Thread [Next in Thread]