From nobody Thu Dec 18 08:37:13 2025 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 1500904989339744.7574478338404; Mon, 24 Jul 2017 07:03:09 -0700 (PDT) Received: from localhost ([::1]:55038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZdwv-000481-KF for importer@patchew.org; Mon, 24 Jul 2017 10:03:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZdvN-0003F8-KC for qemu-devel@nongnu.org; Mon, 24 Jul 2017 10:01:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZdvL-0005sb-Gx for qemu-devel@nongnu.org; Mon, 24 Jul 2017 10:01:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34827) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dZdvL-0005rO-83 for qemu-devel@nongnu.org; Mon, 24 Jul 2017 10:01:27 -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 15C45356E3 for ; Mon, 24 Jul 2017 14:01:26 +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 896D495206; Mon, 24 Jul 2017 14:01:18 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B9C033B7; Mon, 24 Jul 2017 16:01:17 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 15C45356E3 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=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 15C45356E3 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 16:01:16 +0200 Message-Id: <20170724140117.27651-3-kraxel@redhat.com> In-Reply-To: <20170724140117.27651-1-kraxel@redhat.com> References: <20170724140117.27651-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.30]); Mon, 24 Jul 2017 14:01:26 +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/3] 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 --- 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