haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

keymap: use glib hash for kbd_layout_t

Browse source 
Drop home-grown lookup code, which is a strange mix of a lookup table
and a list.  Use standard glib hash instead.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20180222070513.8740-3-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-02-22 08:05:10 +01:00
parent fe5fca9a03
commit d713e3fd4c
2 changed files with 33 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
ui/keymaps.c
View file

@ -28,22 +28,18 @@
#include "trace.h" #include "trace.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#define MAX_NORMAL_KEYCODE 512
#define MAX_EXTRA_COUNT 256
struct key_range { struct key_range {
int start; int start;
int end; int end;
struct key_range *next; struct key_range *next;
}; };
struct keysym2code {
uint16_t keycode;
};
struct kbd_layout_t { struct kbd_layout_t {
uint16_t keysym2keycode[MAX_NORMAL_KEYCODE]; GHashTable *hash;
struct {
int keysym;
uint16_t keycode;
} keysym2keycode_extra[MAX_EXTRA_COUNT];
int extra_count;
struct key_range *keypad_range; struct key_range *keypad_range;
struct key_range *numlock_range; struct key_range *numlock_range;
}; };
@ -91,23 +87,19 @@ static void add_to_key_range(struct key_range **krp, int code) {
} }
} }
static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k) { static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k)
if (keysym < MAX_NORMAL_KEYCODE) { {
trace_keymap_add("normal", keysym, keycode, line); struct keysym2code *keysym2code;
k->keysym2keycode[keysym] = keycode;
} else { keysym2code = g_hash_table_lookup(k->hash, GINT_TO_POINTER(keysym));
if (k->extra_count >= MAX_EXTRA_COUNT) { if (keysym2code) {
warn_report("Could not assign keysym %s (0x%x)" return;
" because of memory constraints.", line, keysym);
} else {
trace_keymap_add("extra", keysym, keycode, line);
k->keysym2keycode_extra[k->extra_count].
keysym = keysym;
k->keysym2keycode_extra[k->extra_count].
keycode = keycode;
k->extra_count++;
}
} }
keysym2code = g_new0(struct keysym2code, 1);
keysym2code->keycode = keycode;
g_hash_table_replace(k->hash, GINT_TO_POINTER(keysym), keysym2code);
trace_keymap_add(keysym, keycode, line);
} }
static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
@ -131,6 +123,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
if (!k) { if (!k) {
k = g_new0(kbd_layout_t, 1); k = g_new0(kbd_layout_t, 1);
k->hash = g_hash_table_new(NULL, NULL);
} }
for(;;) { for(;;) {
@ -215,26 +208,22 @@ kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,
int keysym2scancode(kbd_layout_t *k, int keysym) int keysym2scancode(kbd_layout_t *k, int keysym)
{ {
if (keysym < MAX_NORMAL_KEYCODE) { struct keysym2code *keysym2code;
if (k->keysym2keycode[keysym] == 0) {
trace_keymap_unmapped(keysym);
warn_report("no scancode found for keysym %d", keysym);
}
return k->keysym2keycode[keysym];
} else {
int i;
#ifdef XK_ISO_Left_Tab #ifdef XK_ISO_Left_Tab
if (keysym == XK_ISO_Left_Tab) { if (keysym == XK_ISO_Left_Tab) {
keysym = XK_Tab; keysym = XK_Tab;
}
#endif
for (i = 0; i < k->extra_count; i++) {
if (k->keysym2keycode_extra[i].keysym == keysym) {
return k->keysym2keycode_extra[i].keycode;
}
}
} }
return 0; #endif
keysym2code = g_hash_table_lookup(k->hash, GINT_TO_POINTER(keysym));
if (!keysym2code) {
trace_keymap_unmapped(keysym);
warn_report("no scancode found for keysym %d", keysym);
return 0;
}
return keysym2code->keycode;
} }
int keycode_is_keypad(kbd_layout_t *k, int keycode) int keycode_is_keypad(kbd_layout_t *k, int keycode)

2
ui/trace-events
View file

@ -78,7 +78,7 @@ qemu_spice_create_update(uint32_t left, uint32_t right, uint32_t top, uint32_t b
# ui/keymaps.c # ui/keymaps.c
keymap_parse(const char *file) "file %s" keymap_parse(const char *file) "file %s"
keymap_add(const char *type, int sym, int code, const char *line) "%-6s sym=0x%04x code=0x%04x (line: %s)" keymap_add(int sym, int code, const char *line) "sym=0x%04x code=0x%04x (line: %s)"
keymap_unmapped(int sym) "sym=0x%04x" keymap_unmapped(int sym) "sym=0x%04x"
# ui/x_keymap.c # ui/x_keymap.c