mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-12 05:34:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: keymap_lookup: only do lookup, don't sent to client

Browse source
This commit is contained in:
Daniel Eklöf 2020-01-11 18:40:27 +01:00
parent 1472383c15
commit fed0e5c853
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
input.c
View file

@ -167,7 +167,7 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
} }
static const struct key_data * static const struct key_data *
keymap_data(xkb_keysym_t sym, size_t *count) keymap_data_for_sym(xkb_keysym_t sym, size_t *count)
{ {
#define ALEN(a) (sizeof(a) / sizeof(a[0])) #define ALEN(a) (sizeof(a) / sizeof(a[0]))
switch (sym) { switch (sym) {
@ -254,14 +254,14 @@ keymap_data(xkb_keysym_t sym, size_t *count)
return NULL; return NULL;
} }
static bool static const struct key_data *
keymap_lookup(struct terminal *term, xkb_keysym_t sym, enum modifier mods) keymap_lookup(struct terminal *term, xkb_keysym_t sym, enum modifier mods)
{ {
size_t count; size_t count;
const struct key_data *info = keymap_data(sym, &count); const struct key_data *info = keymap_data_for_sym(sym, &count);
if (info == NULL) if (info == NULL)
return false; return NULL;
for (size_t j = 0; j < count; j++) { for (size_t j = 0; j < count; j++) {
if (info[j].modifiers != MOD_ANY && info[j].modifiers != mods) if (info[j].modifiers != MOD_ANY && info[j].modifiers != mods)
@ -275,14 +275,10 @@ keymap_lookup(struct terminal *term, xkb_keysym_t sym, enum modifier mods)
info[j].keypad_keys_mode != term->keypad_keys_mode) info[j].keypad_keys_mode != term->keypad_keys_mode)
continue; continue;
term_to_slave(term, info[j].seq, strlen(info[j].seq)); return &info[j];
term_reset_view(term);
selection_cancel(term);
return true;
} }
return false; return NULL;
} }
static void static void
@ -408,9 +404,14 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
} }
} }
const struct key_data *keymap = keymap_lookup(term, sym, keymap_mods);
if (keymap != NULL) {
term_to_slave(term, keymap->seq, strlen(keymap->seq));
if (keymap_lookup(term, sym, keymap_mods)) term_reset_view(term);
selection_cancel(term);
goto maybe_repeat; goto maybe_repeat;
}
uint8_t buf[64] = {0}; uint8_t buf[64] = {0};
int count = 0; int count = 0;