Received: from eggs.gnu.org ([2001:4830:134:3::10]:45573) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emhFZ-0000M5-M9 for qemu-devel@nongnu.org; Fri, 16 Feb 2018 09:44:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emhFW-0003lJ-JH for qemu-devel@nongnu.org; Fri, 16 Feb 2018 09:44:33 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37300 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 1emhFW-0003l2-EW for qemu-devel@nongnu.org; Fri, 16 Feb 2018 09:44:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 82607407519B for ; Fri, 16 Feb 2018 14:44:25 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 16 Feb 2018 15:44:17 +0100 Message-Id: <20180216144418.21986-5-kraxel@redhat.com> In-Reply-To: <20180216144418.21986-1-kraxel@redhat.com> References: <20180216144418.21986-1-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 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: 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 --- ui/keymaps.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ui/keymaps.c b/ui/keymaps.c index 4dd92edc7d..d22b3555dd 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -29,7 +29,8 @@ #include "qemu/error-report.h" struct keysym2code { - uint16_t keycode; + uint32_t count; + uint16_t keycodes[4]; }; struct kbd_layout_t { @@ -67,11 +68,19 @@ static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k) struct keysym2code *keysym2code; keysym2code = g_hash_table_lookup(k->hash, hashkey(keysym)); - if (keysym2code) + if (keysym2code) { + if (keysym2code->count < ARRAY_SIZE(keysym2code->keycodes)) { + keysym2code->keycodes[keysym2code->count++] = keycode; + } else { + warn_report("more than %zd keycodes for keysym %d", + ARRAY_SIZE(keysym2code->keycodes), keysym); + } return; + } keysym2code = g_new0(struct keysym2code, 1); - keysym2code->keycode = keycode; + keysym2code->keycodes[0] = keycode; + keysym2code->count = 1; g_hash_table_replace(k->hash, hashkey(keysym), keysym2code); trace_keymap_add(keysym, keycode, line); } @@ -189,7 +198,7 @@ int keysym2scancode(kbd_layout_t *k, int keysym) return 0; } - return keysym2code->keycode; + return keysym2code->keycodes[0]; } int keycode_is_keypad(kbd_layout_t *k, int keycode) -- 2.9.3