summary refs log tree commit diff stats
path: root/ui/vnc_keysym.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-27 15:27:06 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-27 15:27:06 +0100
commite01151de165070c25a1b202e9e2392950bd7c8da (patch)
treeed0caa6f429d5b388e9c9bacf23fd84b928291e5 /ui/vnc_keysym.h
parent6be37cc583454ee27587a79b6008e22c3cc1a763 (diff)
parent7c388dbd0b2c54b3d836c23ea43e2cee38de66a4 (diff)
downloadfocaccia-qemu-e01151de165070c25a1b202e9e2392950bd7c8da.tar.gz
focaccia-qemu-e01151de165070c25a1b202e9e2392950bd7c8da.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170727-pull-request' into staging
ui: keymap fixes for 2.10

# gpg: Signature made Thu 27 Jul 2017 15:00:06 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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-20170727-pull-request:
  ps2: fix sending of PAUSE/BREAK scancodes
  ui: drop altgr and altgr_r QKeyCodes
  ps2: enable multimedia keys
  ui: add multimedia keys
  ui: update keymaps
  ui: move qemu_input_linux_to_qcode()
  ui: add next and prior keysyms

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/vnc_keysym.h')
-rw-r--r--ui/vnc_keysym.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/vnc_keysym.h b/ui/vnc_keysym.h
index 7fa2bc1f1c..e8a2ec73c5 100644
--- a/ui/vnc_keysym.h
+++ b/ui/vnc_keysym.h
@@ -254,7 +254,9 @@ static const name2keysym_t name2keysym[]={
 {"Left", 0xff51},      /* XK_Left */
 {"Up", 0xff52},        /* XK_Up */
 {"Down", 0xff54},      /* XK_Down */
+{"Next", 0xff56},
 {"Page_Down", 0xff56}, /* XK_Page_Down */
+{"Prior", 0xff55},
 {"Page_Up", 0xff55},   /* XK_Page_Up */
 {"Insert", 0xff63},    /* XK_Insert */
 {"Delete", 0xffff},    /* XK_Delete */