diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-05-26 07:15:13 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-05-26 07:15:13 +0000 |
| commit | e7fbded48f55d2606e1bdc51f3f31844d4e9c5bd (patch) | |
| tree | 19dc7a6cd1919b14234c5d1db7f66113a4786959 /input.c | |
| parent | pkgbuild: bump fcft requirement to 2.4.0 (diff) | |
| parent | macros: add UNITTEST macro and use to replace test_keymap_lookup() (diff) | |
Merge branch 'fix-iso-left-tab'
Closes #547
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -852,8 +852,7 @@ keymap_data_for_sym(xkb_keysym_t sym, size_t *count) } static const struct key_data * -keymap_lookup(struct seat *seat, 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; const struct key_data *info = keymap_data_for_sym(sym, &count); @@ -885,6 +884,18 @@ keymap_lookup(struct seat *seat, struct terminal *term, return NULL; } +UNITTEST +{ + struct terminal term = { + .num_lock_modifier = false, + .keypad_keys_mode = KEYPAD_NUMERICAL, + .cursor_keys_mode = CURSOR_KEYS_NORMAL, + }; + + const struct key_data *info = keymap_lookup(&term, XKB_KEY_ISO_Left_Tab, MOD_SHIFT | MOD_CTRL); + xassert(strcmp(info->seq, "\033[27;6;9~") == 0); +} + static void key_press_release(struct seat *seat, struct terminal *term, uint32_t serial, uint32_t key, uint32_t state) @@ -1036,7 +1047,7 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial, static const struct key_data esc = {.seq = "\033[27;1;27~"}; keymap = &esc; } else - keymap = keymap_lookup(seat, term, sym, keymap_mods); + keymap = keymap_lookup(term, sym, keymap_mods); if (keymap != NULL) { term_to_slave(term, keymap->seq, strlen(keymap->seq)); |
