diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-12-01 17:27:56 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-12-01 18:47:16 +0000 |
| commit | f6aa1495d7b0fea56f8c7d96ba119b1ce6ab15ee (patch) | |
| tree | 38003f978313a14bf0fbeee6ef478e12524afeb9 | |
| parent | keymap: add ‘CSI 27;<mod>;27~’ escapes for Esc with modifiers (diff) | |
input: relax requirements for overriding keypad application mode
Don’t require NumLock to be locked. Foot has no idea _which_ modifier
the user has mapped NumLock to, meaning we really cannot require it to
be locked.
| -rw-r--r-- | input.c | 8 | ||||
| -rw-r--r-- | wayland.h | 2 |
2 files changed, 1 insertions, 9 deletions
@@ -512,7 +512,6 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard, seat->kbd.mod_alt = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_ALT) ; seat->kbd.mod_ctrl = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_CTRL); seat->kbd.mod_meta = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_LOGO); - seat->kbd.mod_num = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, XKB_MOD_NAME_NUM); seat->kbd.key_arrow_up = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "UP"); seat->kbd.key_arrow_down = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "DOWN"); @@ -615,7 +614,6 @@ keyboard_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, seat->kbd.alt = false; seat->kbd.ctrl = false; seat->kbd.meta = false; - seat->kbd.num = false; if (seat->kbd.xkb_compose_state != NULL) xkb_compose_state_reset(seat->kbd.xkb_compose_state); @@ -734,9 +732,7 @@ keymap_lookup(struct seat *seat, struct terminal *term, const enum cursor_keys cursor_keys_mode = term->cursor_keys_mode; const enum keypad_keys keypad_keys_mode - = (term->num_lock_modifier && seat->kbd.num - ? KEYPAD_NUMERICAL - : term->keypad_keys_mode); + = term->num_lock_modifier ? KEYPAD_NUMERICAL : term->keypad_keys_mode; for (size_t j = 0; j < count; j++) { if (info[j].modifiers != MOD_ANY && info[j].modifiers != mods) @@ -1038,8 +1034,6 @@ keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, seat->kbd.xkb_state, seat->kbd.mod_ctrl, XKB_STATE_MODS_DEPRESSED); seat->kbd.meta = xkb_state_mod_index_is_active( seat->kbd.xkb_state, seat->kbd.mod_meta, XKB_STATE_MODS_DEPRESSED); - seat->kbd.num = xkb_state_mod_index_is_active( - seat->kbd.xkb_state, seat->kbd.mod_num, XKB_STATE_MODS_LOCKED); } if (seat->kbd_focus && seat->kbd_focus->active_surface == TERM_SURF_GRID) @@ -148,7 +148,6 @@ struct seat { xkb_mod_index_t mod_alt; xkb_mod_index_t mod_ctrl; xkb_mod_index_t mod_meta; - xkb_mod_index_t mod_num; xkb_keycode_t key_arrow_up; xkb_keycode_t key_arrow_down; @@ -158,7 +157,6 @@ struct seat { bool alt; bool ctrl; bool meta; - bool num; struct { tll(struct key_binding_normal) key; |
