diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-02-22 08:05:12 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-02-22 10:35:26 +0100 |
| commit | 23ad24e48cf28ac2542ade657efbf7f802d7c8a0 (patch) | |
| tree | ef3ff5c361051debc25a3e2b4c1b08384b06dfee /ui/keymaps.c | |
| parent | 6b71ea1138307a0fbc0273df8866ca9879b7ba4c (diff) | |
keymap: record multiple keysym -> keycode mappings
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 <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20180222070513.8740-5-kraxel@redhat.com
Diffstat (limited to 'ui/keymaps.c')
| -rw-r--r-- | ui/keymaps.c | 14 |
1 files 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" struct keysym2code { - uint16_t keycode; + uint32_t count; + uint16_t keycodes[4]; }; struct kbd_layout_t { @@ -62,11 +63,18 @@ static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k) keysym2code = g_hash_table_lookup(k->hash, GINT_TO_POINTER(keysym)); 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, 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; } - return keysym2code->keycode; + return keysym2code->keycodes[0]; } int keycode_is_keypad(kbd_layout_t *k, int keycode) |