mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-11 04:27:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: break out keymap lookup to a separate function

Browse source
This commit is contained in:
Daniel Eklöf 2020-01-11 17:55:45 +01:00
parent b5bb571adf
commit 8efedc9655
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

60
input.c
View file

@ -166,6 +166,39 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
}
}
static bool
keymap_lookup(struct terminal *term, xkb_keysym_t sym, enum modifier mods)
{
for (size_t i = 0; i < sizeof(key_map) / sizeof(key_map[0]); i++) {
const struct key_map *k = &key_map[i];
if (k->sym != sym)
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 != mods)
continue;
if (info->cursor_keys_mode != CURSOR_KEYS_DONTCARE &&
info->cursor_keys_mode != term->cursor_keys_mode)
continue;
if (info->keypad_keys_mode != KEYPAD_DONTCARE &&
info->keypad_keys_mode != term->keypad_keys_mode)
continue;
term_to_slave(term, info->seq, strlen(info->seq));
term_reset_view(term);
selection_cancel(term);
return true;
}
}
return false;
}
static void
keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
uint32_t time, uint32_t key, uint32_t state)
@ -290,31 +323,8 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
}
for (size_t i = 0; i < sizeof(key_map) / sizeof(key_map[0]); i++) {
const struct key_map *k = &key_map[i];
if (k->sym != sym)
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 (info->cursor_keys_mode != CURSOR_KEYS_DONTCARE &&
info->cursor_keys_mode != term->cursor_keys_mode)
continue;
if (info->keypad_keys_mode != KEYPAD_DONTCARE &&
info->keypad_keys_mode != term->keypad_keys_mode)
continue;
term_to_slave(term, info->seq, strlen(info->seq));
term_reset_view(term);
selection_cancel(term);
goto maybe_repeat;
}
}
if (keymap_lookup(term, sym, keymap_mods))
goto maybe_repeat;
uint8_t buf[64] = {0};
int count = 0;