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 | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/ui/keymaps.c b/ui/keymaps.c
index d71ae389e0..26a85ff207 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 {
@@ -68,11 +69,18 @@ static void add_keysym(char *line, int keysym, int keycode,
kbd_layout_t *k)
keysym2code = g_hash_table_lookup(k->hash, hashkey(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, hashkey(keysym), keysym2code);
trace_keymap_add(keysym, keycode, line);
}
@@ -191,7 +199,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
