From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eokwb-00089f-PH for qemu-devel@nongnu.org; Thu, 22 Feb 2018 02:05:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eokwX-00084j-RQ for qemu-devel@nongnu.org; Thu, 22 Feb 2018 02:05:29 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50252 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 1eokwX-000844-Fy for qemu-devel@nongnu.org; Thu, 22 Feb 2018 02:05:25 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5294040FB645 for ; Thu, 22 Feb 2018 07:05:22 +0000 (UTC) From: Gerd Hoffmann Date: Thu, 22 Feb 2018 08:05:12 +0100 Message-Id: <20180222070513.8740-5-kraxel@redhat.com> In-Reply-To: <20180222070513.8740-1-kraxel@redhat.com> References: <20180222070513.8740-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 4/5] keymap: record multiple keysym -> keycode mappings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Gerd Hoffmann Sometimes the same keysym can be created using different key combinations. Record them all in the reverse keymap, not only the first one. Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrang=C3=A9 --- ui/keymaps.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ui/keymaps.c b/ui/keymaps.c index cbdd65c767..1eba6d7057 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -29,7 +29,8 @@ #include "qemu/error-report.h" =20 struct keysym2code { - uint16_t keycode; + uint32_t count; + uint16_t keycodes[4]; }; =20 struct kbd_layout_t { @@ -62,11 +63,18 @@ static void add_keysym(char *line, int keysym, int ke= ycode, kbd_layout_t *k) =20 keysym2code =3D g_hash_table_lookup(k->hash, GINT_TO_POINTER(keysym)= ); if (keysym2code) { + if (keysym2code->count < ARRAY_SIZE(keysym2code->keycodes)) { + keysym2code->keycodes[keysym2code->count++] =3D keycode; + } else { + warn_report("more than %zd keycodes for keysym %d", + ARRAY_SIZE(keysym2code->keycodes), keysym); + } return; } =20 keysym2code =3D g_new0(struct keysym2code, 1); - keysym2code->keycode =3D keycode; + keysym2code->keycodes[0] =3D keycode; + keysym2code->count =3D 1; g_hash_table_replace(k->hash, GINT_TO_POINTER(keysym), keysym2code); trace_keymap_add(keysym, keycode, line); } @@ -185,7 +193,7 @@ int keysym2scancode(kbd_layout_t *k, int keysym) return 0; } =20 - return keysym2code->keycode; + return keysym2code->keycodes[0]; } =20 int keycode_is_keypad(kbd_layout_t *k, int keycode) --=20 2.9.3