From: Peter Maydell Date: Tue, 5 Feb 2019 14:01:29 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190205-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=01a9a51ffaf4699827ea6425cb2b834a356e159d;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190205-pull-request' into staging ui: add kbd stats tracker. ui: gtk scroll fixes. ui: egl cursor scale fix. ui: more sdl1 cleanup. # gpg: Signature made Tue 05 Feb 2019 10:57:42 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " [full] # gpg: aka "Gerd Hoffmann " [full] # gpg: aka "Gerd Hoffmann (private) " [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20190205-pull-request: keymap: fix keyup mappings keymap: pass full keyboard state to keysym2scancode kbd-state: use state tracker for vnc kbd-state: use state tracker for gtk sdl2: use only QKeyCode in sdl2_process_key() kbd-state: use state tracker for sdl2 sdl2: remove sdl2_reset_keys() function kbd-state: add keyboard state tracker ui/egl-helpers: Augment parameter list of egl_texture_blend() to convey scales of viewport ui/cocoa.m: Fix macOS 10.14 deprecation warnings ui/sdl_keysym: Remove obsolete SDL1.2 related code ui: listen for GDK_SMOOTH_SCROLL events ui: don't send any event if delta_y == 0 Remove deprecated -no-frame option Signed-off-by: Peter Maydell --- 01a9a51ffaf4699827ea6425cb2b834a356e159d