diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-28 14:20:17 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-28 14:20:17 +0100 |
| commit | 762971738c1857ab83ff68d0429bcca066e2dfb2 (patch) | |
| tree | 4dbe4fba48b46d63e5a0b145bce81138209ce47c /hw | |
| parent | 871a0f7ad2b9560c5f7d640125c5be95ca23ca7f (diff) | |
| parent | ef58430d5daeac4c18e4072f5860e25700aa8af6 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170728-pull-request' into staging
ui: more keymap fixes for 2.10
# gpg: Signature made Fri 28 Jul 2017 13:59:01 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-20170728-pull-request:
ui: add pause key to linux_to_qcode
ui: drop ac_search and ac_stop
ui: correctly detect spice PAUSE scancode sequence
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/input/ps2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 9f057e46ea..77906d5f46 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -239,11 +239,11 @@ static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_MAIL] = 0xe06c, [Q_KEY_CODE_CALCULATOR] = 0xe021, [Q_KEY_CODE_COMPUTER] = 0xe06b, - [Q_KEY_CODE_AC_SEARCH] = 0xe065, + [Q_KEY_CODE_FIND] = 0xe065, [Q_KEY_CODE_AC_HOME] = 0xe032, [Q_KEY_CODE_AC_BACK] = 0xe06a, [Q_KEY_CODE_AC_FORWARD] = 0xe069, - [Q_KEY_CODE_AC_STOP] = 0xe068, + [Q_KEY_CODE_STOP] = 0xe068, [Q_KEY_CODE_AC_REFRESH] = 0xe067, [Q_KEY_CODE_AC_BOOKMARKS] = 0xe066, @@ -379,11 +379,11 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_MAIL] = 0xe048, [Q_KEY_CODE_CALCULATOR] = 0xe02b, [Q_KEY_CODE_COMPUTER] = 0xe040, - [Q_KEY_CODE_AC_SEARCH] = 0xe010, + [Q_KEY_CODE_FIND] = 0xe010, [Q_KEY_CODE_AC_HOME] = 0xe03a, [Q_KEY_CODE_AC_BACK] = 0xe038, [Q_KEY_CODE_AC_FORWARD] = 0xe030, - [Q_KEY_CODE_AC_STOP] = 0xe028, + [Q_KEY_CODE_STOP] = 0xe028, [Q_KEY_CODE_AC_REFRESH] = 0xe020, [Q_KEY_CODE_AC_BOOKMARKS] = 0xe018, |