diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-27 15:27:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-27 15:27:06 +0100 |
| commit | e01151de165070c25a1b202e9e2392950bd7c8da (patch) | |
| tree | ed0caa6f429d5b388e9c9bacf23fd84b928291e5 /hw | |
| parent | 6be37cc583454ee27587a79b6008e22c3cc1a763 (diff) | |
| parent | 7c388dbd0b2c54b3d836c23ea43e2cee38de66a4 (diff) | |
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 'hw')
| -rw-r--r-- | hw/char/escc.c | 1 | ||||
| -rw-r--r-- | hw/input/adb.c | 1 | ||||
| -rw-r--r-- | hw/input/ps2.c | 6 |
3 files changed, 0 insertions, 8 deletions
diff --git a/hw/char/escc.c b/hw/char/escc.c index 89ae9eb997..1aca564e33 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -722,7 +722,6 @@ static const uint8_t qcode_to_keycode[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_SHIFT_R] = 110, [Q_KEY_CODE_ALT] = 19, [Q_KEY_CODE_ALT_R] = 13, - [Q_KEY_CODE_ALTGR] = 13, [Q_KEY_CODE_CTRL] = 76, [Q_KEY_CODE_CTRL_R] = 76, [Q_KEY_CODE_ESC] = 29, diff --git a/hw/input/adb.c b/hw/input/adb.c index 43d3205472..fcca3a8eb9 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -201,7 +201,6 @@ int qcode_to_adb_keycode[] = { [Q_KEY_CODE_SHIFT_R] = ADB_KEY_RIGHT_SHIFT, [Q_KEY_CODE_ALT] = ADB_KEY_LEFT_OPTION, [Q_KEY_CODE_ALT_R] = ADB_KEY_RIGHT_OPTION, - [Q_KEY_CODE_ALTGR] = ADB_KEY_RIGHT_OPTION, [Q_KEY_CODE_CTRL] = ADB_KEY_LEFT_CONTROL, [Q_KEY_CODE_CTRL_R] = ADB_KEY_RIGHT_CONTROL, [Q_KEY_CODE_META_L] = ADB_KEY_COMMAND, diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 3ba05efd06..9f057e46ea 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -224,7 +224,6 @@ static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_DOT] = 0x34, [Q_KEY_CODE_SLASH] = 0x35, -#if 0 [Q_KEY_CODE_POWER] = 0x0e5e, [Q_KEY_CODE_SLEEP] = 0x0e5f, [Q_KEY_CODE_WAKE] = 0x0e63, @@ -247,7 +246,6 @@ static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_AC_STOP] = 0xe068, [Q_KEY_CODE_AC_REFRESH] = 0xe067, [Q_KEY_CODE_AC_BOOKMARKS] = 0xe066, -#endif [Q_KEY_CODE_ASTERISK] = 0x37, [Q_KEY_CODE_LESS] = 0x56, @@ -366,7 +364,6 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_DOT] = 0x49, [Q_KEY_CODE_SLASH] = 0x4a, -#if 0 [Q_KEY_CODE_POWER] = 0x0e37, [Q_KEY_CODE_SLEEP] = 0x0e3f, [Q_KEY_CODE_WAKE] = 0x0e5e, @@ -389,10 +386,7 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_AC_STOP] = 0xe028, [Q_KEY_CODE_AC_REFRESH] = 0xe020, [Q_KEY_CODE_AC_BOOKMARKS] = 0xe018, -#endif - [Q_KEY_CODE_ALTGR] = 0x08, - [Q_KEY_CODE_ALTGR_R] = 0xe008, [Q_KEY_CODE_ASTERISK] = 0x7c, [Q_KEY_CODE_LESS] = 0x61, [Q_KEY_CODE_SYSRQ] = 0x7f, |