diff options
| author | Peter Maydell | 2017-07-27 16:27:06 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-27 16:27:06 +0200 |
| commit | e01151de165070c25a1b202e9e2392950bd7c8da (patch) | |
| tree | ed0caa6f429d5b388e9c9bacf23fd84b928291e5 /ui/keymaps.h | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20170726.0' in... (diff) | |
| parent | ps2: fix sending of PAUSE/BREAK scancodes (diff) | |
| download | qemu-e01151de165070c25a1b202e9e2392950bd7c8da.tar.gz qemu-e01151de165070c25a1b202e9e2392950bd7c8da.tar.xz 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/keymaps.h')
| -rw-r--r-- | ui/keymaps.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/keymaps.h b/ui/keymaps.h index 47d061343e..8757465529 100644 --- a/ui/keymaps.h +++ b/ui/keymaps.h @@ -59,6 +59,7 @@ typedef struct { /* "grey" keys will usually need a 0xe0 prefix */ #define SCANCODE_GREY 0x80 #define SCANCODE_EMUL0 0xE0 +#define SCANCODE_EMUL1 0xE1 /* "up" flag */ #define SCANCODE_UP 0x80 |