diff options
| author | Peter Maydell | 2018-01-29 16:52:27 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-01-29 16:52:27 +0100 |
| commit | 30d9fefe1aca1e92c785214aa9201fd7c2287d56 (patch) | |
| tree | 32a879af6663e6841245dfcc40483a7ab70f801b /include | |
| parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
| parent | hw: convert virtio-input-hid device to keycodemapdb (diff) | |
| download | qemu-30d9fefe1aca1e92c785214aa9201fd7c2287d56.tar.gz qemu-30d9fefe1aca1e92c785214aa9201fd7c2287d56.tar.xz qemu-30d9fefe1aca1e92c785214aa9201fd7c2287d56.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/input-20180129-v2-pull-request' into staging
input: switch devices to keycodemapdb, bugfixes.
# gpg: Signature made Mon 29 Jan 2018 10:23:00 GMT
# 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/input-20180129-v2-pull-request:
hw: convert virtio-input-hid device to keycodemapdb
ui: fix alphabetical ordering of keymaps
hw: convert the escc device to keycodemapdb
hw: convert ps2 device to keycodemapdb
ps2: check PS2Queue pointers in post_load routine
input: virtio: don't send mouse wheel event twice
input: add mouse side buttons to virtio input
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/input.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/include/ui/input.h b/include/ui/input.h index 05aab2db5c..ceb22b8eef 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -74,15 +74,27 @@ extern const guint16 qemu_input_map_atset1_to_qcode[]; extern const guint qemu_input_map_linux_to_qcode_len; extern const guint16 qemu_input_map_linux_to_qcode[]; +extern const guint qemu_input_map_qcode_to_atset1_len; +extern const guint16 qemu_input_map_qcode_to_atset1[]; + +extern const guint qemu_input_map_qcode_to_atset2_len; +extern const guint16 qemu_input_map_qcode_to_atset2[]; + +extern const guint qemu_input_map_qcode_to_atset3_len; +extern const guint16 qemu_input_map_qcode_to_atset3[]; + +extern const guint qemu_input_map_qcode_to_linux_len; +extern const guint16 qemu_input_map_qcode_to_linux[]; + extern const guint qemu_input_map_qcode_to_qnum_len; extern const guint16 qemu_input_map_qcode_to_qnum[]; +extern const guint qemu_input_map_qcode_to_sun_len; +extern const guint16 qemu_input_map_qcode_to_sun[]; + extern const guint qemu_input_map_qnum_to_qcode_len; extern const guint16 qemu_input_map_qnum_to_qcode[]; -extern const guint qemu_input_map_qcode_to_linux_len; -extern const guint16 qemu_input_map_qcode_to_linux[]; - extern const guint qemu_input_map_usb_to_qcode_len; extern const guint16 qemu_input_map_usb_to_qcode[]; |