From nobody Sat Apr 27 19:11:56 2024 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 1501070299174890.5584287991088; Wed, 26 Jul 2017 04:58:19 -0700 (PDT) Received: from localhost ([::1]:37547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKxF-0004k3-LL for importer@patchew.org; Wed, 26 Jul 2017 07:58:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKvk-0003rk-FX for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daKvi-00044A-E5 for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36462) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1daKvi-00043J-8k for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 433E54A702 for ; Wed, 26 Jul 2017 11:56:41 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 685AC77644; Wed, 26 Jul 2017 11:56:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 99CC03B7; Wed, 26 Jul 2017 13:56:37 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 433E54A702 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 26 Jul 2017 13:56:33 +0200 Message-Id: <20170726115637.21558-2-kraxel@redhat.com> In-Reply-To: <20170726115637.21558-1-kraxel@redhat.com> References: <20170726115637.21558-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 26 Jul 2017 11:56:41 +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 1/5] ui: add next and prior keysyms 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" Page-up and Page-down where renamed. Add the names to the keysym list so we can parse both old and new names. The keypad versions are already present in the vnc map. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- ui/curses_keys.h | 2 ++ ui/vnc_keysym.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ui/curses_keys.h b/ui/curses_keys.h index e39ef9e718..e9195a1671 100644 --- a/ui/curses_keys.h +++ b/ui/curses_keys.h @@ -480,7 +480,9 @@ static const name2keysym_t name2keysym[] =3D { { "Left", KEY_LEFT }, { "Up", KEY_UP }, { "Down", KEY_DOWN }, + { "Next", KEY_NPAGE }, { "Page_Down", KEY_NPAGE }, + { "Prior", KEY_PPAGE }, { "Page_Up", KEY_PPAGE }, { "Insert", KEY_IC }, { "Delete", KEY_DC }, diff --git a/ui/vnc_keysym.h b/ui/vnc_keysym.h index 7fa2bc1f1c..e8a2ec73c5 100644 --- a/ui/vnc_keysym.h +++ b/ui/vnc_keysym.h @@ -254,7 +254,9 @@ static const name2keysym_t name2keysym[]=3D{ {"Left", 0xff51}, /* XK_Left */ {"Up", 0xff52}, /* XK_Up */ {"Down", 0xff54}, /* XK_Down */ +{"Next", 0xff56}, {"Page_Down", 0xff56}, /* XK_Page_Down */ +{"Prior", 0xff55}, {"Page_Up", 0xff55}, /* XK_Page_Up */ {"Insert", 0xff63}, /* XK_Insert */ {"Delete", 0xffff}, /* XK_Delete */ --=20 2.9.3 From nobody Sat Apr 27 19:11:56 2024 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 1501070299217977.7117833757346; Wed, 26 Jul 2017 04:58:19 -0700 (PDT) Received: from localhost ([::1]:37546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKxF-0004jt-He for importer@patchew.org; Wed, 26 Jul 2017 07:58:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKvk-0003rg-Dp for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daKvi-00044H-IO for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45716) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1daKvi-00043G-8q for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 355D237EE9 for ; Wed, 26 Jul 2017 11:56:41 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D9B8612B7; Wed, 26 Jul 2017 11:56:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A2F553BD; Wed, 26 Jul 2017 13:56:37 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 355D237EE9 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 26 Jul 2017 13:56:34 +0200 Message-Id: <20170726115637.21558-3-kraxel@redhat.com> In-Reply-To: <20170726115637.21558-1-kraxel@redhat.com> References: <20170726115637.21558-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 26 Jul 2017 11:56:41 +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 2/5] ui: move qemu_input_linux_to_qcode() 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" Move from input-linux.c to input-keymap.c and export it, so the function is available elsewhere too. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- include/ui/input.h | 1 + ui/input-keymap.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++= ++++ ui/input-linux.c | 113 -------------------------------------------------= --- 3 files changed, 116 insertions(+), 113 deletions(-) diff --git a/include/ui/input.h b/include/ui/input.h index 3cfd0f3363..c488585def 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -48,6 +48,7 @@ int qemu_input_key_value_to_number(const KeyValue *value); int qemu_input_key_value_to_qcode(const KeyValue *value); int qemu_input_key_value_to_scancode(const KeyValue *value, bool down, int *codes); +int qemu_input_linux_to_qcode(unsigned int lnx); =20 InputEvent *qemu_input_event_new_btn(InputButton btn, bool down); void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down); diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 8a1476fc48..d4972bb364 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -3,6 +3,115 @@ #include "ui/keymaps.h" #include "ui/input.h" =20 +#include "standard-headers/linux/input.h" + +static int linux_to_qcode[KEY_CNT] =3D { + [KEY_ESC] =3D Q_KEY_CODE_ESC, + [KEY_1] =3D Q_KEY_CODE_1, + [KEY_2] =3D Q_KEY_CODE_2, + [KEY_3] =3D Q_KEY_CODE_3, + [KEY_4] =3D Q_KEY_CODE_4, + [KEY_5] =3D Q_KEY_CODE_5, + [KEY_6] =3D Q_KEY_CODE_6, + [KEY_7] =3D Q_KEY_CODE_7, + [KEY_8] =3D Q_KEY_CODE_8, + [KEY_9] =3D Q_KEY_CODE_9, + [KEY_0] =3D Q_KEY_CODE_0, + [KEY_MINUS] =3D Q_KEY_CODE_MINUS, + [KEY_EQUAL] =3D Q_KEY_CODE_EQUAL, + [KEY_BACKSPACE] =3D Q_KEY_CODE_BACKSPACE, + [KEY_TAB] =3D Q_KEY_CODE_TAB, + [KEY_Q] =3D Q_KEY_CODE_Q, + [KEY_W] =3D Q_KEY_CODE_W, + [KEY_E] =3D Q_KEY_CODE_E, + [KEY_R] =3D Q_KEY_CODE_R, + [KEY_T] =3D Q_KEY_CODE_T, + [KEY_Y] =3D Q_KEY_CODE_Y, + [KEY_U] =3D Q_KEY_CODE_U, + [KEY_I] =3D Q_KEY_CODE_I, + [KEY_O] =3D Q_KEY_CODE_O, + [KEY_P] =3D Q_KEY_CODE_P, + [KEY_LEFTBRACE] =3D Q_KEY_CODE_BRACKET_LEFT, + [KEY_RIGHTBRACE] =3D Q_KEY_CODE_BRACKET_RIGHT, + [KEY_ENTER] =3D Q_KEY_CODE_RET, + [KEY_LEFTCTRL] =3D Q_KEY_CODE_CTRL, + [KEY_A] =3D Q_KEY_CODE_A, + [KEY_S] =3D Q_KEY_CODE_S, + [KEY_D] =3D Q_KEY_CODE_D, + [KEY_F] =3D Q_KEY_CODE_F, + [KEY_G] =3D Q_KEY_CODE_G, + [KEY_H] =3D Q_KEY_CODE_H, + [KEY_J] =3D Q_KEY_CODE_J, + [KEY_K] =3D Q_KEY_CODE_K, + [KEY_L] =3D Q_KEY_CODE_L, + [KEY_SEMICOLON] =3D Q_KEY_CODE_SEMICOLON, + [KEY_APOSTROPHE] =3D Q_KEY_CODE_APOSTROPHE, + [KEY_GRAVE] =3D Q_KEY_CODE_GRAVE_ACCENT, + [KEY_LEFTSHIFT] =3D Q_KEY_CODE_SHIFT, + [KEY_BACKSLASH] =3D Q_KEY_CODE_BACKSLASH, + [KEY_102ND] =3D Q_KEY_CODE_LESS, + [KEY_Z] =3D Q_KEY_CODE_Z, + [KEY_X] =3D Q_KEY_CODE_X, + [KEY_C] =3D Q_KEY_CODE_C, + [KEY_V] =3D Q_KEY_CODE_V, + [KEY_B] =3D Q_KEY_CODE_B, + [KEY_N] =3D Q_KEY_CODE_N, + [KEY_M] =3D Q_KEY_CODE_M, + [KEY_COMMA] =3D Q_KEY_CODE_COMMA, + [KEY_DOT] =3D Q_KEY_CODE_DOT, + [KEY_SLASH] =3D Q_KEY_CODE_SLASH, + [KEY_RIGHTSHIFT] =3D Q_KEY_CODE_SHIFT_R, + [KEY_LEFTALT] =3D Q_KEY_CODE_ALT, + [KEY_SPACE] =3D Q_KEY_CODE_SPC, + [KEY_CAPSLOCK] =3D Q_KEY_CODE_CAPS_LOCK, + [KEY_F1] =3D Q_KEY_CODE_F1, + [KEY_F2] =3D Q_KEY_CODE_F2, + [KEY_F3] =3D Q_KEY_CODE_F3, + [KEY_F4] =3D Q_KEY_CODE_F4, + [KEY_F5] =3D Q_KEY_CODE_F5, + [KEY_F6] =3D Q_KEY_CODE_F6, + [KEY_F7] =3D Q_KEY_CODE_F7, + [KEY_F8] =3D Q_KEY_CODE_F8, + [KEY_F9] =3D Q_KEY_CODE_F9, + [KEY_F10] =3D Q_KEY_CODE_F10, + [KEY_NUMLOCK] =3D Q_KEY_CODE_NUM_LOCK, + [KEY_SCROLLLOCK] =3D Q_KEY_CODE_SCROLL_LOCK, + [KEY_KP0] =3D Q_KEY_CODE_KP_0, + [KEY_KP1] =3D Q_KEY_CODE_KP_1, + [KEY_KP2] =3D Q_KEY_CODE_KP_2, + [KEY_KP3] =3D Q_KEY_CODE_KP_3, + [KEY_KP4] =3D Q_KEY_CODE_KP_4, + [KEY_KP5] =3D Q_KEY_CODE_KP_5, + [KEY_KP6] =3D Q_KEY_CODE_KP_6, + [KEY_KP7] =3D Q_KEY_CODE_KP_7, + [KEY_KP8] =3D Q_KEY_CODE_KP_8, + [KEY_KP9] =3D Q_KEY_CODE_KP_9, + [KEY_KPMINUS] =3D Q_KEY_CODE_KP_SUBTRACT, + [KEY_KPPLUS] =3D Q_KEY_CODE_KP_ADD, + [KEY_KPDOT] =3D Q_KEY_CODE_KP_DECIMAL, + [KEY_KPENTER] =3D Q_KEY_CODE_KP_ENTER, + [KEY_KPSLASH] =3D Q_KEY_CODE_KP_DIVIDE, + [KEY_KPASTERISK] =3D Q_KEY_CODE_KP_MULTIPLY, + [KEY_F11] =3D Q_KEY_CODE_F11, + [KEY_F12] =3D Q_KEY_CODE_F12, + [KEY_RIGHTCTRL] =3D Q_KEY_CODE_CTRL_R, + [KEY_SYSRQ] =3D Q_KEY_CODE_SYSRQ, + [KEY_RIGHTALT] =3D Q_KEY_CODE_ALT_R, + [KEY_HOME] =3D Q_KEY_CODE_HOME, + [KEY_UP] =3D Q_KEY_CODE_UP, + [KEY_PAGEUP] =3D Q_KEY_CODE_PGUP, + [KEY_LEFT] =3D Q_KEY_CODE_LEFT, + [KEY_RIGHT] =3D Q_KEY_CODE_RIGHT, + [KEY_END] =3D Q_KEY_CODE_END, + [KEY_DOWN] =3D Q_KEY_CODE_DOWN, + [KEY_PAGEDOWN] =3D Q_KEY_CODE_PGDN, + [KEY_INSERT] =3D Q_KEY_CODE_INSERT, + [KEY_DELETE] =3D Q_KEY_CODE_DELETE, + [KEY_LEFTMETA] =3D Q_KEY_CODE_META_L, + [KEY_RIGHTMETA] =3D Q_KEY_CODE_META_R, + [KEY_MENU] =3D Q_KEY_CODE_MENU, +}; + static const int qcode_to_number[] =3D { [Q_KEY_CODE_SHIFT] =3D 0x2a, [Q_KEY_CODE_SHIFT_R] =3D 0x36, @@ -141,6 +250,12 @@ static const int qcode_to_number[] =3D { =20 static int number_to_qcode[0x100]; =20 +int qemu_input_linux_to_qcode(unsigned int lnx) +{ + assert(lnx < KEY_CNT); + return linux_to_qcode[lnx]; +} + int qemu_input_key_value_to_number(const KeyValue *value) { if (value->type =3D=3D KEY_VALUE_KIND_QCODE) { diff --git a/ui/input-linux.c b/ui/input-linux.c index 49d52a69cc..9720333b2c 100644 --- a/ui/input-linux.c +++ b/ui/input-linux.c @@ -16,119 +16,6 @@ #include #include "standard-headers/linux/input.h" =20 -static int linux_to_qcode[KEY_CNT] =3D { - [KEY_ESC] =3D Q_KEY_CODE_ESC, - [KEY_1] =3D Q_KEY_CODE_1, - [KEY_2] =3D Q_KEY_CODE_2, - [KEY_3] =3D Q_KEY_CODE_3, - [KEY_4] =3D Q_KEY_CODE_4, - [KEY_5] =3D Q_KEY_CODE_5, - [KEY_6] =3D Q_KEY_CODE_6, - [KEY_7] =3D Q_KEY_CODE_7, - [KEY_8] =3D Q_KEY_CODE_8, - [KEY_9] =3D Q_KEY_CODE_9, - [KEY_0] =3D Q_KEY_CODE_0, - [KEY_MINUS] =3D Q_KEY_CODE_MINUS, - [KEY_EQUAL] =3D Q_KEY_CODE_EQUAL, - [KEY_BACKSPACE] =3D Q_KEY_CODE_BACKSPACE, - [KEY_TAB] =3D Q_KEY_CODE_TAB, - [KEY_Q] =3D Q_KEY_CODE_Q, - [KEY_W] =3D Q_KEY_CODE_W, - [KEY_E] =3D Q_KEY_CODE_E, - [KEY_R] =3D Q_KEY_CODE_R, - [KEY_T] =3D Q_KEY_CODE_T, - [KEY_Y] =3D Q_KEY_CODE_Y, - [KEY_U] =3D Q_KEY_CODE_U, - [KEY_I] =3D Q_KEY_CODE_I, - [KEY_O] =3D Q_KEY_CODE_O, - [KEY_P] =3D Q_KEY_CODE_P, - [KEY_LEFTBRACE] =3D Q_KEY_CODE_BRACKET_LEFT, - [KEY_RIGHTBRACE] =3D Q_KEY_CODE_BRACKET_RIGHT, - [KEY_ENTER] =3D Q_KEY_CODE_RET, - [KEY_LEFTCTRL] =3D Q_KEY_CODE_CTRL, - [KEY_A] =3D Q_KEY_CODE_A, - [KEY_S] =3D Q_KEY_CODE_S, - [KEY_D] =3D Q_KEY_CODE_D, - [KEY_F] =3D Q_KEY_CODE_F, - [KEY_G] =3D Q_KEY_CODE_G, - [KEY_H] =3D Q_KEY_CODE_H, - [KEY_J] =3D Q_KEY_CODE_J, - [KEY_K] =3D Q_KEY_CODE_K, - [KEY_L] =3D Q_KEY_CODE_L, - [KEY_SEMICOLON] =3D Q_KEY_CODE_SEMICOLON, - [KEY_APOSTROPHE] =3D Q_KEY_CODE_APOSTROPHE, - [KEY_GRAVE] =3D Q_KEY_CODE_GRAVE_ACCENT, - [KEY_LEFTSHIFT] =3D Q_KEY_CODE_SHIFT, - [KEY_BACKSLASH] =3D Q_KEY_CODE_BACKSLASH, - [KEY_102ND] =3D Q_KEY_CODE_LESS, - [KEY_Z] =3D Q_KEY_CODE_Z, - [KEY_X] =3D Q_KEY_CODE_X, - [KEY_C] =3D Q_KEY_CODE_C, - [KEY_V] =3D Q_KEY_CODE_V, - [KEY_B] =3D Q_KEY_CODE_B, - [KEY_N] =3D Q_KEY_CODE_N, - [KEY_M] =3D Q_KEY_CODE_M, - [KEY_COMMA] =3D Q_KEY_CODE_COMMA, - [KEY_DOT] =3D Q_KEY_CODE_DOT, - [KEY_SLASH] =3D Q_KEY_CODE_SLASH, - [KEY_RIGHTSHIFT] =3D Q_KEY_CODE_SHIFT_R, - [KEY_LEFTALT] =3D Q_KEY_CODE_ALT, - [KEY_SPACE] =3D Q_KEY_CODE_SPC, - [KEY_CAPSLOCK] =3D Q_KEY_CODE_CAPS_LOCK, - [KEY_F1] =3D Q_KEY_CODE_F1, - [KEY_F2] =3D Q_KEY_CODE_F2, - [KEY_F3] =3D Q_KEY_CODE_F3, - [KEY_F4] =3D Q_KEY_CODE_F4, - [KEY_F5] =3D Q_KEY_CODE_F5, - [KEY_F6] =3D Q_KEY_CODE_F6, - [KEY_F7] =3D Q_KEY_CODE_F7, - [KEY_F8] =3D Q_KEY_CODE_F8, - [KEY_F9] =3D Q_KEY_CODE_F9, - [KEY_F10] =3D Q_KEY_CODE_F10, - [KEY_NUMLOCK] =3D Q_KEY_CODE_NUM_LOCK, - [KEY_SCROLLLOCK] =3D Q_KEY_CODE_SCROLL_LOCK, - [KEY_KP0] =3D Q_KEY_CODE_KP_0, - [KEY_KP1] =3D Q_KEY_CODE_KP_1, - [KEY_KP2] =3D Q_KEY_CODE_KP_2, - [KEY_KP3] =3D Q_KEY_CODE_KP_3, - [KEY_KP4] =3D Q_KEY_CODE_KP_4, - [KEY_KP5] =3D Q_KEY_CODE_KP_5, - [KEY_KP6] =3D Q_KEY_CODE_KP_6, - [KEY_KP7] =3D Q_KEY_CODE_KP_7, - [KEY_KP8] =3D Q_KEY_CODE_KP_8, - [KEY_KP9] =3D Q_KEY_CODE_KP_9, - [KEY_KPMINUS] =3D Q_KEY_CODE_KP_SUBTRACT, - [KEY_KPPLUS] =3D Q_KEY_CODE_KP_ADD, - [KEY_KPDOT] =3D Q_KEY_CODE_KP_DECIMAL, - [KEY_KPENTER] =3D Q_KEY_CODE_KP_ENTER, - [KEY_KPSLASH] =3D Q_KEY_CODE_KP_DIVIDE, - [KEY_KPASTERISK] =3D Q_KEY_CODE_KP_MULTIPLY, - [KEY_F11] =3D Q_KEY_CODE_F11, - [KEY_F12] =3D Q_KEY_CODE_F12, - [KEY_RIGHTCTRL] =3D Q_KEY_CODE_CTRL_R, - [KEY_SYSRQ] =3D Q_KEY_CODE_SYSRQ, - [KEY_RIGHTALT] =3D Q_KEY_CODE_ALT_R, - [KEY_HOME] =3D Q_KEY_CODE_HOME, - [KEY_UP] =3D Q_KEY_CODE_UP, - [KEY_PAGEUP] =3D Q_KEY_CODE_PGUP, - [KEY_LEFT] =3D Q_KEY_CODE_LEFT, - [KEY_RIGHT] =3D Q_KEY_CODE_RIGHT, - [KEY_END] =3D Q_KEY_CODE_END, - [KEY_DOWN] =3D Q_KEY_CODE_DOWN, - [KEY_PAGEDOWN] =3D Q_KEY_CODE_PGDN, - [KEY_INSERT] =3D Q_KEY_CODE_INSERT, - [KEY_DELETE] =3D Q_KEY_CODE_DELETE, - [KEY_LEFTMETA] =3D Q_KEY_CODE_META_L, - [KEY_RIGHTMETA] =3D Q_KEY_CODE_META_R, - [KEY_MENU] =3D Q_KEY_CODE_MENU, -}; - -static int qemu_input_linux_to_qcode(unsigned int lnx) -{ - assert(lnx < KEY_CNT); - return linux_to_qcode[lnx]; -} - static bool linux_is_button(unsigned int lnx) { if (lnx < 0x100) { --=20 2.9.3 From nobody Sat Apr 27 19:11:56 2024 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 1501070534916885.7538368407801; Wed, 26 Jul 2017 05:02:14 -0700 (PDT) Received: from localhost ([::1]:37734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daL0z-0008UK-H0 for importer@patchew.org; Wed, 26 Jul 2017 08:02:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKvk-0003ri-EW for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daKvi-00044M-JE for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36466) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1daKvi-00043P-Cv for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:42 -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 60A512DD4C for ; Wed, 26 Jul 2017 11:56:41 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BDAA784B0; Wed, 26 Jul 2017 11:56:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A9C1F3BE; Wed, 26 Jul 2017 13:56:37 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 60A512DD4C Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 26 Jul 2017 13:56:35 +0200 Message-Id: <20170726115637.21558-4-kraxel@redhat.com> In-Reply-To: <20170726115637.21558-1-kraxel@redhat.com> References: <20170726115637.21558-1-kraxel@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.38]); Wed, 26 Jul 2017 11:56:41 +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 3/5] ui: update keymaps 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" Add recently added QKeyCodes to the keymaps. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- ui/input-keymap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/input-keymap.c b/ui/input-keymap.c index d4972bb364..7461e1edde 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -94,6 +94,9 @@ static int linux_to_qcode[KEY_CNT] =3D { [KEY_KPASTERISK] =3D Q_KEY_CODE_KP_MULTIPLY, [KEY_F11] =3D Q_KEY_CODE_F11, [KEY_F12] =3D Q_KEY_CODE_F12, + [KEY_RO] =3D Q_KEY_CODE_RO, + [KEY_HIRAGANA] =3D Q_KEY_CODE_HIRAGANA, + [KEY_HENKAN] =3D Q_KEY_CODE_HENKAN, [KEY_RIGHTCTRL] =3D Q_KEY_CODE_CTRL_R, [KEY_SYSRQ] =3D Q_KEY_CODE_SYSRQ, [KEY_RIGHTALT] =3D Q_KEY_CODE_ALT_R, @@ -107,6 +110,9 @@ static int linux_to_qcode[KEY_CNT] =3D { [KEY_PAGEDOWN] =3D Q_KEY_CODE_PGDN, [KEY_INSERT] =3D Q_KEY_CODE_INSERT, [KEY_DELETE] =3D Q_KEY_CODE_DELETE, + [KEY_POWER] =3D Q_KEY_CODE_POWER, + [KEY_KPCOMMA] =3D Q_KEY_CODE_KP_COMMA, + [KEY_YEN] =3D Q_KEY_CODE_YEN, [KEY_LEFTMETA] =3D Q_KEY_CODE_META_L, [KEY_RIGHTMETA] =3D Q_KEY_CODE_META_R, [KEY_MENU] =3D Q_KEY_CODE_MENU, @@ -242,6 +248,7 @@ static const int qcode_to_number[] =3D { [Q_KEY_CODE_RO] =3D 0x73, [Q_KEY_CODE_HIRAGANA] =3D 0x70, [Q_KEY_CODE_HENKAN] =3D 0x79, + [Q_KEY_CODE_POWER] =3D 0xde, [Q_KEY_CODE_YEN] =3D 0x7d, [Q_KEY_CODE_KP_COMMA] =3D 0x7e, =20 --=20 2.9.3 From nobody Sat Apr 27 19:11:56 2024 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 1501070422659177.37740149671163; Wed, 26 Jul 2017 05:00:22 -0700 (PDT) Received: from localhost ([::1]:37554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKzF-0006sB-AJ for importer@patchew.org; Wed, 26 Jul 2017 08:00:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKvk-0003rj-F9 for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daKvi-000442-CX for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1daKvi-00043D-3r for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:42 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 113A47F7DA for ; Wed, 26 Jul 2017 11:56:41 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A66B6A743; Wed, 26 Jul 2017 11:56:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B17F23BF; Wed, 26 Jul 2017 13:56:37 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 113A47F7DA 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=pass smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 26 Jul 2017 13:56:36 +0200 Message-Id: <20170726115637.21558-5-kraxel@redhat.com> In-Reply-To: <20170726115637.21558-1-kraxel@redhat.com> References: <20170726115637.21558-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 26 Jul 2017 11:56:41 +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 4/5] ui: add multimedia keys 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 , Markus Armbruster 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" Add multimedia keys to QKeyCodes and to the keymaps. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- ui/input-keymap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 17 ++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 7461e1edde..ae781beae9 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -116,6 +116,28 @@ static int linux_to_qcode[KEY_CNT] =3D { [KEY_LEFTMETA] =3D Q_KEY_CODE_META_L, [KEY_RIGHTMETA] =3D Q_KEY_CODE_META_R, [KEY_MENU] =3D Q_KEY_CODE_MENU, + + [KEY_SLEEP] =3D Q_KEY_CODE_SLEEP, + [KEY_WAKEUP] =3D Q_KEY_CODE_WAKE, + [KEY_CALC] =3D Q_KEY_CODE_CALCULATOR, + [KEY_MAIL] =3D Q_KEY_CODE_MAIL, + [KEY_COMPUTER] =3D Q_KEY_CODE_COMPUTER, + + [KEY_STOP] =3D Q_KEY_CODE_AC_STOP, + [KEY_BOOKMARKS] =3D Q_KEY_CODE_AC_BOOKMARKS, + [KEY_BACK] =3D Q_KEY_CODE_AC_BACK, + [KEY_FORWARD] =3D Q_KEY_CODE_AC_FORWARD, + [KEY_HOMEPAGE] =3D Q_KEY_CODE_AC_HOME, + [KEY_REFRESH] =3D Q_KEY_CODE_AC_REFRESH, + [KEY_FIND] =3D Q_KEY_CODE_AC_SEARCH, + + [KEY_NEXTSONG] =3D Q_KEY_CODE_AUDIONEXT, + [KEY_PREVIOUSSONG] =3D Q_KEY_CODE_AUDIOPREV, + [KEY_STOPCD] =3D Q_KEY_CODE_AUDIOSTOP, + [KEY_PLAYCD] =3D Q_KEY_CODE_AUDIOPLAY, + [KEY_MUTE] =3D Q_KEY_CODE_AUDIOMUTE, + [KEY_VOLUMEDOWN] =3D Q_KEY_CODE_VOLUMEDOWN, + [KEY_VOLUMEUP] =3D Q_KEY_CODE_VOLUMEUP, }; =20 static const int qcode_to_number[] =3D { @@ -252,6 +274,28 @@ static const int qcode_to_number[] =3D { [Q_KEY_CODE_YEN] =3D 0x7d, [Q_KEY_CODE_KP_COMMA] =3D 0x7e, =20 + [Q_KEY_CODE_SLEEP] =3D 0xdf, + [Q_KEY_CODE_WAKE] =3D 0xe3, + [Q_KEY_CODE_CALCULATOR] =3D 0xa1, + [Q_KEY_CODE_MAIL] =3D 0xec, + [Q_KEY_CODE_COMPUTER] =3D 0xeb, + + [Q_KEY_CODE_AC_STOP] =3D 0xe8, + [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe6, + [Q_KEY_CODE_AC_BACK] =3D 0xea, + [Q_KEY_CODE_AC_FORWARD] =3D 0xe9, + [Q_KEY_CODE_AC_HOME] =3D 0xb2, + [Q_KEY_CODE_AC_REFRESH] =3D 0xe7, + [Q_KEY_CODE_AC_SEARCH] =3D 0xe5, + + [Q_KEY_CODE_AUDIONEXT] =3D 0x99, + [Q_KEY_CODE_AUDIOPREV] =3D 0x90, + [Q_KEY_CODE_AUDIOSTOP] =3D 0xa4, + [Q_KEY_CODE_AUDIOPLAY] =3D 0xa2, + [Q_KEY_CODE_AUDIOMUTE] =3D 0xa0, + [Q_KEY_CODE_VOLUMEDOWN] =3D 0xae, + [Q_KEY_CODE_VOLUMEUP] =3D 0xb0, + [Q_KEY_CODE__MAX] =3D 0, }; =20 diff --git a/qapi-schema.json b/qapi-schema.json index 9c6c3e1a53..93ff0f3921 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4843,6 +4843,16 @@ # @henkan: since 2.9 # @yen: since 2.9 # +# @sleep: since 2.10 +# @wake: since 2.10 +# @audio*: since 2.10 +# @volume*: since 2.10 +# @mediaselect: since 2.10 +# @mail: since 2.10 +# @calculator: since 2.10 +# @computer: since 2.10 +# @ac_*: since 2.10 +# # Since: 1.3.0 # ## @@ -4864,7 +4874,12 @@ 'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cu= t', 'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause', 'ro', 'hiragana', 'henkan', 'yen', - 'kp_comma', 'kp_equals', 'power' ] } + 'kp_comma', 'kp_equals', 'power', 'sleep', 'wake', + 'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute= ', + 'volumeup', 'volumedown', 'mediaselect', + 'mail', 'calculator', 'computer', + 'ac_search', 'ac_home', 'ac_back', 'ac_forward', 'ac_stop', + 'ac_refresh', 'ac_bookmarks' ] } =20 ## # @KeyValue: --=20 2.9.3 From nobody Sat Apr 27 19:11:56 2024 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 1501070294694979.6323382186523; Wed, 26 Jul 2017 04:58:14 -0700 (PDT) Received: from localhost ([::1]:37545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKxA-0004gG-5D for importer@patchew.org; Wed, 26 Jul 2017 07:58:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daKvk-0003rl-GF for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daKvj-00044e-2g for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45736) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1daKvi-00043y-T4 for qemu-devel@nongnu.org; Wed, 26 Jul 2017 07:56:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CF45E2F86D0 for ; Wed, 26 Jul 2017 11:56:41 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-225.ams2.redhat.com [10.36.116.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C550612B7; Wed, 26 Jul 2017 11:56:41 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B99B716028A; Wed, 26 Jul 2017 13:56:37 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CF45E2F86D0 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 26 Jul 2017 13:56:37 +0200 Message-Id: <20170726115637.21558-6-kraxel@redhat.com> In-Reply-To: <20170726115637.21558-1-kraxel@redhat.com> References: <20170726115637.21558-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 26 Jul 2017 11:56:41 +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 5/5] ps2: enable multimedia keys 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" Fixes: 8c10e0baf0260b59a4e984744462a18016662e3e Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake --- hw/input/ps2.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 3ba05efd06..25ae7fc852 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -224,7 +224,6 @@ static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE_= _MAX] =3D { [Q_KEY_CODE_DOT] =3D 0x34, [Q_KEY_CODE_SLASH] =3D 0x35, =20 -#if 0 [Q_KEY_CODE_POWER] =3D 0x0e5e, [Q_KEY_CODE_SLEEP] =3D 0x0e5f, [Q_KEY_CODE_WAKE] =3D 0x0e63, @@ -247,7 +246,6 @@ static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE_= _MAX] =3D { [Q_KEY_CODE_AC_STOP] =3D 0xe068, [Q_KEY_CODE_AC_REFRESH] =3D 0xe067, [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe066, -#endif =20 [Q_KEY_CODE_ASTERISK] =3D 0x37, [Q_KEY_CODE_LESS] =3D 0x56, @@ -366,7 +364,6 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE_= _MAX] =3D { [Q_KEY_CODE_DOT] =3D 0x49, [Q_KEY_CODE_SLASH] =3D 0x4a, =20 -#if 0 [Q_KEY_CODE_POWER] =3D 0x0e37, [Q_KEY_CODE_SLEEP] =3D 0x0e3f, [Q_KEY_CODE_WAKE] =3D 0x0e5e, @@ -389,7 +386,6 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE_= _MAX] =3D { [Q_KEY_CODE_AC_STOP] =3D 0xe028, [Q_KEY_CODE_AC_REFRESH] =3D 0xe020, [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe018, -#endif =20 [Q_KEY_CODE_ALTGR] =3D 0x08, [Q_KEY_CODE_ALTGR_R] =3D 0xe008, --=20 2.9.3