aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-11-11 17:28:13 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-12-01 18:39:05 +0000
commit4f0d05724364dc5fa1def6b077bd32c65d1f77ba (patch)
tree12f4c96754b2e60db56fc8afe7d9352a4d73ae51
parentcsi: implement “CSI ? 1035” - toggle Num Lock override (diff)
input: track num lock state
-rw-r--r--input.c4
-rw-r--r--wayland.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/input.c b/input.c
index 51fef43a..4849d055 100644
--- a/input.c
+++ b/input.c
@@ -512,6 +512,7 @@ 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");
@@ -614,6 +615,7 @@ 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);
@@ -1029,6 +1031,8 @@ 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)
diff --git a/wayland.h b/wayland.h
index 70c2098a..149d7c00 100644
--- a/wayland.h
+++ b/wayland.h
@@ -148,6 +148,7 @@ 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;
@@ -157,6 +158,7 @@ struct seat {
bool alt;
bool ctrl;
bool meta;
+ bool num;
struct {
tll(struct key_binding_normal) key;