From nobody Sun Feb 8 14:52:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502708269264394.1792791070933; Mon, 14 Aug 2017 03:57:49 -0700 (PDT) Received: from localhost ([::1]:36918 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhD47-0005Dw-U3 for importer@patchew.org; Mon, 14 Aug 2017 06:57:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhCww-0007ci-UE for qemu-devel@nongnu.org; Mon, 14 Aug 2017 06:50:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhCwu-0001wa-N4 for qemu-devel@nongnu.org; Mon, 14 Aug 2017 06:50:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35006) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dhCwu-0001wA-D0 for qemu-devel@nongnu.org; Mon, 14 Aug 2017 06:50:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 52FC767BA7 for ; Mon, 14 Aug 2017 10:50:19 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 436C280F7A; Mon, 14 Aug 2017 10:50:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 52FC767BA7 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 14 Aug 2017 11:49:52 +0100 Message-Id: <20170814104958.29434-7-berrange@redhat.com> In-Reply-To: <20170814104958.29434-1-berrange@redhat.com> References: <20170814104958.29434-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 14 Aug 2017 10:50:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 06/12] input: convert ps2 device to keycodemapdb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace the qcode_to_keycode_set1, qcode_to_keycode_set2, and qcode_to_keycode_set3 tables with automatically generated tables. Missing entries in qcode_to_keycode_set1 now fixed: - Q_KEY_CODE_SYSRQ -> 0x54 - Q_KEY_CODE_PRINT -> 0x54 (NB ignored due to special case) - Q_KEY_CODE_AGAIN -> 0xe005 - Q_KEY_CODE_PROPS -> 0xe006 - Q_KEY_CODE_UNDO -> 0xe007 - Q_KEY_CODE_FRONT -> 0xe00c - Q_KEY_CODE_COPY -> 0xe078 - Q_KEY_CODE_OPEN -> 0x64 - Q_KEY_CODE_PASTE -> 0x65 - Q_KEY_CODE_CUT -> 0xe03c - Q_KEY_CODE_LF -> 0x5b - Q_KEY_CODE_HELP -> 0xe075 - Q_KEY_CODE_COMPOSE -> 0xe05d - Q_KEY_CODE_PAUSE -> 0xe046 - Q_KEY_CODE_KP_EQUALS -> 0x59 And some mistakes corrected: - Q_KEY_CODE_HIRAGANA was mapped to 0x70 (Katakanahiragana) instead of of 0x77 (Hirigana) - Q_KEY_CODE_MENU was incorrectly mapped to the compose scancode (0xe05d) and is now mapped to 0xe01e - Q_KEY_CODE_FIND was mapped to 0xe065 (Search) instead of to 0xe041 (Find) - Q_KEY_CODE_POWER, SLEEP & WAKE had 0x0e instead of 0xe0 as the prefix Missing entries in qcode_to_keycode_set2 now fixed: - Q_KEY_CODE_PRINT -> 0x7f (NB ignored due to special case) - Q_KEY_CODE_COMPOSE -> 0xe02f - Q_KEY_CODE_PAUSE -> 0xe077 - Q_KEY_CODE_KP_EQUALS -> 0x0f And some mistakes corrected: - Q_KEY_CODE_HIRAGANA was mapped to 0x13 (Katakanahiragana) instead of of 0x62 (Hirigana) - Q_KEY_CODE_MENU was incorrectly mapped to the compose scancode (0xe02f) and is now not mapped - Q_KEY_CODE_FIND was mapped to 0xe010 (Search) and is now not mapped. - Q_KEY_CODE_POWER, SLEEP & WAKE had 0x0e instead of 0xe0 as the prefix Missing entries in qcode_to_keycode_set3 now fixed: - Q_KEY_CODE_ASTERISK -> 0x7e - Q_KEY_CODE_SYSRQ -> 0x57 - Q_KEY_CODE_LESS -> 0x13 - Q_KEY_CODE_STOP -> 0x0a - Q_KEY_CODE_AGAIN -> 0x0b - Q_KEY_CODE_PROPS -> 0x0c - Q_KEY_CODE_UNDO -> 0x10 - Q_KEY_CODE_COPY -> 0x18 - Q_KEY_CODE_OPEN -> 0x20 - Q_KEY_CODE_PASTE -> 0x28 - Q_KEY_CODE_FIND -> 0x30 - Q_KEY_CODE_CUT -> 0x38 - Q_KEY_CODE_HELP -> 0x09 - Q_KEY_CODE_COMPOSE -> 0x8d - Q_KEY_CODE_AUDIONEXT -> 0x93 - Q_KEY_CODE_AUDIOPREV -> 0x94 - Q_KEY_CODE_AUDIOSTOP -> 0x98 - Q_KEY_CODE_AUDIOMUTE -> 0x9c - Q_KEY_CODE_VOLUMEUP -> 0x95 - Q_KEY_CODE_VOLUMEDOWN -> 0x9d - Q_KEY_CODE_CALCULATOR -> 0xa3 - Q_KEY_CODE_AC_HOME -> 0x97 And some mistakes corrected: - Q_KEY_CODE_MENU was incorrectly mapped to the compose scancode (0x8d) and is now 0x91 Signed-off-by: Daniel P. Berrange --- hw/input/ps2.c | 406 +------------------------------------------------= ---- include/ui/input.h | 9 ++ ui/Makefile.objs | 3 + ui/input-keymap.c | 3 + 4 files changed, 22 insertions(+), 399 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 77906d5f46..7eeadc144d 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -115,401 +115,6 @@ typedef struct { uint8_t mouse_buttons; } PS2MouseState; =20 -/* Table to convert from QEMU codes to scancodes. */ -static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] =3D { - [0 ... Q_KEY_CODE__MAX - 1] =3D 0, - - [Q_KEY_CODE_A] =3D 0x1e, - [Q_KEY_CODE_B] =3D 0x30, - [Q_KEY_CODE_C] =3D 0x2e, - [Q_KEY_CODE_D] =3D 0x20, - [Q_KEY_CODE_E] =3D 0x12, - [Q_KEY_CODE_F] =3D 0x21, - [Q_KEY_CODE_G] =3D 0x22, - [Q_KEY_CODE_H] =3D 0x23, - [Q_KEY_CODE_I] =3D 0x17, - [Q_KEY_CODE_J] =3D 0x24, - [Q_KEY_CODE_K] =3D 0x25, - [Q_KEY_CODE_L] =3D 0x26, - [Q_KEY_CODE_M] =3D 0x32, - [Q_KEY_CODE_N] =3D 0x31, - [Q_KEY_CODE_O] =3D 0x18, - [Q_KEY_CODE_P] =3D 0x19, - [Q_KEY_CODE_Q] =3D 0x10, - [Q_KEY_CODE_R] =3D 0x13, - [Q_KEY_CODE_S] =3D 0x1f, - [Q_KEY_CODE_T] =3D 0x14, - [Q_KEY_CODE_U] =3D 0x16, - [Q_KEY_CODE_V] =3D 0x2f, - [Q_KEY_CODE_W] =3D 0x11, - [Q_KEY_CODE_X] =3D 0x2d, - [Q_KEY_CODE_Y] =3D 0x15, - [Q_KEY_CODE_Z] =3D 0x2c, - [Q_KEY_CODE_0] =3D 0x0b, - [Q_KEY_CODE_1] =3D 0x02, - [Q_KEY_CODE_2] =3D 0x03, - [Q_KEY_CODE_3] =3D 0x04, - [Q_KEY_CODE_4] =3D 0x05, - [Q_KEY_CODE_5] =3D 0x06, - [Q_KEY_CODE_6] =3D 0x07, - [Q_KEY_CODE_7] =3D 0x08, - [Q_KEY_CODE_8] =3D 0x09, - [Q_KEY_CODE_9] =3D 0x0a, - [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x29, - [Q_KEY_CODE_MINUS] =3D 0x0c, - [Q_KEY_CODE_EQUAL] =3D 0x0d, - [Q_KEY_CODE_BACKSLASH] =3D 0x2b, - [Q_KEY_CODE_BACKSPACE] =3D 0x0e, - [Q_KEY_CODE_SPC] =3D 0x39, - [Q_KEY_CODE_TAB] =3D 0x0f, - [Q_KEY_CODE_CAPS_LOCK] =3D 0x3a, - [Q_KEY_CODE_SHIFT] =3D 0x2a, - [Q_KEY_CODE_CTRL] =3D 0x1d, - [Q_KEY_CODE_META_L] =3D 0xe05b, - [Q_KEY_CODE_ALT] =3D 0x38, - [Q_KEY_CODE_SHIFT_R] =3D 0x36, - [Q_KEY_CODE_CTRL_R] =3D 0xe01d, - [Q_KEY_CODE_META_R] =3D 0xe05c, - [Q_KEY_CODE_ALT_R] =3D 0xe038, - [Q_KEY_CODE_MENU] =3D 0xe05d, - [Q_KEY_CODE_RET] =3D 0x1c, - [Q_KEY_CODE_ESC] =3D 0x01, - [Q_KEY_CODE_F1] =3D 0x3b, - [Q_KEY_CODE_F2] =3D 0x3c, - [Q_KEY_CODE_F3] =3D 0x3d, - [Q_KEY_CODE_F4] =3D 0x3e, - [Q_KEY_CODE_F5] =3D 0x3f, - [Q_KEY_CODE_F6] =3D 0x40, - [Q_KEY_CODE_F7] =3D 0x41, - [Q_KEY_CODE_F8] =3D 0x42, - [Q_KEY_CODE_F9] =3D 0x43, - [Q_KEY_CODE_F10] =3D 0x44, - [Q_KEY_CODE_F11] =3D 0x57, - [Q_KEY_CODE_F12] =3D 0x58, - /* special handling for Q_KEY_CODE_PRINT */ - [Q_KEY_CODE_SCROLL_LOCK] =3D 0x46, - /* special handling for Q_KEY_CODE_PAUSE */ - [Q_KEY_CODE_BRACKET_LEFT] =3D 0x1a, - [Q_KEY_CODE_INSERT] =3D 0xe052, - [Q_KEY_CODE_HOME] =3D 0xe047, - [Q_KEY_CODE_PGUP] =3D 0xe049, - [Q_KEY_CODE_DELETE] =3D 0xe053, - [Q_KEY_CODE_END] =3D 0xe04f, - [Q_KEY_CODE_PGDN] =3D 0xe051, - [Q_KEY_CODE_UP] =3D 0xe048, - [Q_KEY_CODE_LEFT] =3D 0xe04b, - [Q_KEY_CODE_DOWN] =3D 0xe050, - [Q_KEY_CODE_RIGHT] =3D 0xe04d, - [Q_KEY_CODE_NUM_LOCK] =3D 0x45, - [Q_KEY_CODE_KP_DIVIDE] =3D 0xe035, - [Q_KEY_CODE_KP_MULTIPLY] =3D 0x37, - [Q_KEY_CODE_KP_SUBTRACT] =3D 0x4a, - [Q_KEY_CODE_KP_ADD] =3D 0x4e, - [Q_KEY_CODE_KP_ENTER] =3D 0xe01c, - [Q_KEY_CODE_KP_DECIMAL] =3D 0x53, - [Q_KEY_CODE_KP_0] =3D 0x52, - [Q_KEY_CODE_KP_1] =3D 0x4f, - [Q_KEY_CODE_KP_2] =3D 0x50, - [Q_KEY_CODE_KP_3] =3D 0x51, - [Q_KEY_CODE_KP_4] =3D 0x4b, - [Q_KEY_CODE_KP_5] =3D 0x4c, - [Q_KEY_CODE_KP_6] =3D 0x4d, - [Q_KEY_CODE_KP_7] =3D 0x47, - [Q_KEY_CODE_KP_8] =3D 0x48, - [Q_KEY_CODE_KP_9] =3D 0x49, - [Q_KEY_CODE_BRACKET_RIGHT] =3D 0x1b, - [Q_KEY_CODE_SEMICOLON] =3D 0x27, - [Q_KEY_CODE_APOSTROPHE] =3D 0x28, - [Q_KEY_CODE_COMMA] =3D 0x33, - [Q_KEY_CODE_DOT] =3D 0x34, - [Q_KEY_CODE_SLASH] =3D 0x35, - - [Q_KEY_CODE_POWER] =3D 0x0e5e, - [Q_KEY_CODE_SLEEP] =3D 0x0e5f, - [Q_KEY_CODE_WAKE] =3D 0x0e63, - - [Q_KEY_CODE_AUDIONEXT] =3D 0xe019, - [Q_KEY_CODE_AUDIOPREV] =3D 0xe010, - [Q_KEY_CODE_AUDIOSTOP] =3D 0xe024, - [Q_KEY_CODE_AUDIOPLAY] =3D 0xe022, - [Q_KEY_CODE_AUDIOMUTE] =3D 0xe020, - [Q_KEY_CODE_VOLUMEUP] =3D 0xe030, - [Q_KEY_CODE_VOLUMEDOWN] =3D 0xe02e, - [Q_KEY_CODE_MEDIASELECT] =3D 0xe06d, - [Q_KEY_CODE_MAIL] =3D 0xe06c, - [Q_KEY_CODE_CALCULATOR] =3D 0xe021, - [Q_KEY_CODE_COMPUTER] =3D 0xe06b, - [Q_KEY_CODE_FIND] =3D 0xe065, - [Q_KEY_CODE_AC_HOME] =3D 0xe032, - [Q_KEY_CODE_AC_BACK] =3D 0xe06a, - [Q_KEY_CODE_AC_FORWARD] =3D 0xe069, - [Q_KEY_CODE_STOP] =3D 0xe068, - [Q_KEY_CODE_AC_REFRESH] =3D 0xe067, - [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe066, - - [Q_KEY_CODE_ASTERISK] =3D 0x37, - [Q_KEY_CODE_LESS] =3D 0x56, - [Q_KEY_CODE_RO] =3D 0x73, - [Q_KEY_CODE_HIRAGANA] =3D 0x70, - [Q_KEY_CODE_HENKAN] =3D 0x79, - [Q_KEY_CODE_YEN] =3D 0x7d, - [Q_KEY_CODE_KP_COMMA] =3D 0x7e, -}; - -static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] =3D { - [0 ... Q_KEY_CODE__MAX - 1] =3D 0, - - [Q_KEY_CODE_A] =3D 0x1c, - [Q_KEY_CODE_B] =3D 0x32, - [Q_KEY_CODE_C] =3D 0x21, - [Q_KEY_CODE_D] =3D 0x23, - [Q_KEY_CODE_E] =3D 0x24, - [Q_KEY_CODE_F] =3D 0x2b, - [Q_KEY_CODE_G] =3D 0x34, - [Q_KEY_CODE_H] =3D 0x33, - [Q_KEY_CODE_I] =3D 0x43, - [Q_KEY_CODE_J] =3D 0x3b, - [Q_KEY_CODE_K] =3D 0x42, - [Q_KEY_CODE_L] =3D 0x4b, - [Q_KEY_CODE_M] =3D 0x3a, - [Q_KEY_CODE_N] =3D 0x31, - [Q_KEY_CODE_O] =3D 0x44, - [Q_KEY_CODE_P] =3D 0x4d, - [Q_KEY_CODE_Q] =3D 0x15, - [Q_KEY_CODE_R] =3D 0x2d, - [Q_KEY_CODE_S] =3D 0x1b, - [Q_KEY_CODE_T] =3D 0x2c, - [Q_KEY_CODE_U] =3D 0x3c, - [Q_KEY_CODE_V] =3D 0x2a, - [Q_KEY_CODE_W] =3D 0x1d, - [Q_KEY_CODE_X] =3D 0x22, - [Q_KEY_CODE_Y] =3D 0x35, - [Q_KEY_CODE_Z] =3D 0x1a, - [Q_KEY_CODE_0] =3D 0x45, - [Q_KEY_CODE_1] =3D 0x16, - [Q_KEY_CODE_2] =3D 0x1e, - [Q_KEY_CODE_3] =3D 0x26, - [Q_KEY_CODE_4] =3D 0x25, - [Q_KEY_CODE_5] =3D 0x2e, - [Q_KEY_CODE_6] =3D 0x36, - [Q_KEY_CODE_7] =3D 0x3d, - [Q_KEY_CODE_8] =3D 0x3e, - [Q_KEY_CODE_9] =3D 0x46, - [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x0e, - [Q_KEY_CODE_MINUS] =3D 0x4e, - [Q_KEY_CODE_EQUAL] =3D 0x55, - [Q_KEY_CODE_BACKSLASH] =3D 0x5d, - [Q_KEY_CODE_BACKSPACE] =3D 0x66, - [Q_KEY_CODE_SPC] =3D 0x29, - [Q_KEY_CODE_TAB] =3D 0x0d, - [Q_KEY_CODE_CAPS_LOCK] =3D 0x58, - [Q_KEY_CODE_SHIFT] =3D 0x12, - [Q_KEY_CODE_CTRL] =3D 0x14, - [Q_KEY_CODE_META_L] =3D 0xe01f, - [Q_KEY_CODE_ALT] =3D 0x11, - [Q_KEY_CODE_SHIFT_R] =3D 0x59, - [Q_KEY_CODE_CTRL_R] =3D 0xe014, - [Q_KEY_CODE_META_R] =3D 0xe027, - [Q_KEY_CODE_ALT_R] =3D 0xe011, - [Q_KEY_CODE_MENU] =3D 0xe02f, - [Q_KEY_CODE_RET] =3D 0x5a, - [Q_KEY_CODE_ESC] =3D 0x76, - [Q_KEY_CODE_F1] =3D 0x05, - [Q_KEY_CODE_F2] =3D 0x06, - [Q_KEY_CODE_F3] =3D 0x04, - [Q_KEY_CODE_F4] =3D 0x0c, - [Q_KEY_CODE_F5] =3D 0x03, - [Q_KEY_CODE_F6] =3D 0x0b, - [Q_KEY_CODE_F7] =3D 0x83, - [Q_KEY_CODE_F8] =3D 0x0a, - [Q_KEY_CODE_F9] =3D 0x01, - [Q_KEY_CODE_F10] =3D 0x09, - [Q_KEY_CODE_F11] =3D 0x78, - [Q_KEY_CODE_F12] =3D 0x07, - /* special handling for Q_KEY_CODE_PRINT */ - [Q_KEY_CODE_SCROLL_LOCK] =3D 0x7e, - /* special handling for Q_KEY_CODE_PAUSE */ - [Q_KEY_CODE_BRACKET_LEFT] =3D 0x54, - [Q_KEY_CODE_INSERT] =3D 0xe070, - [Q_KEY_CODE_HOME] =3D 0xe06c, - [Q_KEY_CODE_PGUP] =3D 0xe07d, - [Q_KEY_CODE_DELETE] =3D 0xe071, - [Q_KEY_CODE_END] =3D 0xe069, - [Q_KEY_CODE_PGDN] =3D 0xe07a, - [Q_KEY_CODE_UP] =3D 0xe075, - [Q_KEY_CODE_LEFT] =3D 0xe06b, - [Q_KEY_CODE_DOWN] =3D 0xe072, - [Q_KEY_CODE_RIGHT] =3D 0xe074, - [Q_KEY_CODE_NUM_LOCK] =3D 0x77, - [Q_KEY_CODE_KP_DIVIDE] =3D 0xe04a, - [Q_KEY_CODE_KP_MULTIPLY] =3D 0x7c, - [Q_KEY_CODE_KP_SUBTRACT] =3D 0x7b, - [Q_KEY_CODE_KP_ADD] =3D 0x79, - [Q_KEY_CODE_KP_ENTER] =3D 0xe05a, - [Q_KEY_CODE_KP_DECIMAL] =3D 0x71, - [Q_KEY_CODE_KP_0] =3D 0x70, - [Q_KEY_CODE_KP_1] =3D 0x69, - [Q_KEY_CODE_KP_2] =3D 0x72, - [Q_KEY_CODE_KP_3] =3D 0x7a, - [Q_KEY_CODE_KP_4] =3D 0x6b, - [Q_KEY_CODE_KP_5] =3D 0x73, - [Q_KEY_CODE_KP_6] =3D 0x74, - [Q_KEY_CODE_KP_7] =3D 0x6c, - [Q_KEY_CODE_KP_8] =3D 0x75, - [Q_KEY_CODE_KP_9] =3D 0x7d, - [Q_KEY_CODE_BRACKET_RIGHT] =3D 0x5b, - [Q_KEY_CODE_SEMICOLON] =3D 0x4c, - [Q_KEY_CODE_APOSTROPHE] =3D 0x52, - [Q_KEY_CODE_COMMA] =3D 0x41, - [Q_KEY_CODE_DOT] =3D 0x49, - [Q_KEY_CODE_SLASH] =3D 0x4a, - - [Q_KEY_CODE_POWER] =3D 0x0e37, - [Q_KEY_CODE_SLEEP] =3D 0x0e3f, - [Q_KEY_CODE_WAKE] =3D 0x0e5e, - - [Q_KEY_CODE_AUDIONEXT] =3D 0xe04d, - [Q_KEY_CODE_AUDIOPREV] =3D 0xe015, - [Q_KEY_CODE_AUDIOSTOP] =3D 0xe03b, - [Q_KEY_CODE_AUDIOPLAY] =3D 0xe034, - [Q_KEY_CODE_AUDIOMUTE] =3D 0xe023, - [Q_KEY_CODE_VOLUMEUP] =3D 0xe032, - [Q_KEY_CODE_VOLUMEDOWN] =3D 0xe021, - [Q_KEY_CODE_MEDIASELECT] =3D 0xe050, - [Q_KEY_CODE_MAIL] =3D 0xe048, - [Q_KEY_CODE_CALCULATOR] =3D 0xe02b, - [Q_KEY_CODE_COMPUTER] =3D 0xe040, - [Q_KEY_CODE_FIND] =3D 0xe010, - [Q_KEY_CODE_AC_HOME] =3D 0xe03a, - [Q_KEY_CODE_AC_BACK] =3D 0xe038, - [Q_KEY_CODE_AC_FORWARD] =3D 0xe030, - [Q_KEY_CODE_STOP] =3D 0xe028, - [Q_KEY_CODE_AC_REFRESH] =3D 0xe020, - [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe018, - - [Q_KEY_CODE_ASTERISK] =3D 0x7c, - [Q_KEY_CODE_LESS] =3D 0x61, - [Q_KEY_CODE_SYSRQ] =3D 0x7f, - [Q_KEY_CODE_RO] =3D 0x51, - [Q_KEY_CODE_HIRAGANA] =3D 0x13, - [Q_KEY_CODE_HENKAN] =3D 0x64, - [Q_KEY_CODE_YEN] =3D 0x6a, - [Q_KEY_CODE_KP_COMMA] =3D 0x6d, -}; - -static const uint16_t qcode_to_keycode_set3[Q_KEY_CODE__MAX] =3D { - [0 ... Q_KEY_CODE__MAX - 1] =3D 0, - - [Q_KEY_CODE_A] =3D 0x1c, - [Q_KEY_CODE_B] =3D 0x32, - [Q_KEY_CODE_C] =3D 0x21, - [Q_KEY_CODE_D] =3D 0x23, - [Q_KEY_CODE_E] =3D 0x24, - [Q_KEY_CODE_F] =3D 0x2b, - [Q_KEY_CODE_G] =3D 0x34, - [Q_KEY_CODE_H] =3D 0x33, - [Q_KEY_CODE_I] =3D 0x43, - [Q_KEY_CODE_J] =3D 0x3b, - [Q_KEY_CODE_K] =3D 0x42, - [Q_KEY_CODE_L] =3D 0x4b, - [Q_KEY_CODE_M] =3D 0x3a, - [Q_KEY_CODE_N] =3D 0x31, - [Q_KEY_CODE_O] =3D 0x44, - [Q_KEY_CODE_P] =3D 0x4d, - [Q_KEY_CODE_Q] =3D 0x15, - [Q_KEY_CODE_R] =3D 0x2d, - [Q_KEY_CODE_S] =3D 0x1b, - [Q_KEY_CODE_T] =3D 0x2c, - [Q_KEY_CODE_U] =3D 0x3c, - [Q_KEY_CODE_V] =3D 0x2a, - [Q_KEY_CODE_W] =3D 0x1d, - [Q_KEY_CODE_X] =3D 0x22, - [Q_KEY_CODE_Y] =3D 0x35, - [Q_KEY_CODE_Z] =3D 0x1a, - [Q_KEY_CODE_0] =3D 0x45, - [Q_KEY_CODE_1] =3D 0x16, - [Q_KEY_CODE_2] =3D 0x1e, - [Q_KEY_CODE_3] =3D 0x26, - [Q_KEY_CODE_4] =3D 0x25, - [Q_KEY_CODE_5] =3D 0x2e, - [Q_KEY_CODE_6] =3D 0x36, - [Q_KEY_CODE_7] =3D 0x3d, - [Q_KEY_CODE_8] =3D 0x3e, - [Q_KEY_CODE_9] =3D 0x46, - [Q_KEY_CODE_GRAVE_ACCENT] =3D 0x0e, - [Q_KEY_CODE_MINUS] =3D 0x4e, - [Q_KEY_CODE_EQUAL] =3D 0x55, - [Q_KEY_CODE_BACKSLASH] =3D 0x5c, - [Q_KEY_CODE_BACKSPACE] =3D 0x66, - [Q_KEY_CODE_SPC] =3D 0x29, - [Q_KEY_CODE_TAB] =3D 0x0d, - [Q_KEY_CODE_CAPS_LOCK] =3D 0x14, - [Q_KEY_CODE_SHIFT] =3D 0x12, - [Q_KEY_CODE_CTRL] =3D 0x11, - [Q_KEY_CODE_META_L] =3D 0x8b, - [Q_KEY_CODE_ALT] =3D 0x19, - [Q_KEY_CODE_SHIFT_R] =3D 0x59, - [Q_KEY_CODE_CTRL_R] =3D 0x58, - [Q_KEY_CODE_META_R] =3D 0x8c, - [Q_KEY_CODE_ALT_R] =3D 0x39, - [Q_KEY_CODE_MENU] =3D 0x8d, - [Q_KEY_CODE_RET] =3D 0x5a, - [Q_KEY_CODE_ESC] =3D 0x08, - [Q_KEY_CODE_F1] =3D 0x07, - [Q_KEY_CODE_F2] =3D 0x0f, - [Q_KEY_CODE_F3] =3D 0x17, - [Q_KEY_CODE_F4] =3D 0x1f, - [Q_KEY_CODE_F5] =3D 0x27, - [Q_KEY_CODE_F6] =3D 0x2f, - [Q_KEY_CODE_F7] =3D 0x37, - [Q_KEY_CODE_F8] =3D 0x3f, - [Q_KEY_CODE_F9] =3D 0x47, - [Q_KEY_CODE_F10] =3D 0x4f, - [Q_KEY_CODE_F11] =3D 0x56, - [Q_KEY_CODE_F12] =3D 0x5e, - [Q_KEY_CODE_PRINT] =3D 0x57, - [Q_KEY_CODE_SCROLL_LOCK] =3D 0x5f, - [Q_KEY_CODE_PAUSE] =3D 0x62, - [Q_KEY_CODE_BRACKET_LEFT] =3D 0x54, - [Q_KEY_CODE_INSERT] =3D 0x67, - [Q_KEY_CODE_HOME] =3D 0x6e, - [Q_KEY_CODE_PGUP] =3D 0x6f, - [Q_KEY_CODE_DELETE] =3D 0x64, - [Q_KEY_CODE_END] =3D 0x65, - [Q_KEY_CODE_PGDN] =3D 0x6d, - [Q_KEY_CODE_UP] =3D 0x63, - [Q_KEY_CODE_LEFT] =3D 0x61, - [Q_KEY_CODE_DOWN] =3D 0x60, - [Q_KEY_CODE_RIGHT] =3D 0x6a, - [Q_KEY_CODE_NUM_LOCK] =3D 0x76, - [Q_KEY_CODE_KP_DIVIDE] =3D 0x4a, - [Q_KEY_CODE_KP_MULTIPLY] =3D 0x7e, - [Q_KEY_CODE_KP_SUBTRACT] =3D 0x4e, - [Q_KEY_CODE_KP_ADD] =3D 0x7c, - [Q_KEY_CODE_KP_ENTER] =3D 0x79, - [Q_KEY_CODE_KP_DECIMAL] =3D 0x71, - [Q_KEY_CODE_KP_0] =3D 0x70, - [Q_KEY_CODE_KP_1] =3D 0x69, - [Q_KEY_CODE_KP_2] =3D 0x72, - [Q_KEY_CODE_KP_3] =3D 0x7a, - [Q_KEY_CODE_KP_4] =3D 0x6b, - [Q_KEY_CODE_KP_5] =3D 0x73, - [Q_KEY_CODE_KP_6] =3D 0x74, - [Q_KEY_CODE_KP_7] =3D 0x6c, - [Q_KEY_CODE_KP_8] =3D 0x75, - [Q_KEY_CODE_KP_9] =3D 0x7d, - [Q_KEY_CODE_BRACKET_RIGHT] =3D 0x5b, - [Q_KEY_CODE_SEMICOLON] =3D 0x4c, - [Q_KEY_CODE_APOSTROPHE] =3D 0x52, - [Q_KEY_CODE_COMMA] =3D 0x41, - [Q_KEY_CODE_DOT] =3D 0x49, - [Q_KEY_CODE_SLASH] =3D 0x4a, - - [Q_KEY_CODE_HIRAGANA] =3D 0x87, - [Q_KEY_CODE_HENKAN] =3D 0x86, - [Q_KEY_CODE_YEN] =3D 0x5d, -}; - static uint8_t translate_table[256] =3D { 0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58, 0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59, @@ -595,7 +200,7 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, PS2KbdState *s =3D (PS2KbdState *)dev; InputKeyEvent *key =3D evt->u.key.data; int qcode; - uint16_t keycode; + uint16_t keycode =3D 0; =20 qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); assert(evt->type =3D=3D INPUT_EVENT_KIND_KEY); @@ -624,7 +229,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, ps2_put_keycode(s, 0xaa); } } else { - keycode =3D qcode_to_keycode_set1[qcode]; + if (qcode < qemu_input_map_qcode_to_atset1_len) + keycode =3D qemu_input_map_qcode_to_atset1[qcode]; if (keycode) { if (keycode & 0xff00) { ps2_put_keycode(s, keycode >> 8); @@ -665,7 +271,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, ps2_put_keycode(s, 0x12); } } else { - keycode =3D qcode_to_keycode_set2[qcode]; + if (qcode < qemu_input_map_qcode_to_atset2_len) + keycode =3D qemu_input_map_qcode_to_atset2[qcode]; if (keycode) { if (keycode & 0xff00) { ps2_put_keycode(s, keycode >> 8); @@ -680,7 +287,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, } } } else if (s->scancode_set =3D=3D 3) { - keycode =3D qcode_to_keycode_set3[qcode]; + if (qcode < qemu_input_map_qcode_to_atset3_len) + keycode =3D qemu_input_map_qcode_to_atset3[qcode]; if (keycode) { /* FIXME: break code should be configured on a key by key basi= s */ if (!key->down) { diff --git a/include/ui/input.h b/include/ui/input.h index 6f56d868c7..76235ba97a 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -71,6 +71,15 @@ void qemu_remove_mouse_mode_change_notifier(Notifier *no= tify); extern const guint qemu_input_map_linux_to_qcode_len; extern const guint16 qemu_input_map_linux_to_qcode[]; =20 +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[]; =20 diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 11915a9bb4..b92d49ccc8 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -55,6 +55,9 @@ KEYCODEMAP_CSV =3D $(SRC_PATH)/ui/keycodemapdb/data/keyma= ps.csv =20 KEYCODEMAP_FILES =3D \ ui/input-keymap-linux-to-qcode.c \ + ui/input-keymap-qcode-to-atset1.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-qnum.c \ ui/input-keymap-qnum-to-qcode.c \ diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 6e543d651f..d90f6a16f7 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -6,6 +6,9 @@ #include "standard-headers/linux/input.h" =20 #include "ui/input-keymap-linux-to-qcode.c" +#include "ui/input-keymap-qcode-to-atset1.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-qnum.c" #include "ui/input-keymap-qnum-to-qcode.c" --=20 2.13.3