From nobody Fri Oct 24 22:12:04 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519139350354935.2101571143065; Tue, 20 Feb 2018 07:09:10 -0800 (PST) Received: from localhost ([::1]:56021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eo9XZ-0003Ms-Gc for importer@patchew.org; Tue, 20 Feb 2018 10:09:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eo9Su-0007vk-4O for qemu-devel@nongnu.org; Tue, 20 Feb 2018 10:04:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eo9So-0006Rg-0x for qemu-devel@nongnu.org; Tue, 20 Feb 2018 10:04:20 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37250 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eo9Sn-0006RX-Ro for qemu-devel@nongnu.org; Tue, 20 Feb 2018 10:04:13 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C952EB709 for ; Tue, 20 Feb 2018 15:04:02 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-147.ams2.redhat.com [10.36.116.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE7C42024CA7; Tue, 20 Feb 2018 15:03:57 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 49B011751D; Tue, 20 Feb 2018 16:03:57 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 20 Feb 2018 16:03:55 +0100 Message-Id: <20180220150357.324-4-kraxel@redhat.com> In-Reply-To: <20180220150357.324-1-kraxel@redhat.com> References: <20180220150357.324-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 20 Feb 2018 15:04:03 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 20 Feb 2018 15:04:03 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 3/5] keymap: numpad keysyms and keycodes are fixed 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" No need to figure them at runtime from the keymap. Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrang=C3=A9 --- ui/keymaps.c | 61 +++++++++-----------------------------------------------= ---- 1 file changed, 9 insertions(+), 52 deletions(-) diff --git a/ui/keymaps.c b/ui/keymaps.c index bef1405576..d71ae389e0 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -28,20 +28,12 @@ #include "trace.h" #include "qemu/error-report.h" =20 -struct key_range { - int start; - int end; - struct key_range *next; -}; - struct keysym2code { uint16_t keycode; }; =20 struct kbd_layout_t { GHashTable *hash; - struct key_range *keypad_range; - struct key_range *numlock_range; }; =20 static inline gpointer hashkey(int keysym) @@ -70,29 +62,6 @@ static int get_keysym(const name2keysym_t *table, } =20 =20 -static void add_to_key_range(struct key_range **krp, int code) { - struct key_range *kr; - for (kr =3D *krp; kr; kr =3D kr->next) { - if (code >=3D kr->start && code <=3D kr->end) { - break; - } - if (code =3D=3D kr->start - 1) { - kr->start--; - break; - } - if (code =3D=3D kr->end + 1) { - kr->end++; - break; - } - } - if (kr =3D=3D NULL) { - kr =3D g_malloc0(sizeof(*kr)); - kr->start =3D kr->end =3D code; - kr->next =3D *krp; - *krp =3D kr; - } -} - static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *= k) { struct keysym2code *keysym2code; @@ -166,13 +135,6 @@ static kbd_layout_t *parse_keyboard_layout(const name2= keysym_t *table, const char *rest =3D line + offset + 1; int keycode =3D strtol(rest, NULL, 0); =20 - if (strstr(rest, "numlock")) { - add_to_key_range(&k->keypad_range, keycode); - add_to_key_range(&k->numlock_range, keysym); - /* fprintf(stderr, "keypad keysym %04x keycode %d\= n", - keysym, keycode); */ - } - if (strstr(rest, "shift")) { keycode |=3D SCANCODE_SHIFT; } @@ -234,24 +196,19 @@ int keysym2scancode(kbd_layout_t *k, int keysym) =20 int keycode_is_keypad(kbd_layout_t *k, int keycode) { - struct key_range *kr; - - for (kr =3D k->keypad_range; kr; kr =3D kr->next) { - if (keycode >=3D kr->start && keycode <=3D kr->end) { - return 1; - } + if (keycode >=3D 0x47 && keycode <=3D 0x53) { + return true; } - return 0; + return false; } =20 int keysym_is_numlock(kbd_layout_t *k, int keysym) { - struct key_range *kr; - - for (kr =3D k->numlock_range; kr; kr =3D kr->next) { - if (keysym >=3D kr->start && keysym <=3D kr->end) { - return 1; - } + switch (keysym) { + case 0xffb0 ... 0xffb9: /* KP_0 .. KP_9 */ + case 0xffac: /* KP_Separator */ + case 0xffae: /* KP_Decimal */ + return true; } - return 0; + return false; } --=20 2.9.3