david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keymap: record multiple keysym -> keycode mappings

Browse Source 
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
This commit is contained in:
Gerd Hoffmann 2018-02-22 08:05:12 +01:00
parent 6b71ea1138
commit 23ad24e48c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/keymaps.c
View File

@ -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)