From nobody Thu May 2 15:00:34 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 1501164549090862.9993357393848; Thu, 27 Jul 2017 07:09:09 -0700 (PDT) Received: from localhost ([::1]:43231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajTM-0002B4-Pl for importer@patchew.org; Thu, 27 Jul 2017 10:09:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajLI-0003HL-0T for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dajLC-0001qb-3n for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43624) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dajLB-0001nx-TS for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:38 -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 47CDD32D323 for ; Thu, 27 Jul 2017 14:00:34 +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 C71396FB76; Thu, 27 Jul 2017 14:00:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 605E6974; Thu, 27 Jul 2017 16:00:25 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 47CDD32D323 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 27 Jul 2017 16:00:19 +0200 Message-Id: <20170727140025.392-2-kraxel@redhat.com> In-Reply-To: <20170727140025.392-1-kraxel@redhat.com> References: <20170727140025.392-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.30]); Thu, 27 Jul 2017 14:00:34 +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] [PULL 1/7] 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 were 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 Message-id: 20170726152918.11995-2-kraxel@redhat.com --- 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 Thu May 2 15:00:34 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 1501164157950255.97860068812656; Thu, 27 Jul 2017 07:02:37 -0700 (PDT) Received: from localhost ([::1]:43178 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajN2-0004NP-7R for importer@patchew.org; Thu, 27 Jul 2017 10:02:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajLE-0003FH-It for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dajLD-0001rG-82 for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dajLC-0001oF-W5 for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:39 -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 C8D0B32B362 for ; Thu, 27 Jul 2017 14:00:34 +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 A9F256FE61; Thu, 27 Jul 2017 14:00:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6933E6EB; Thu, 27 Jul 2017 16:00:25 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C8D0B32B362 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 27 Jul 2017 16:00:20 +0200 Message-Id: <20170727140025.392-3-kraxel@redhat.com> In-Reply-To: <20170727140025.392-1-kraxel@redhat.com> References: <20170727140025.392-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.27]); Thu, 27 Jul 2017 14:00:35 +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] [PULL 2/7] 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 Message-id: 20170726152918.11995-3-kraxel@redhat.com --- 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 Thu May 2 15:00:34 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 1501164340944438.61467141919024; Thu, 27 Jul 2017 07:05:40 -0700 (PDT) Received: from localhost ([::1]:43198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajQ1-0007Jg-7H for importer@patchew.org; Thu, 27 Jul 2017 10:05:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajLJ-0003JH-Vb for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dajLC-0001qc-4W for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44988) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dajLB-0001pX-TW for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:38 -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 65785C109AAF for ; Thu, 27 Jul 2017 14:00:36 +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 C0B185C323; Thu, 27 Jul 2017 14:00:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6FD2138E; Thu, 27 Jul 2017 16:00:25 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 65785C109AAF Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 27 Jul 2017 16:00:21 +0200 Message-Id: <20170727140025.392-4-kraxel@redhat.com> In-Reply-To: <20170727140025.392-1-kraxel@redhat.com> References: <20170727140025.392-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.31]); Thu, 27 Jul 2017 14:00:36 +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] [PULL 3/7] 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 Message-id: 20170726152918.11995-4-kraxel@redhat.com --- 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 Thu May 2 15:00:34 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 150116438587668.24178812738342; Thu, 27 Jul 2017 07:06:25 -0700 (PDT) Received: from localhost ([::1]:43201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajQe-0008AE-Dk for importer@patchew.org; Thu, 27 Jul 2017 10:06:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajLR-0003Pu-HQ for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:01:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dajLH-0001uC-RJ for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41912) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dajLH-0001tK-7J for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:43 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0AD9B06A2 for ; Thu, 27 Jul 2017 14:00: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 C83055C269; Thu, 27 Jul 2017 14:00:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 779A93B6; Thu, 27 Jul 2017 16:00:25 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com F0AD9B06A2 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 27 Jul 2017 16:00:22 +0200 Message-Id: <20170727140025.392-5-kraxel@redhat.com> In-Reply-To: <20170727140025.392-1-kraxel@redhat.com> References: <20170727140025.392-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 27 Jul 2017 14:00:42 +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] [PULL 4/7] 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 Message-id: 20170726152918.11995-5-kraxel@redhat.com --- ui/input-keymap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 28 +++++++++++++++++++++++++++- 2 files changed, 71 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..9cb15092a7 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4843,6 +4843,27 @@ # @henkan: since 2.9 # @yen: since 2.9 # +# @sleep: since 2.10 +# @wake: since 2.10 +# @audionext: since 2.10 +# @audioprev: since 2.10 +# @audiostop: since 2.10 +# @audioplay: since 2.10 +# @audiomute: since 2.10 +# @volumeup: since 2.10 +# @volumedown: since 2.10 +# @mediaselect: since 2.10 +# @mail: since 2.10 +# @calculator: since 2.10 +# @computer: since 2.10 +# @ac_search: since 2.10 +# @ac_home: since 2.10 +# @ac_back: since 2.10 +# @ac_forward: since 2.10 +# @ac_stop: since 2.10 +# @ac_refresh: since 2.10 +# @ac_bookmarks: since 2.10 +# # Since: 1.3.0 # ## @@ -4864,7 +4885,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 Thu May 2 15:00:34 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 1501164159456870.6019714134136; Thu, 27 Jul 2017 07:02:39 -0700 (PDT) Received: from localhost ([::1]:43179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajN6-0004QL-4p for importer@patchew.org; Thu, 27 Jul 2017 10:02:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajLE-0003F1-4Q for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dajLD-0001rQ-Ed for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35282) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dajLD-0001oq-6U for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:39 -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 B1B2A322D7A for ; Thu, 27 Jul 2017 14:00:35 +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 F10B86FB8D; Thu, 27 Jul 2017 14:00:34 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7E4883B7; Thu, 27 Jul 2017 16:00:25 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B1B2A322D7A Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 27 Jul 2017 16:00:23 +0200 Message-Id: <20170727140025.392-6-kraxel@redhat.com> In-Reply-To: <20170727140025.392-1-kraxel@redhat.com> References: <20170727140025.392-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.27]); Thu, 27 Jul 2017 14:00:35 +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] [PULL 5/7] 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 Message-id: 20170726152918.11995-6-kraxel@redhat.com --- 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 From nobody Thu May 2 15:00:34 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 1501164815969462.6786856004246; Thu, 27 Jul 2017 07:13:35 -0700 (PDT) Received: from localhost ([::1]:43273 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajXh-0005wA-Hi for importer@patchew.org; Thu, 27 Jul 2017 10:13:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajLT-0003RN-B7 for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:01:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dajLJ-0001vo-Vw for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52642) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dajLI-0001ul-VD for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:45 -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 B29031B9835 for ; Thu, 27 Jul 2017 14:00:43 +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 003176FE64; Thu, 27 Jul 2017 14:00:34 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 887653B9; Thu, 27 Jul 2017 16:00:25 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B29031B9835 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 27 Jul 2017 16:00:24 +0200 Message-Id: <20170727140025.392-7-kraxel@redhat.com> In-Reply-To: <20170727140025.392-1-kraxel@redhat.com> References: <20170727140025.392-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.26]); Thu, 27 Jul 2017 14:00:43 +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] [PULL 6/7] ui: drop altgr and altgr_r QKeyCodes 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: Paolo Bonzini , 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" The right alt key (alt_r aka KEY_RIGHTALT) is used for AltGr. The altgr and altgr_r keys simply don't exist. Drop them. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake Message-id: 20170727104720.30061-1-kraxel@redhat.com --- hw/char/escc.c | 1 - hw/input/adb.c | 1 - hw/input/ps2.c | 2 -- ui/input-keymap.c | 2 -- qapi-schema.json | 3 ++- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/char/escc.c b/hw/char/escc.c index 89ae9eb997..1aca564e33 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -722,7 +722,6 @@ static const uint8_t qcode_to_keycode[Q_KEY_CODE__MAX] = =3D { [Q_KEY_CODE_SHIFT_R] =3D 110, [Q_KEY_CODE_ALT] =3D 19, [Q_KEY_CODE_ALT_R] =3D 13, - [Q_KEY_CODE_ALTGR] =3D 13, [Q_KEY_CODE_CTRL] =3D 76, [Q_KEY_CODE_CTRL_R] =3D 76, [Q_KEY_CODE_ESC] =3D 29, diff --git a/hw/input/adb.c b/hw/input/adb.c index 43d3205472..fcca3a8eb9 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -201,7 +201,6 @@ int qcode_to_adb_keycode[] =3D { [Q_KEY_CODE_SHIFT_R] =3D ADB_KEY_RIGHT_SHIFT, [Q_KEY_CODE_ALT] =3D ADB_KEY_LEFT_OPTION, [Q_KEY_CODE_ALT_R] =3D ADB_KEY_RIGHT_OPTION, - [Q_KEY_CODE_ALTGR] =3D ADB_KEY_RIGHT_OPTION, [Q_KEY_CODE_CTRL] =3D ADB_KEY_LEFT_CONTROL, [Q_KEY_CODE_CTRL_R] =3D ADB_KEY_RIGHT_CONTROL, [Q_KEY_CODE_META_L] =3D ADB_KEY_COMMAND, diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 25ae7fc852..9f057e46ea 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -387,8 +387,6 @@ static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE_= _MAX] =3D { [Q_KEY_CODE_AC_REFRESH] =3D 0xe020, [Q_KEY_CODE_AC_BOOKMARKS] =3D 0xe018, =20 - [Q_KEY_CODE_ALTGR] =3D 0x08, - [Q_KEY_CODE_ALTGR_R] =3D 0xe008, [Q_KEY_CODE_ASTERISK] =3D 0x7c, [Q_KEY_CODE_LESS] =3D 0x61, [Q_KEY_CODE_SYSRQ] =3D 0x7f, diff --git a/ui/input-keymap.c b/ui/input-keymap.c index ae781beae9..f96adf4165 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -146,8 +146,6 @@ static const int qcode_to_number[] =3D { =20 [Q_KEY_CODE_ALT] =3D 0x38, [Q_KEY_CODE_ALT_R] =3D 0xb8, - [Q_KEY_CODE_ALTGR] =3D 0x64, - [Q_KEY_CODE_ALTGR_R] =3D 0xe4, [Q_KEY_CODE_CTRL] =3D 0x1d, [Q_KEY_CODE_CTRL_R] =3D 0x9d, =20 diff --git a/qapi-schema.json b/qapi-schema.json index 9cb15092a7..dcc12c83a9 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4863,13 +4863,14 @@ # @ac_stop: since 2.10 # @ac_refresh: since 2.10 # @ac_bookmarks: since 2.10 +# altgr, altgr_r: dropped in 2.10 # # Since: 1.3.0 # ## { 'enum': 'QKeyCode', 'data': [ 'unmapped', - 'shift', 'shift_r', 'alt', 'alt_r', 'altgr', 'altgr_r', 'ctrl', + 'shift', 'shift_r', 'alt', 'alt_r', 'ctrl', 'ctrl_r', 'menu', 'esc', '1', '2', '3', '4', '5', '6', '7', '8= ', '9', '0', 'minus', 'equal', 'backspace', 'tab', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', 'bracket_left', 'bracket_ri= ght', --=20 2.9.3 From nobody Thu May 2 15:00:34 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 1501164662042758.5085640884297; Thu, 27 Jul 2017 07:11:02 -0700 (PDT) Received: from localhost ([::1]:43259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajV4-000428-JJ for importer@patchew.org; Thu, 27 Jul 2017 10:10:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dajLI-0003HO-1M for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dajLD-0001rg-Rl for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61383) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dajLD-0001pH-5q for qemu-devel@nongnu.org; Thu, 27 Jul 2017 10:00:39 -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 17C54E7B6B for ; Thu, 27 Jul 2017 14:00:36 +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 5FA5A6FE66; Thu, 27 Jul 2017 14:00:35 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 910583BA; Thu, 27 Jul 2017 16:00:25 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 17C54E7B6B Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 27 Jul 2017 16:00:25 +0200 Message-Id: <20170727140025.392-8-kraxel@redhat.com> In-Reply-To: <20170727140025.392-1-kraxel@redhat.com> References: <20170727140025.392-1-kraxel@redhat.com> MIME-Version: 1.0 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.39]); Thu, 27 Jul 2017 14:00:36 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PULL 7/7] ps2: fix sending of PAUSE/BREAK scancodes 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-Type: text/plain; charset="utf-8" From: "Daniel P. Berrange" The processing of the scancodes for PAUSE/BREAK has been broken since the conversion to qcodes in: commit 8c10e0baf0260b59a4e984744462a18016662e3e Author: Herv=C3=A9 Poussineau Date: Thu Sep 15 22:06:26 2016 +0200 ps2: use QEMU qcodes instead of scancodes When using a VNC client, with the raw scancode extension, the client will send a scancode of 0xc6 for both PAUSE and BREAK. There is mistakenly no entry in the qcode_to_number table for this scancode, so ps2_keyboard_event() just generates a log message and discards the scancode When using a SPICE client, it will also send 0xc6 for BREAK, but will send 0xe1 0x1d 0x45 0xe1 0x9d 0xc5 for PAUSE. There is no entry in the qcode_to_number table for the scancode 0xe1 because it is a special XT keyboard prefix not mapping to any QKeyCode. Again ps2_keyboard_event() just generates a log message and discards the scancode. The following 0x1d, 0x45, 0x9d, 0xc5 scancodes get handled correctly. Rather than trying to handle 3 byte sequences of scancodes in the PS/2 driver, special case the SPICE input code so that it captures the 3 byte pause sequence and turns it into a Pause QKeyCode. Signed-off-by: Daniel P. Berrange Message-id: 20170727113243.23991-1-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- ui/keymaps.h | 1 + ui/input-keymap.c | 1 + ui/spice-input.c | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/ui/keymaps.h b/ui/keymaps.h index 47d061343e..8757465529 100644 --- a/ui/keymaps.h +++ b/ui/keymaps.h @@ -59,6 +59,7 @@ typedef struct { /* "grey" keys will usually need a 0xe0 prefix */ #define SCANCODE_GREY 0x80 #define SCANCODE_EMUL0 0xE0 +#define SCANCODE_EMUL1 0xE1 /* "up" flag */ #define SCANCODE_UP 0x80 =20 diff --git a/ui/input-keymap.c b/ui/input-keymap.c index f96adf4165..0d9ddde9c9 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -233,6 +233,7 @@ static const int qcode_to_number[] =3D { [Q_KEY_CODE_KP_ENTER] =3D 0x9c, [Q_KEY_CODE_KP_DECIMAL] =3D 0x53, [Q_KEY_CODE_SYSRQ] =3D 0x54, + [Q_KEY_CODE_PAUSE] =3D 0xc6, =20 [Q_KEY_CODE_KP_0] =3D 0x52, [Q_KEY_CODE_KP_1] =3D 0x4f, diff --git a/ui/spice-input.c b/ui/spice-input.c index 918580239d..cda9976469 100644 --- a/ui/spice-input.c +++ b/ui/spice-input.c @@ -32,6 +32,7 @@ typedef struct QemuSpiceKbd { SpiceKbdInstance sin; int ledstate; bool emul0; + size_t pauseseq; } QemuSpiceKbd; =20 static void kbd_push_key(SpiceKbdInstance *sin, uint8_t frag); @@ -64,6 +65,25 @@ static void kbd_push_key(SpiceKbdInstance *sin, uint8_t = scancode) keycode |=3D SCANCODE_GREY; } =20 + if (scancode =3D=3D SCANCODE_EMUL1) { + kbd->pauseseq++; + return; + } else if (kbd->pauseseq =3D=3D 1) { + if (keycode =3D=3D 0x1d) { + kbd->pauseseq++; + return; + } else { + kbd->pauseseq =3D 0; + } + } else if (kbd->pauseseq =3D=3D 2) { + if (keycode =3D=3D 0x45) { + qemu_input_event_send_key_qcode(NULL, Q_KEY_CODE_PAUSE, !up); + kbd->pauseseq =3D 0; + return; + } + kbd->pauseseq =3D 0; + } + qemu_input_event_send_key_number(NULL, keycode, !up); } =20 --=20 2.9.3