The following changes since commit a6e0344fa0e09413324835ae122c4cadd7890231:
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180220-pull-request' into staging (2018-02-20 14:05:00 +0000) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20180222-pull-request for you to fetch changes up to abb4f2c9655503f14dc55064f29c4f59b07e96ff: keymap: consider modifier state when picking a mapping (2018-02-22 10:35:32 +0100) ---------------------------------------------------------------- ui: reverse keymap improvements. sdl2: hotkey fix. opengl: dmabuf fixes. ---------------------------------------------------------------- Gerd Hoffmann (9): sdl2: fix hotkey keyup console/opengl: split up dpy_gl_cursor ops egl-headless: cursor_dmabuf: handle NULL cursor egl-helpers: add alpha channel to texture format keymap: make struct kbd_layout_t private to ui/keymaps.c keymap: use glib hash for kbd_layout_t keymap: numpad keysyms and keycodes are fixed keymap: record multiple keysym -> keycode mappings keymap: consider modifier state when picking a mapping include/ui/console.h | 13 ++-- ui/keymaps.h | 30 +++------- ui/console.c | 18 ++++-- ui/curses.c | 3 +- ui/egl-headless.c | 30 ++++++---- ui/egl-helpers.c | 2 +- ui/keymaps.c | 163 ++++++++++++++++++++++++++------------------------- ui/sdl.c | 6 +- ui/sdl2.c | 14 +---- ui/vnc.c | 9 ++- ui/trace-events | 2 +- 11 files changed, 151 insertions(+), 139 deletions(-) -- 2.9.3
