From cb8c2cdb3506f726bae7089e548791c9aae80e1e Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 9 Jul 2019 15:05:07 +0200 Subject: input: split up keymap This makes the top level table smaller, and faster to search through. Eventually, we could do something fancy, like b-search the top level table. --- input.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index 5663d950..4ac45bbe 100644 --- a/input.c +++ b/input.c @@ -140,25 +140,28 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, keymap_mods |= term->kbd.alt ? MOD_ALT : MOD_NONE; keymap_mods |= term->kbd.ctrl ? MOD_CTRL : MOD_NONE; - for (size_t i = 0; i < sizeof(key_map) / sizeof(key_map[0]); i++) { + for (size_t i = 0; i < sizeof(key_map) / sizeof(key_map[0]) && !found_map; i++) { const struct key_map *k = &key_map[i]; if (k->sym != sym) continue; - if (k->modifiers != MOD_ANY && k->modifiers != keymap_mods) - continue; + for (size_t j = 0; j < k->count; j++) { + const struct key_data *info = &k->data[j]; + if (info->modifiers != MOD_ANY && info->modifiers != keymap_mods) + continue; - if (k->cursor_keys_mode != CURSOR_KEYS_DONTCARE && - k->cursor_keys_mode != term->cursor_keys_mode) - continue; + if (info->cursor_keys_mode != CURSOR_KEYS_DONTCARE && + info->cursor_keys_mode != term->cursor_keys_mode) + continue; - if (k->keypad_keys_mode != KEYPAD_DONTCARE && - k->keypad_keys_mode != term->keypad_keys_mode) - continue; + if (info->keypad_keys_mode != KEYPAD_DONTCARE && + info->keypad_keys_mode != term->keypad_keys_mode) + continue; - write(term->ptmx, k->seq, strlen(k->seq)); - found_map = true; - break; + write(term->ptmx, info->seq, strlen(info->seq)); + found_map = true; + break; + } } if (!found_map) { -- cgit v1.3