motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui: reverse keymap improvements.

Browse source 
sdl2: hotkey fix.
 opengl: dmabuf fixes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJajpoCAAoJEEy22O7T6HE4vqcQAMzpCiiQtheIrt6RPFN3Ix/a
 PhjA+qUp+qaptuuqGCR8/xiRvqsU8r683C9ut1yr+4cZRWHXkS/DiNdY2pe29BGK
 rki4POLb5cDNW8pok1kJnbDG7PKmKHed/12gnki4a9gc8L3SM3F9/eq260KymHOw
 LpAQMlQIcWI5OD+vhZbnQ/GShehc7veEr+q0mSiacYNvmxG+Vuc5UC/uBXPwoHvl
 dEJaz9xcNKGyk3CMA3XSci6syQrpmxN7uG8wRiWoVC8JNGpuH1hQPcXr+/pYVIyF
 Hp5OtHp0aUm+hPc1u1DKkFMXxkrYlOtv6Tx5+iZYJ4PsmWc4Q7jcwkEqjo7s3A6m
 xP4sA7WK7cem2di7sV3VAGk3QKH6hHZP66ekrEUxnJLZ7v7anRM1zcUGFuGew1CT
 S5mVQbES7SzpfrLeCp2wKBrkys4T+kcP9JeHtsAUiYFmCWg+2YRhF9Xf3nfQPbt4
 1FBdkx1yXcKjovh7J2NfZgm7HJSdeU0U1rUlwuGLxKusEfWcxJEqTvt+oC/xmbRq
 XVzlzIxF+fyzrqQc+ALATKME6FNoLQyJ8a2AX3KwvG8FtUk3VsCIbaVOlx79+qFk
 9lZre4CGZFCEIPYAakJVLqkCBaWYlKfTw/WHc2uAuvH1U8JgJ3/qiqrm9dAqFZWc
 0M20fjDcaKG5PL95n32T
 =4J0d
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180222-pull-request' into staging

ui: reverse keymap improvements.
sdl2: hotkey fix.
opengl: dmabuf fixes.

# gpg: Signature made Thu 22 Feb 2018 10:22:58 GMT
# 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-20180222-pull-request:
  keymap: consider modifier state when picking a mapping
  keymap: record multiple keysym -> keycode mappings
  keymap: numpad keysyms and keycodes are fixed
  keymap: use glib hash for kbd_layout_t
  keymap: make struct kbd_layout_t private to ui/keymaps.c
  egl-helpers: add alpha channel to texture format
  egl-headless: cursor_dmabuf: handle NULL cursor
  console/opengl: split up dpy_gl_cursor ops
  sdl2: fix hotkey keyup

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-02-22 14:44:42 +00:00
commit 0ce9cb913e
11 changed files with 151 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/ui/console.h
View file

@ -230,8 +230,10 @@ typedef struct DisplayChangeListenerOps {
void (*dpy_gl_scanout_dmabuf)(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf);
void (*dpy_gl_cursor_dmabuf)(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf,
uint32_t pos_x, uint32_t pos_y);
QemuDmaBuf *dmabuf, bool have_hot,
uint32_t hot_x, uint32_t hot_y);
void (*dpy_gl_cursor_position)(DisplayChangeListener *dcl,
uint32_t pos_x, uint32_t pos_y);
void (*dpy_gl_release_dmabuf)(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf);
void (*dpy_gl_update)(DisplayChangeListener *dcl,
@ -304,9 +306,10 @@ void dpy_gl_scanout_texture(QemuConsole *con,
uint32_t x, uint32_t y, uint32_t w, uint32_t h);
void dpy_gl_scanout_dmabuf(QemuConsole *con,
QemuDmaBuf *dmabuf);
void dpy_gl_cursor_dmabuf(QemuConsole *con,
QemuDmaBuf *dmabuf,
uint32_t pos_x, uint32_t pos_y);
void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf,
bool have_hot, uint32_t hot_x, uint32_t hot_y);
void dpy_gl_cursor_position(QemuConsole *con,
uint32_t pos_x, uint32_t pos_y);
void dpy_gl_release_dmabuf(QemuConsole *con,
QemuDmaBuf *dmabuf);
void dpy_gl_update(QemuConsole *con,