mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input: switch devices to keycodemapdb, bugfixes.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJabvYEAAoJEEy22O7T6HE4uP0P/1X7LUon/S2EaxS34wZ7n4FQ
 fwLRUBwxGG6hcdqpO+4AJdrM/XCJa+h/ffVrJ2f39xSMzi1WU2E3FfcZNeBAR9s+
 +2RM4bepO5qAUTdsWYPGRJskLk6OfMt2IYSSldXHxzc1h513UoVpvCaY/xHpdm0a
 8Bd3q0OJGYVpu2uilUCjYxxujrhJ2qsa6R9gmYjnnEQNds3nD2an/1jCOZMAWvTC
 Ef9XdXBCgwGHjpNj2XA0OfR0ZwRgDJFMrImOuSqPBhPl6VL9HGvZp6LoK0tD2QYe
 u67mVQgGGdwlTEk+dCEnpR+exxMTzBGUO4/JW+4eMJdyJMxUfUkoJ9XL9Z3JIwpr
 L9DrjbW8tfxh3qI3ImP7uGa2xluZD3UGHWb7GIzthn5+aYkGQdRuO+kJFeD0jueW
 hRBzzyerLzAj3G/O0fV1ErH/Vk0vthALMQikgqxvdsmoLG8CNKlCUtc2OAsSiEMX
 SBcY2JO9eRy3uGLRmSIfOkNqTYVaJnkIS/513cfu+grntNIBkK/qSIaVXxoQpPbu
 cN+oRX5Jz6LWADhi35j+8he3pw8CqFw05t7Db9SF7aD+aJWVMCx2c2h/qgpL1sNn
 95BPJYA+7qoBaJSLDAvpl1tuvIDfYmvIV+yMefZjerhjTxZn8Zs4d67bENaXCOOo
 +Aq44LgjUgCYOWJvYGr8
 =FnNY
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-01-29 15:52:27 +00:00
commit 30d9fefe1a
6 changed files with 64 additions and 669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -234,9 +234,13 @@ KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
KEYCODEMAP_FILES = \ KEYCODEMAP_FILES = \
ui/input-keymap-atset1-to-qcode.c \ ui/input-keymap-atset1-to-qcode.c \
ui/input-keymap-linux-to-qcode.c \ ui/input-keymap-linux-to-qcode.c \
ui/input-keymap-qcode-to-qnum.c \ ui/input-keymap-qcode-to-atset1.c \
ui/input-keymap-qnum-to-qcode.c \ ui/input-keymap-qcode-to-atset2.c \
ui/input-keymap-qcode-to-atset3.c \
ui/input-keymap-qcode-to-linux.c \ ui/input-keymap-qcode-to-linux.c \
ui/input-keymap-qcode-to-qnum.c \
ui/input-keymap-qcode-to-sun.c \
ui/input-keymap-qnum-to-qcode.c \
ui/input-keymap-usb-to-qcode.c \ ui/input-keymap-usb-to-qcode.c \
ui/input-keymap-win32-to-qcode.c \ ui/input-keymap-win32-to-qcode.c \
ui/input-keymap-x11-to-qcode.c \ ui/input-keymap-x11-to-qcode.c \

126
hw/char/escc.c
View File

@ -717,126 +717,6 @@ MemoryRegion *escc_init(hwaddr base, qemu_irq irqA, qemu_irq irqB,
return &d->mmio; return &d->mmio;
} }
static const uint8_t qcode_to_keycode[Q_KEY_CODE__MAX] = {
[Q_KEY_CODE_SHIFT] = 99,
[Q_KEY_CODE_SHIFT_R] = 110,
[Q_KEY_CODE_ALT] = 19,
[Q_KEY_CODE_ALT_R] = 13,
[Q_KEY_CODE_CTRL] = 76,
[Q_KEY_CODE_CTRL_R] = 76,
[Q_KEY_CODE_ESC] = 29,
[Q_KEY_CODE_1] = 30,
[Q_KEY_CODE_2] = 31,
[Q_KEY_CODE_3] = 32,
[Q_KEY_CODE_4] = 33,
[Q_KEY_CODE_5] = 34,
[Q_KEY_CODE_6] = 35,
[Q_KEY_CODE_7] = 36,
[Q_KEY_CODE_8] = 37,
[Q_KEY_CODE_9] = 38,
[Q_KEY_CODE_0] = 39,
[Q_KEY_CODE_MINUS] = 40,
[Q_KEY_CODE_EQUAL] = 41,
[Q_KEY_CODE_BACKSPACE] = 43,
[Q_KEY_CODE_TAB] = 53,
[Q_KEY_CODE_Q] = 54,
[Q_KEY_CODE_W] = 55,
[Q_KEY_CODE_E] = 56,
[Q_KEY_CODE_R] = 57,
[Q_KEY_CODE_T] = 58,
[Q_KEY_CODE_Y] = 59,
[Q_KEY_CODE_U] = 60,
[Q_KEY_CODE_I] = 61,
[Q_KEY_CODE_O] = 62,
[Q_KEY_CODE_P] = 63,
[Q_KEY_CODE_BRACKET_LEFT] = 64,
[Q_KEY_CODE_BRACKET_RIGHT] = 65,
[Q_KEY_CODE_RET] = 89,
[Q_KEY_CODE_A] = 77,
[Q_KEY_CODE_S] = 78,
[Q_KEY_CODE_D] = 79,
[Q_KEY_CODE_F] = 80,
[Q_KEY_CODE_G] = 81,
[Q_KEY_CODE_H] = 82,
[Q_KEY_CODE_J] = 83,
[Q_KEY_CODE_K] = 84,
[Q_KEY_CODE_L] = 85,
[Q_KEY_CODE_SEMICOLON] = 86,
[Q_KEY_CODE_APOSTROPHE] = 87,
[Q_KEY_CODE_GRAVE_ACCENT] = 42,
[Q_KEY_CODE_BACKSLASH] = 88,
[Q_KEY_CODE_Z] = 100,
[Q_KEY_CODE_X] = 101,
[Q_KEY_CODE_C] = 102,
[Q_KEY_CODE_V] = 103,
[Q_KEY_CODE_B] = 104,
[Q_KEY_CODE_N] = 105,
[Q_KEY_CODE_M] = 106,
[Q_KEY_CODE_COMMA] = 107,
[Q_KEY_CODE_DOT] = 108,
[Q_KEY_CODE_SLASH] = 109,
[Q_KEY_CODE_ASTERISK] = 47,
[Q_KEY_CODE_SPC] = 121,
[Q_KEY_CODE_CAPS_LOCK] = 119,
[Q_KEY_CODE_F1] = 5,
[Q_KEY_CODE_F2] = 6,
[Q_KEY_CODE_F3] = 8,
[Q_KEY_CODE_F4] = 10,
[Q_KEY_CODE_F5] = 12,
[Q_KEY_CODE_F6] = 14,
[Q_KEY_CODE_F7] = 16,
[Q_KEY_CODE_F8] = 17,
[Q_KEY_CODE_F9] = 18,
[Q_KEY_CODE_F10] = 7,
[Q_KEY_CODE_NUM_LOCK] = 98,
[Q_KEY_CODE_SCROLL_LOCK] = 23,
[Q_KEY_CODE_KP_DIVIDE] = 46,
[Q_KEY_CODE_KP_MULTIPLY] = 47,
[Q_KEY_CODE_KP_SUBTRACT] = 71,
[Q_KEY_CODE_KP_ADD] = 125,
[Q_KEY_CODE_KP_ENTER] = 90,
[Q_KEY_CODE_KP_DECIMAL] = 50,
[Q_KEY_CODE_KP_0] = 94,
[Q_KEY_CODE_KP_1] = 112,
[Q_KEY_CODE_KP_2] = 113,
[Q_KEY_CODE_KP_3] = 114,
[Q_KEY_CODE_KP_4] = 91,
[Q_KEY_CODE_KP_5] = 92,
[Q_KEY_CODE_KP_6] = 93,
[Q_KEY_CODE_KP_7] = 68,
[Q_KEY_CODE_KP_8] = 69,
[Q_KEY_CODE_KP_9] = 70,
[Q_KEY_CODE_LESS] = 124,
[Q_KEY_CODE_F11] = 9,
[Q_KEY_CODE_F12] = 11,
[Q_KEY_CODE_HOME] = 52,
[Q_KEY_CODE_PGUP] = 96,
[Q_KEY_CODE_PGDN] = 123,
[Q_KEY_CODE_END] = 74,
[Q_KEY_CODE_LEFT] = 24,
[Q_KEY_CODE_UP] = 20,
[Q_KEY_CODE_DOWN] = 27,
[Q_KEY_CODE_RIGHT] = 28,
[Q_KEY_CODE_INSERT] = 44,
[Q_KEY_CODE_DELETE] = 66,
[Q_KEY_CODE_STOP] = 1,
[Q_KEY_CODE_AGAIN] = 3,
[Q_KEY_CODE_PROPS] = 25,
[Q_KEY_CODE_UNDO] = 26,
[Q_KEY_CODE_FRONT] = 49,
[Q_KEY_CODE_COPY] = 51,
[Q_KEY_CODE_OPEN] = 72,
[Q_KEY_CODE_PASTE] = 73,
[Q_KEY_CODE_FIND] = 95,
[Q_KEY_CODE_CUT] = 97,
[Q_KEY_CODE_LF] = 111,
[Q_KEY_CODE_HELP] = 118,
[Q_KEY_CODE_META_L] = 120,
[Q_KEY_CODE_META_R] = 122,
[Q_KEY_CODE_COMPOSE] = 67,
[Q_KEY_CODE_PRINT] = 22,
[Q_KEY_CODE_SYSRQ] = 21,
};
static void sunkbd_handle_event(DeviceState *dev, QemuConsole *src, static void sunkbd_handle_event(DeviceState *dev, QemuConsole *src,
InputEvent *evt) InputEvent *evt)
@ -879,7 +759,11 @@ static void sunkbd_handle_event(DeviceState *dev, QemuConsole *src,
} }
} }
keycode = qcode_to_keycode[qcode]; if (qcode > qemu_input_map_qcode_to_sun_len) {
return;
}
keycode = qemu_input_map_qcode_to_sun[qcode];
if (!key->down) { if (!key->down) {
keycode |= 0x80; keycode |= 0x80;
} }

427
hw/input/ps2.c
View File

@ -124,401 +124,6 @@ typedef struct {
uint8_t mouse_buttons; uint8_t mouse_buttons;
} PS2MouseState; } PS2MouseState;
/* Table to convert from QEMU codes to scancodes. */
static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = {
[0 ... Q_KEY_CODE__MAX - 1] = 0,
[Q_KEY_CODE_A] = 0x1e,
[Q_KEY_CODE_B] = 0x30,
[Q_KEY_CODE_C] = 0x2e,
[Q_KEY_CODE_D] = 0x20,
[Q_KEY_CODE_E] = 0x12,
[Q_KEY_CODE_F] = 0x21,
[Q_KEY_CODE_G] = 0x22,
[Q_KEY_CODE_H] = 0x23,
[Q_KEY_CODE_I] = 0x17,
[Q_KEY_CODE_J] = 0x24,
[Q_KEY_CODE_K] = 0x25,
[Q_KEY_CODE_L] = 0x26,
[Q_KEY_CODE_M] = 0x32,
[Q_KEY_CODE_N] = 0x31,
[Q_KEY_CODE_O] = 0x18,
[Q_KEY_CODE_P] = 0x19,
[Q_KEY_CODE_Q] = 0x10,
[Q_KEY_CODE_R] = 0x13,
[Q_KEY_CODE_S] = 0x1f,
[Q_KEY_CODE_T] = 0x14,
[Q_KEY_CODE_U] = 0x16,
[Q_KEY_CODE_V] = 0x2f,
[Q_KEY_CODE_W] = 0x11,
[Q_KEY_CODE_X] = 0x2d,
[Q_KEY_CODE_Y] = 0x15,
[Q_KEY_CODE_Z] = 0x2c,
[Q_KEY_CODE_0] = 0x0b,
[Q_KEY_CODE_1] = 0x02,
[Q_KEY_CODE_2] = 0x03,
[Q_KEY_CODE_3] = 0x04,
[Q_KEY_CODE_4] = 0x05,
[Q_KEY_CODE_5] = 0x06,
[Q_KEY_CODE_6] = 0x07,
[Q_KEY_CODE_7] = 0x08,
[Q_KEY_CODE_8] = 0x09,
[Q_KEY_CODE_9] = 0x0a,
[Q_KEY_CODE_GRAVE_ACCENT] = 0x29,
[Q_KEY_CODE_MINUS] = 0x0c,
[Q_KEY_CODE_EQUAL] = 0x0d,
[Q_KEY_CODE_BACKSLASH] = 0x2b,
[Q_KEY_CODE_BACKSPACE] = 0x0e,
[Q_KEY_CODE_SPC] = 0x39,
[Q_KEY_CODE_TAB] = 0x0f,
[Q_KEY_CODE_CAPS_LOCK] = 0x3a,
[Q_KEY_CODE_SHIFT] = 0x2a,
[Q_KEY_CODE_CTRL] = 0x1d,
[Q_KEY_CODE_META_L] = 0xe05b,
[Q_KEY_CODE_ALT] = 0x38,
[Q_KEY_CODE_SHIFT_R] = 0x36,
[Q_KEY_CODE_CTRL_R] = 0xe01d,
[Q_KEY_CODE_META_R] = 0xe05c,
[Q_KEY_CODE_ALT_R] = 0xe038,
[Q_KEY_CODE_MENU] = 0xe05d,
[Q_KEY_CODE_RET] = 0x1c,
[Q_KEY_CODE_ESC] = 0x01,
[Q_KEY_CODE_F1] = 0x3b,
[Q_KEY_CODE_F2] = 0x3c,
[Q_KEY_CODE_F3] = 0x3d,
[Q_KEY_CODE_F4] = 0x3e,
[Q_KEY_CODE_F5] = 0x3f,
[Q_KEY_CODE_F6] = 0x40,
[Q_KEY_CODE_F7] = 0x41,
[Q_KEY_CODE_F8] = 0x42,
[Q_KEY_CODE_F9] = 0x43,
[Q_KEY_CODE_F10] = 0x44,
[Q_KEY_CODE_F11] = 0x57,
[Q_KEY_CODE_F12] = 0x58,
/* special handling for Q_KEY_CODE_PRINT */
[Q_KEY_CODE_SCROLL_LOCK] = 0x46,
/* special handling for Q_KEY_CODE_PAUSE */
[Q_KEY_CODE_BRACKET_LEFT] = 0x1a,
[Q_KEY_CODE_INSERT] = 0xe052,
[Q_KEY_CODE_HOME] = 0xe047,
[Q_KEY_CODE_PGUP] = 0xe049,
[Q_KEY_CODE_DELETE] = 0xe053,
[Q_KEY_CODE_END] = 0xe04f,
[Q_KEY_CODE_PGDN] = 0xe051,
[Q_KEY_CODE_UP] = 0xe048,
[Q_KEY_CODE_LEFT] = 0xe04b,
[Q_KEY_CODE_DOWN] = 0xe050,
[Q_KEY_CODE_RIGHT] = 0xe04d,
[Q_KEY_CODE_NUM_LOCK] = 0x45,
[Q_KEY_CODE_KP_DIVIDE] = 0xe035,
[Q_KEY_CODE_KP_MULTIPLY] = 0x37,
[Q_KEY_CODE_KP_SUBTRACT] = 0x4a,
[Q_KEY_CODE_KP_ADD] = 0x4e,
[Q_KEY_CODE_KP_ENTER] = 0xe01c,
[Q_KEY_CODE_KP_DECIMAL] = 0x53,
[Q_KEY_CODE_KP_0] = 0x52,
[Q_KEY_CODE_KP_1] = 0x4f,
[Q_KEY_CODE_KP_2] = 0x50,
[Q_KEY_CODE_KP_3] = 0x51,
[Q_KEY_CODE_KP_4] = 0x4b,
[Q_KEY_CODE_KP_5] = 0x4c,
[Q_KEY_CODE_KP_6] = 0x4d,
[Q_KEY_CODE_KP_7] = 0x47,
[Q_KEY_CODE_KP_8] = 0x48,
[Q_KEY_CODE_KP_9] = 0x49,
[Q_KEY_CODE_BRACKET_RIGHT] = 0x1b,
[Q_KEY_CODE_SEMICOLON] = 0x27,
[Q_KEY_CODE_APOSTROPHE] = 0x28,
[Q_KEY_CODE_COMMA] = 0x33,
[Q_KEY_CODE_DOT] = 0x34,
[Q_KEY_CODE_SLASH] = 0x35,
[Q_KEY_CODE_POWER] = 0x0e5e,
[Q_KEY_CODE_SLEEP] = 0x0e5f,
[Q_KEY_CODE_WAKE] = 0x0e63,
[Q_KEY_CODE_AUDIONEXT] = 0xe019,
[Q_KEY_CODE_AUDIOPREV] = 0xe010,
[Q_KEY_CODE_AUDIOSTOP] = 0xe024,
[Q_KEY_CODE_AUDIOPLAY] = 0xe022,
[Q_KEY_CODE_AUDIOMUTE] = 0xe020,
[Q_KEY_CODE_VOLUMEUP] = 0xe030,
[Q_KEY_CODE_VOLUMEDOWN] = 0xe02e,
[Q_KEY_CODE_MEDIASELECT] = 0xe06d,
[Q_KEY_CODE_MAIL] = 0xe06c,
[Q_KEY_CODE_CALCULATOR] = 0xe021,
[Q_KEY_CODE_COMPUTER] = 0xe06b,
[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_STOP] = 0xe068,
[Q_KEY_CODE_AC_REFRESH] = 0xe067,
[Q_KEY_CODE_AC_BOOKMARKS] = 0xe066,
[Q_KEY_CODE_ASTERISK] = 0x37,
[Q_KEY_CODE_LESS] = 0x56,
[Q_KEY_CODE_RO] = 0x73,
[Q_KEY_CODE_HIRAGANA] = 0x70,
[Q_KEY_CODE_HENKAN] = 0x79,
[Q_KEY_CODE_YEN] = 0x7d,
[Q_KEY_CODE_KP_COMMA] = 0x7e,
};
static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = {
[0 ... Q_KEY_CODE__MAX - 1] = 0,
[Q_KEY_CODE_A] = 0x1c,
[Q_KEY_CODE_B] = 0x32,
[Q_KEY_CODE_C] = 0x21,
[Q_KEY_CODE_D] = 0x23,
[Q_KEY_CODE_E] = 0x24,
[Q_KEY_CODE_F] = 0x2b,
[Q_KEY_CODE_G] = 0x34,
[Q_KEY_CODE_H] = 0x33,
[Q_KEY_CODE_I] = 0x43,
[Q_KEY_CODE_J] = 0x3b,
[Q_KEY_CODE_K] = 0x42,
[Q_KEY_CODE_L] = 0x4b,
[Q_KEY_CODE_M] = 0x3a,
[Q_KEY_CODE_N] = 0x31,
[Q_KEY_CODE_O] = 0x44,
[Q_KEY_CODE_P] = 0x4d,
[Q_KEY_CODE_Q] = 0x15,
[Q_KEY_CODE_R] = 0x2d,
[Q_KEY_CODE_S] = 0x1b,
[Q_KEY_CODE_T] = 0x2c,
[Q_KEY_CODE_U] = 0x3c,
[Q_KEY_CODE_V] = 0x2a,
[Q_KEY_CODE_W] = 0x1d,
[Q_KEY_CODE_X] = 0x22,
[Q_KEY_CODE_Y] = 0x35,
[Q_KEY_CODE_Z] = 0x1a,
[Q_KEY_CODE_0] = 0x45,
[Q_KEY_CODE_1] = 0x16,
[Q_KEY_CODE_2] = 0x1e,
[Q_KEY_CODE_3] = 0x26,
[Q_KEY_CODE_4] = 0x25,
[Q_KEY_CODE_5] = 0x2e,
[Q_KEY_CODE_6] = 0x36,
[Q_KEY_CODE_7] = 0x3d,
[Q_KEY_CODE_8] = 0x3e,
[Q_KEY_CODE_9] = 0x46,
[Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
[Q_KEY_CODE_MINUS] = 0x4e,
[Q_KEY_CODE_EQUAL] = 0x55,
[Q_KEY_CODE_BACKSLASH] = 0x5d,
[Q_KEY_CODE_BACKSPACE] = 0x66,
[Q_KEY_CODE_SPC] = 0x29,
[Q_KEY_CODE_TAB] = 0x0d,
[Q_KEY_CODE_CAPS_LOCK] = 0x58,
[Q_KEY_CODE_SHIFT] = 0x12,
[Q_KEY_CODE_CTRL] = 0x14,
[Q_KEY_CODE_META_L] = 0xe01f,
[Q_KEY_CODE_ALT] = 0x11,
[Q_KEY_CODE_SHIFT_R] = 0x59,
[Q_KEY_CODE_CTRL_R] = 0xe014,
[Q_KEY_CODE_META_R] = 0xe027,
[Q_KEY_CODE_ALT_R] = 0xe011,
[Q_KEY_CODE_MENU] = 0xe02f,
[Q_KEY_CODE_RET] = 0x5a,
[Q_KEY_CODE_ESC] = 0x76,
[Q_KEY_CODE_F1] = 0x05,
[Q_KEY_CODE_F2] = 0x06,
[Q_KEY_CODE_F3] = 0x04,
[Q_KEY_CODE_F4] = 0x0c,
[Q_KEY_CODE_F5] = 0x03,
[Q_KEY_CODE_F6] = 0x0b,
[Q_KEY_CODE_F7] = 0x83,
[Q_KEY_CODE_F8] = 0x0a,
[Q_KEY_CODE_F9] = 0x01,
[Q_KEY_CODE_F10] = 0x09,
[Q_KEY_CODE_F11] = 0x78,
[Q_KEY_CODE_F12] = 0x07,
/* special handling for Q_KEY_CODE_PRINT */
[Q_KEY_CODE_SCROLL_LOCK] = 0x7e,
/* special handling for Q_KEY_CODE_PAUSE */
[Q_KEY_CODE_BRACKET_LEFT] = 0x54,
[Q_KEY_CODE_INSERT] = 0xe070,
[Q_KEY_CODE_HOME] = 0xe06c,
[Q_KEY_CODE_PGUP] = 0xe07d,
[Q_KEY_CODE_DELETE] = 0xe071,
[Q_KEY_CODE_END] = 0xe069,
[Q_KEY_CODE_PGDN] = 0xe07a,
[Q_KEY_CODE_UP] = 0xe075,
[Q_KEY_CODE_LEFT] = 0xe06b,
[Q_KEY_CODE_DOWN] = 0xe072,
[Q_KEY_CODE_RIGHT] = 0xe074,
[Q_KEY_CODE_NUM_LOCK] = 0x77,
[Q_KEY_CODE_KP_DIVIDE] = 0xe04a,
[Q_KEY_CODE_KP_MULTIPLY] = 0x7c,
[Q_KEY_CODE_KP_SUBTRACT] = 0x7b,
[Q_KEY_CODE_KP_ADD] = 0x79,
[Q_KEY_CODE_KP_ENTER] = 0xe05a,
[Q_KEY_CODE_KP_DECIMAL] = 0x71,
[Q_KEY_CODE_KP_0] = 0x70,
[Q_KEY_CODE_KP_1] = 0x69,
[Q_KEY_CODE_KP_2] = 0x72,
[Q_KEY_CODE_KP_3] = 0x7a,
[Q_KEY_CODE_KP_4] = 0x6b,
[Q_KEY_CODE_KP_5] = 0x73,
[Q_KEY_CODE_KP_6] = 0x74,
[Q_KEY_CODE_KP_7] = 0x6c,
[Q_KEY_CODE_KP_8] = 0x75,
[Q_KEY_CODE_KP_9] = 0x7d,
[Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
[Q_KEY_CODE_SEMICOLON] = 0x4c,
[Q_KEY_CODE_APOSTROPHE] = 0x52,
[Q_KEY_CODE_COMMA] = 0x41,
[Q_KEY_CODE_DOT] = 0x49,
[Q_KEY_CODE_SLASH] = 0x4a,
[Q_KEY_CODE_POWER] = 0x0e37,
[Q_KEY_CODE_SLEEP] = 0x0e3f,
[Q_KEY_CODE_WAKE] = 0x0e5e,
[Q_KEY_CODE_AUDIONEXT] = 0xe04d,
[Q_KEY_CODE_AUDIOPREV] = 0xe015,
[Q_KEY_CODE_AUDIOSTOP] = 0xe03b,
[Q_KEY_CODE_AUDIOPLAY] = 0xe034,
[Q_KEY_CODE_AUDIOMUTE] = 0xe023,
[Q_KEY_CODE_VOLUMEUP] = 0xe032,
[Q_KEY_CODE_VOLUMEDOWN] = 0xe021,
[Q_KEY_CODE_MEDIASELECT] = 0xe050,
[Q_KEY_CODE_MAIL] = 0xe048,
[Q_KEY_CODE_CALCULATOR] = 0xe02b,
[Q_KEY_CODE_COMPUTER] = 0xe040,
[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_STOP] = 0xe028,
[Q_KEY_CODE_AC_REFRESH] = 0xe020,
[Q_KEY_CODE_AC_BOOKMARKS] = 0xe018,
[Q_KEY_CODE_ASTERISK] = 0x7c,
[Q_KEY_CODE_LESS] = 0x61,
[Q_KEY_CODE_SYSRQ] = 0x7f,
[Q_KEY_CODE_RO] = 0x51,
[Q_KEY_CODE_HIRAGANA] = 0x13,
[Q_KEY_CODE_HENKAN] = 0x64,
[Q_KEY_CODE_YEN] = 0x6a,
[Q_KEY_CODE_KP_COMMA] = 0x6d,
};
static const uint16_t qcode_to_keycode_set3[Q_KEY_CODE__MAX] = {
[0 ... Q_KEY_CODE__MAX - 1] = 0,
[Q_KEY_CODE_A] = 0x1c,
[Q_KEY_CODE_B] = 0x32,
[Q_KEY_CODE_C] = 0x21,
[Q_KEY_CODE_D] = 0x23,
[Q_KEY_CODE_E] = 0x24,
[Q_KEY_CODE_F] = 0x2b,
[Q_KEY_CODE_G] = 0x34,
[Q_KEY_CODE_H] = 0x33,
[Q_KEY_CODE_I] = 0x43,
[Q_KEY_CODE_J] = 0x3b,
[Q_KEY_CODE_K] = 0x42,
[Q_KEY_CODE_L] = 0x4b,
[Q_KEY_CODE_M] = 0x3a,
[Q_KEY_CODE_N] = 0x31,
[Q_KEY_CODE_O] = 0x44,
[Q_KEY_CODE_P] = 0x4d,
[Q_KEY_CODE_Q] = 0x15,
[Q_KEY_CODE_R] = 0x2d,
[Q_KEY_CODE_S] = 0x1b,
[Q_KEY_CODE_T] = 0x2c,
[Q_KEY_CODE_U] = 0x3c,
[Q_KEY_CODE_V] = 0x2a,
[Q_KEY_CODE_W] = 0x1d,
[Q_KEY_CODE_X] = 0x22,
[Q_KEY_CODE_Y] = 0x35,
[Q_KEY_CODE_Z] = 0x1a,
[Q_KEY_CODE_0] = 0x45,
[Q_KEY_CODE_1] = 0x16,
[Q_KEY_CODE_2] = 0x1e,
[Q_KEY_CODE_3] = 0x26,
[Q_KEY_CODE_4] = 0x25,
[Q_KEY_CODE_5] = 0x2e,
[Q_KEY_CODE_6] = 0x36,
[Q_KEY_CODE_7] = 0x3d,
[Q_KEY_CODE_8] = 0x3e,
[Q_KEY_CODE_9] = 0x46,
[Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
[Q_KEY_CODE_MINUS] = 0x4e,
[Q_KEY_CODE_EQUAL] = 0x55,
[Q_KEY_CODE_BACKSLASH] = 0x5c,
[Q_KEY_CODE_BACKSPACE] = 0x66,
[Q_KEY_CODE_SPC] = 0x29,
[Q_KEY_CODE_TAB] = 0x0d,
[Q_KEY_CODE_CAPS_LOCK] = 0x14,
[Q_KEY_CODE_SHIFT] = 0x12,
[Q_KEY_CODE_CTRL] = 0x11,
[Q_KEY_CODE_META_L] = 0x8b,
[Q_KEY_CODE_ALT] = 0x19,
[Q_KEY_CODE_SHIFT_R] = 0x59,
[Q_KEY_CODE_CTRL_R] = 0x58,
[Q_KEY_CODE_META_R] = 0x8c,
[Q_KEY_CODE_ALT_R] = 0x39,
[Q_KEY_CODE_MENU] = 0x8d,
[Q_KEY_CODE_RET] = 0x5a,
[Q_KEY_CODE_ESC] = 0x08,
[Q_KEY_CODE_F1] = 0x07,
[Q_KEY_CODE_F2] = 0x0f,
[Q_KEY_CODE_F3] = 0x17,
[Q_KEY_CODE_F4] = 0x1f,
[Q_KEY_CODE_F5] = 0x27,
[Q_KEY_CODE_F6] = 0x2f,
[Q_KEY_CODE_F7] = 0x37,
[Q_KEY_CODE_F8] = 0x3f,
[Q_KEY_CODE_F9] = 0x47,
[Q_KEY_CODE_F10] = 0x4f,
[Q_KEY_CODE_F11] = 0x56,
[Q_KEY_CODE_F12] = 0x5e,
[Q_KEY_CODE_PRINT] = 0x57,
[Q_KEY_CODE_SCROLL_LOCK] = 0x5f,
[Q_KEY_CODE_PAUSE] = 0x62,
[Q_KEY_CODE_BRACKET_LEFT] = 0x54,
[Q_KEY_CODE_INSERT] = 0x67,
[Q_KEY_CODE_HOME] = 0x6e,
[Q_KEY_CODE_PGUP] = 0x6f,
[Q_KEY_CODE_DELETE] = 0x64,
[Q_KEY_CODE_END] = 0x65,
[Q_KEY_CODE_PGDN] = 0x6d,
[Q_KEY_CODE_UP] = 0x63,
[Q_KEY_CODE_LEFT] = 0x61,
[Q_KEY_CODE_DOWN] = 0x60,
[Q_KEY_CODE_RIGHT] = 0x6a,
[Q_KEY_CODE_NUM_LOCK] = 0x76,
[Q_KEY_CODE_KP_DIVIDE] = 0x4a,
[Q_KEY_CODE_KP_MULTIPLY] = 0x7e,
[Q_KEY_CODE_KP_SUBTRACT] = 0x4e,
[Q_KEY_CODE_KP_ADD] = 0x7c,
[Q_KEY_CODE_KP_ENTER] = 0x79,
[Q_KEY_CODE_KP_DECIMAL] = 0x71,
[Q_KEY_CODE_KP_0] = 0x70,
[Q_KEY_CODE_KP_1] = 0x69,
[Q_KEY_CODE_KP_2] = 0x72,
[Q_KEY_CODE_KP_3] = 0x7a,
[Q_KEY_CODE_KP_4] = 0x6b,
[Q_KEY_CODE_KP_5] = 0x73,
[Q_KEY_CODE_KP_6] = 0x74,
[Q_KEY_CODE_KP_7] = 0x6c,
[Q_KEY_CODE_KP_8] = 0x75,
[Q_KEY_CODE_KP_9] = 0x7d,
[Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
[Q_KEY_CODE_SEMICOLON] = 0x4c,
[Q_KEY_CODE_APOSTROPHE] = 0x52,
[Q_KEY_CODE_COMMA] = 0x41,
[Q_KEY_CODE_DOT] = 0x49,
[Q_KEY_CODE_SLASH] = 0x4a,
[Q_KEY_CODE_HIRAGANA] = 0x87,
[Q_KEY_CODE_HENKAN] = 0x86,
[Q_KEY_CODE_YEN] = 0x5d,
};
static uint8_t translate_table[256] = { static uint8_t translate_table[256] = {
0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58, 0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58,
0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59, 0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59,
@ -624,7 +229,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
PS2KbdState *s = (PS2KbdState *)dev; PS2KbdState *s = (PS2KbdState *)dev;
InputKeyEvent *key = evt->u.key.data; InputKeyEvent *key = evt->u.key.data;
int qcode; int qcode;
uint16_t keycode; uint16_t keycode = 0;
int mod; int mod;
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
@ -706,7 +311,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
} }
} }
} else { } else {
keycode = qcode_to_keycode_set1[qcode]; if (qcode < qemu_input_map_qcode_to_atset1_len)
keycode = qemu_input_map_qcode_to_atset1[qcode];
if (keycode) { if (keycode) {
if (keycode & 0xff00) { if (keycode & 0xff00) {
ps2_put_keycode(s, keycode >> 8); ps2_put_keycode(s, keycode >> 8);
@ -799,7 +405,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
} }
} }
} else { } else {
keycode = qcode_to_keycode_set2[qcode]; if (qcode < qemu_input_map_qcode_to_atset2_len)
keycode = qemu_input_map_qcode_to_atset2[qcode];
if (keycode) { if (keycode) {
if (keycode & 0xff00) { if (keycode & 0xff00) {
ps2_put_keycode(s, keycode >> 8); ps2_put_keycode(s, keycode >> 8);
@ -814,7 +421,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
} }
} }
} else if (s->scancode_set == 3) { } else if (s->scancode_set == 3) {
keycode = qcode_to_keycode_set3[qcode]; if (qcode < qemu_input_map_qcode_to_atset3_len)
keycode = qemu_input_map_qcode_to_atset3[qcode];
if (keycode) { if (keycode) {
/* FIXME: break code should be configured on a key by key basis */ /* FIXME: break code should be configured on a key by key basis */
if (!key->down) { if (!key->down) {
@ -1225,24 +833,21 @@ static void ps2_common_reset(PS2State *s)
static void ps2_common_post_load(PS2State *s) static void ps2_common_post_load(PS2State *s)
{ {
PS2Queue *q = &s->queue; PS2Queue *q = &s->queue;
int size; uint8_t i, size;
int i; uint8_t tmp_data[PS2_QUEUE_SIZE];
int tmp_data[PS2_QUEUE_SIZE];
/* set the useful data buffer queue size, < PS2_QUEUE_SIZE */ /* set the useful data buffer queue size, < PS2_QUEUE_SIZE */
size = q->count > PS2_QUEUE_SIZE ? 0 : q->count; size = (q->count < 0 || q->count > PS2_QUEUE_SIZE) ? 0 : q->count;
/* move the queue elements to the start of data array */ /* move the queue elements to the start of data array */
if (size > 0) { for (i = 0; i < size; i++) {
for (i = 0; i < size; i++) { if (q->rptr < 0 || q->rptr >= sizeof(q->data)) {
/* move the queue elements to the temporary buffer */ q->rptr = 0;
tmp_data[i] = q->data[q->rptr];
if (++q->rptr == 256) {
q->rptr = 0;
}
} }
memcpy(q->data, tmp_data, size); tmp_data[i] = q->data[q->rptr++];
} }
memcpy(q->data, tmp_data, size);
/* reset rptr/wptr/count */ /* reset rptr/wptr/count */
q->rptr = 0; q->rptr = 0;
q->wptr = size; q->wptr = size;

144
hw/input/virtio-input-hid.c
View File

@ -22,139 +22,22 @@
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
static const unsigned int keymap_qcode[Q_KEY_CODE__MAX] = { static const unsigned short keymap_button[INPUT_BUTTON__MAX] = {
[Q_KEY_CODE_ESC] = KEY_ESC,
[Q_KEY_CODE_1] = KEY_1,
[Q_KEY_CODE_2] = KEY_2,
[Q_KEY_CODE_3] = KEY_3,
[Q_KEY_CODE_4] = KEY_4,
[Q_KEY_CODE_5] = KEY_5,
[Q_KEY_CODE_6] = KEY_6,
[Q_KEY_CODE_7] = KEY_7,
[Q_KEY_CODE_8] = KEY_8,
[Q_KEY_CODE_9] = KEY_9,
[Q_KEY_CODE_0] = KEY_0,
[Q_KEY_CODE_MINUS] = KEY_MINUS,
[Q_KEY_CODE_EQUAL] = KEY_EQUAL,
[Q_KEY_CODE_BACKSPACE] = KEY_BACKSPACE,
[Q_KEY_CODE_TAB] = KEY_TAB,
[Q_KEY_CODE_Q] = KEY_Q,
[Q_KEY_CODE_W] = KEY_W,
[Q_KEY_CODE_E] = KEY_E,
[Q_KEY_CODE_R] = KEY_R,
[Q_KEY_CODE_T] = KEY_T,
[Q_KEY_CODE_Y] = KEY_Y,
[Q_KEY_CODE_U] = KEY_U,
[Q_KEY_CODE_I] = KEY_I,
[Q_KEY_CODE_O] = KEY_O,
[Q_KEY_CODE_P] = KEY_P,
[Q_KEY_CODE_BRACKET_LEFT] = KEY_LEFTBRACE,
[Q_KEY_CODE_BRACKET_RIGHT] = KEY_RIGHTBRACE,
[Q_KEY_CODE_RET] = KEY_ENTER,
[Q_KEY_CODE_CTRL] = KEY_LEFTCTRL,
[Q_KEY_CODE_A] = KEY_A,
[Q_KEY_CODE_S] = KEY_S,
[Q_KEY_CODE_D] = KEY_D,
[Q_KEY_CODE_F] = KEY_F,
[Q_KEY_CODE_G] = KEY_G,
[Q_KEY_CODE_H] = KEY_H,
[Q_KEY_CODE_J] = KEY_J,
[Q_KEY_CODE_K] = KEY_K,
[Q_KEY_CODE_L] = KEY_L,
[Q_KEY_CODE_SEMICOLON] = KEY_SEMICOLON,
[Q_KEY_CODE_APOSTROPHE] = KEY_APOSTROPHE,
[Q_KEY_CODE_GRAVE_ACCENT] = KEY_GRAVE,
[Q_KEY_CODE_SHIFT] = KEY_LEFTSHIFT,
[Q_KEY_CODE_BACKSLASH] = KEY_BACKSLASH,
[Q_KEY_CODE_LESS] = KEY_102ND,
[Q_KEY_CODE_Z] = KEY_Z,
[Q_KEY_CODE_X] = KEY_X,
[Q_KEY_CODE_C] = KEY_C,
[Q_KEY_CODE_V] = KEY_V,
[Q_KEY_CODE_B] = KEY_B,
[Q_KEY_CODE_N] = KEY_N,
[Q_KEY_CODE_M] = KEY_M,
[Q_KEY_CODE_COMMA] = KEY_COMMA,
[Q_KEY_CODE_DOT] = KEY_DOT,
[Q_KEY_CODE_SLASH] = KEY_SLASH,
[Q_KEY_CODE_SHIFT_R] = KEY_RIGHTSHIFT,
[Q_KEY_CODE_ALT] = KEY_LEFTALT,
[Q_KEY_CODE_SPC] = KEY_SPACE,
[Q_KEY_CODE_CAPS_LOCK] = KEY_CAPSLOCK,
[Q_KEY_CODE_F1] = KEY_F1,
[Q_KEY_CODE_F2] = KEY_F2,
[Q_KEY_CODE_F3] = KEY_F3,
[Q_KEY_CODE_F4] = KEY_F4,
[Q_KEY_CODE_F5] = KEY_F5,
[Q_KEY_CODE_F6] = KEY_F6,
[Q_KEY_CODE_F7] = KEY_F7,
[Q_KEY_CODE_F8] = KEY_F8,
[Q_KEY_CODE_F9] = KEY_F9,
[Q_KEY_CODE_F10] = KEY_F10,
[Q_KEY_CODE_NUM_LOCK] = KEY_NUMLOCK,
[Q_KEY_CODE_SCROLL_LOCK] = KEY_SCROLLLOCK,
[Q_KEY_CODE_KP_0] = KEY_KP0,
[Q_KEY_CODE_KP_1] = KEY_KP1,
[Q_KEY_CODE_KP_2] = KEY_KP2,
[Q_KEY_CODE_KP_3] = KEY_KP3,
[Q_KEY_CODE_KP_4] = KEY_KP4,
[Q_KEY_CODE_KP_5] = KEY_KP5,
[Q_KEY_CODE_KP_6] = KEY_KP6,
[Q_KEY_CODE_KP_7] = KEY_KP7,
[Q_KEY_CODE_KP_8] = KEY_KP8,
[Q_KEY_CODE_KP_9] = KEY_KP9,
[Q_KEY_CODE_KP_SUBTRACT] = KEY_KPMINUS,
[Q_KEY_CODE_KP_ADD] = KEY_KPPLUS,
[Q_KEY_CODE_KP_DECIMAL] = KEY_KPDOT,
[Q_KEY_CODE_KP_ENTER] = KEY_KPENTER,
[Q_KEY_CODE_KP_DIVIDE] = KEY_KPSLASH,
[Q_KEY_CODE_KP_MULTIPLY] = KEY_KPASTERISK,
[Q_KEY_CODE_F11] = KEY_F11,
[Q_KEY_CODE_F12] = KEY_F12,
[Q_KEY_CODE_CTRL_R] = KEY_RIGHTCTRL,
[Q_KEY_CODE_SYSRQ] = KEY_SYSRQ,
[Q_KEY_CODE_PRINT] = KEY_SYSRQ,
[Q_KEY_CODE_PAUSE] = KEY_PAUSE,
[Q_KEY_CODE_ALT_R] = KEY_RIGHTALT,
[Q_KEY_CODE_HOME] = KEY_HOME,
[Q_KEY_CODE_UP] = KEY_UP,
[Q_KEY_CODE_PGUP] = KEY_PAGEUP,
[Q_KEY_CODE_LEFT] = KEY_LEFT,
[Q_KEY_CODE_RIGHT] = KEY_RIGHT,
[Q_KEY_CODE_END] = KEY_END,
[Q_KEY_CODE_DOWN] = KEY_DOWN,
[Q_KEY_CODE_PGDN] = KEY_PAGEDOWN,
[Q_KEY_CODE_INSERT] = KEY_INSERT,
[Q_KEY_CODE_DELETE] = KEY_DELETE,
[Q_KEY_CODE_META_L] = KEY_LEFTMETA,
[Q_KEY_CODE_META_R] = KEY_RIGHTMETA,
[Q_KEY_CODE_MENU] = KEY_MENU,
};
static const unsigned int keymap_button[INPUT_BUTTON__MAX] = {
[INPUT_BUTTON_LEFT] = BTN_LEFT, [INPUT_BUTTON_LEFT] = BTN_LEFT,
[INPUT_BUTTON_RIGHT] = BTN_RIGHT, [INPUT_BUTTON_RIGHT] = BTN_RIGHT,
[INPUT_BUTTON_MIDDLE] = BTN_MIDDLE, [INPUT_BUTTON_MIDDLE] = BTN_MIDDLE,
[INPUT_BUTTON_WHEEL_UP] = BTN_GEAR_UP, [INPUT_BUTTON_WHEEL_UP] = BTN_GEAR_UP,
[INPUT_BUTTON_WHEEL_DOWN] = BTN_GEAR_DOWN, [INPUT_BUTTON_WHEEL_DOWN] = BTN_GEAR_DOWN,
[INPUT_BUTTON_SIDE] = BTN_SIDE,
[INPUT_BUTTON_EXTRA] = BTN_EXTRA,
}; };
static const unsigned int axismap_rel[INPUT_AXIS__MAX] = { static const unsigned short axismap_rel[INPUT_AXIS__MAX] = {
[INPUT_AXIS_X] = REL_X, [INPUT_AXIS_X] = REL_X,
[INPUT_AXIS_Y] = REL_Y, [INPUT_AXIS_Y] = REL_Y,
}; };
static const unsigned int axismap_abs[INPUT_AXIS__MAX] = { static const unsigned short axismap_abs[INPUT_AXIS__MAX] = {
[INPUT_AXIS_X] = ABS_X, [INPUT_AXIS_X] = ABS_X,
[INPUT_AXIS_Y] = ABS_Y, [INPUT_AXIS_Y] = ABS_Y,
}; };
@ -162,7 +45,7 @@ static const unsigned int axismap_abs[INPUT_AXIS__MAX] = {
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
static void virtio_input_key_config(VirtIOInput *vinput, static void virtio_input_key_config(VirtIOInput *vinput,
const unsigned int *keymap, const unsigned short *keymap,
size_t mapsize) size_t mapsize)
{ {
virtio_input_config keys; virtio_input_config keys;
@ -202,9 +85,10 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,
case INPUT_EVENT_KIND_KEY: case INPUT_EVENT_KIND_KEY:
key = evt->u.key.data; key = evt->u.key.data;
qcode = qemu_input_key_value_to_qcode(key->key); qcode = qemu_input_key_value_to_qcode(key->key);
if (qcode && keymap_qcode[qcode]) { if (qcode < qemu_input_map_qcode_to_linux_len &&
qemu_input_map_qcode_to_linux[qcode]) {
event.type = cpu_to_le16(EV_KEY); event.type = cpu_to_le16(EV_KEY);
event.code = cpu_to_le16(keymap_qcode[qcode]); event.code = cpu_to_le16(qemu_input_map_qcode_to_linux[qcode]);
event.value = cpu_to_le32(key->down ? 1 : 0); event.value = cpu_to_le32(key->down ? 1 : 0);
virtio_input_send(vinput, &event); virtio_input_send(vinput, &event);
} else { } else {
@ -216,8 +100,10 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,
break; break;
case INPUT_EVENT_KIND_BTN: case INPUT_EVENT_KIND_BTN:
btn = evt->u.btn.data; btn = evt->u.btn.data;
if (vhid->wheel_axis && (btn->button == INPUT_BUTTON_WHEEL_UP || if (vhid->wheel_axis &&
btn->button == INPUT_BUTTON_WHEEL_DOWN)) { (btn->button == INPUT_BUTTON_WHEEL_UP ||
btn->button == INPUT_BUTTON_WHEEL_DOWN) &&
btn->down) {
event.type = cpu_to_le16(EV_REL); event.type = cpu_to_le16(EV_REL);
event.code = cpu_to_le16(REL_WHEEL); event.code = cpu_to_le16(REL_WHEEL);
event.value = cpu_to_le32(btn->button == INPUT_BUTTON_WHEEL_UP event.value = cpu_to_le32(btn->button == INPUT_BUTTON_WHEEL_UP
@ -395,8 +281,8 @@ static void virtio_keyboard_init(Object *obj)
vhid->handler = &virtio_keyboard_handler; vhid->handler = &virtio_keyboard_handler;
virtio_input_init_config(vinput, virtio_keyboard_config); virtio_input_init_config(vinput, virtio_keyboard_config);
virtio_input_key_config(vinput, keymap_qcode, virtio_input_key_config(vinput, qemu_input_map_qcode_to_linux,
ARRAY_SIZE(keymap_qcode)); qemu_input_map_qcode_to_linux_len);
} }
static const TypeInfo virtio_keyboard_info = { static const TypeInfo virtio_keyboard_info = {

20
include/ui/input.h
View File

@ -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 guint qemu_input_map_linux_to_qcode_len;
extern const guint16 qemu_input_map_linux_to_qcode[]; extern const guint16 qemu_input_map_linux_to_qcode[];
extern const guint qemu_input_map_qcode_to_qnum_len; extern const guint qemu_input_map_qcode_to_atset1_len;
extern const guint16 qemu_input_map_qcode_to_qnum[]; extern const guint16 qemu_input_map_qcode_to_atset1[];
extern const guint qemu_input_map_qnum_to_qcode_len; extern const guint qemu_input_map_qcode_to_atset2_len;
extern const guint16 qemu_input_map_qnum_to_qcode[]; 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 guint qemu_input_map_qcode_to_linux_len;
extern const guint16 qemu_input_map_qcode_to_linux[]; 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_usb_to_qcode_len; extern const guint qemu_input_map_usb_to_qcode_len;
extern const guint16 qemu_input_map_usb_to_qcode[]; extern const guint16 qemu_input_map_usb_to_qcode[];

8
ui/input-keymap.c
View File

@ -7,9 +7,13 @@
#include "ui/input-keymap-atset1-to-qcode.c" #include "ui/input-keymap-atset1-to-qcode.c"
#include "ui/input-keymap-linux-to-qcode.c" #include "ui/input-keymap-linux-to-qcode.c"
#include "ui/input-keymap-qcode-to-qnum.c" #include "ui/input-keymap-qcode-to-atset1.c"
#include "ui/input-keymap-qnum-to-qcode.c" #include "ui/input-keymap-qcode-to-atset2.c"
#include "ui/input-keymap-qcode-to-atset3.c"
#include "ui/input-keymap-qcode-to-linux.c" #include "ui/input-keymap-qcode-to-linux.c"
#include "ui/input-keymap-qcode-to-qnum.c"
#include "ui/input-keymap-qcode-to-sun.c"
#include "ui/input-keymap-qnum-to-qcode.c"
#include "ui/input-keymap-usb-to-qcode.c" #include "ui/input-keymap-usb-to-qcode.c"
#include "ui/input-keymap-win32-to-qcode.c" #include "ui/input-keymap-win32-to-qcode.c"
#include "ui/input-keymap-x11-to-qcode.c" #include "ui/input-keymap-x11-to-qcode.c"