diff options
| author | Peter Maydell | 2015-05-29 12:23:07 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-05-29 12:23:07 +0200 |
| commit | 9441aa282bc3213ef0530cab86f318b877bac25c (patch) | |
| tree | 8c82245fe6295b71dab3599dfe110e0f8be1254b /ui | |
| parent | Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150529-1' into ... (diff) | |
| parent | virtio-input: emulated devices [device] (diff) | |
| download | qemu-9441aa282bc3213ef0530cab86f318b877bac25c.tar.gz qemu-9441aa282bc3213ef0530cab86f318b877bac25c.tar.xz qemu-9441aa282bc3213ef0530cab86f318b877bac25c.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150529-1' into staging
kbd: add support for brazilian keyboard (two extra keys).
input: add virtio-input devices.
# gpg: Signature made Fri May 29 10:09:02 2015 BST using RSA key ID D3E87138
# 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>"
* remotes/kraxel/tags/pull-input-20150529-1:
virtio-input: emulated devices [device]
virtio-input: core code & base class [device]
virtio-input: add linux/input.h
kbd: add brazil kbd keys to x11 evdev map
kbd: add brazil kbd keys to qemu
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/input-keymap.c | 4 | ||||
| -rw-r--r-- | ui/x_keymap.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 5d299353a8..7635cb0dc4 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -128,6 +128,10 @@ static const int qcode_to_number[] = { [Q_KEY_CODE_INSERT] = 0xd2, [Q_KEY_CODE_DELETE] = 0xd3, + + [Q_KEY_CODE_RO] = 0x73, + [Q_KEY_CODE_KP_COMMA] = 0x7e, + [Q_KEY_CODE_MAX] = 0, }; diff --git a/ui/x_keymap.c b/ui/x_keymap.c index b9b0944180..1a773174f6 100644 --- a/ui/x_keymap.c +++ b/ui/x_keymap.c @@ -94,7 +94,7 @@ static const uint8_t x_keycode_to_pc_keycode[115] = { */ static const uint8_t evdev_keycode_to_pc_keycode[61] = { - 0, /* 97 EVDEV - RO ("Internet" Keyboards) */ + 0x73, /* 97 EVDEV - RO ("Internet" Keyboards) */ 0, /* 98 EVDEV - KATA (Katakana) */ 0, /* 99 EVDEV - HIRA (Hiragana) */ 0x79, /* 100 EVDEV - HENK (Henkan) */ @@ -126,7 +126,7 @@ static const uint8_t evdev_keycode_to_pc_keycode[61] = { 0, /* 126 EVDEV - I126 ("Internet" Keyboards) */ 0, /* 127 EVDEV - PAUS */ 0, /* 128 EVDEV - ???? */ - 0, /* 129 EVDEV - I129 ("Internet" Keyboards) */ + 0x7e, /* 129 EVDEV - KP_COMMA (brazilian) */ 0xf1, /* 130 EVDEV - HNGL (Korean Hangul Latin toggle) */ 0xf2, /* 131 EVDEV - HJCV (Korean Hangul Hanja toggle) */ 0x7d, /* 132 AE13 (Yen)*/ |