aboutsummaryrefslogtreecommitdiffstats
path: root/swaylock/seat.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2019-01-05 23:45:38 -0500
committerLibravatar GitHub <noreply@github.com>2019-01-05 23:45:38 -0500
commit728e5700dd59f392712d51866eff78ed5074d8ef (patch)
treef92e1eb17dd10ed186ce62619c4c7ce3b570ac32 /swaylock/seat.c
parentFix urgency documentation (diff)
parentswaylock: Fix caps lock not updating immediately (diff)
downloadsway-728e5700dd59f392712d51866eff78ed5074d8ef.tar.gz
sway-728e5700dd59f392712d51866eff78ed5074d8ef.tar.zst
sway-728e5700dd59f392712d51866eff78ed5074d8ef.zip
Merge pull request #3367 from oscarwcl/swaylock-fix-capslock
swaylock: Fix caps lock not updating immediately
Diffstat (limited to 'swaylock/seat.c')
-rw-r--r--swaylock/seat.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/swaylock/seat.c b/swaylock/seat.c
index 7b72114f..f0b1385e 100644
--- a/swaylock/seat.c
+++ b/swaylock/seat.c
@@ -63,8 +63,12 @@ static void keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard,
63 struct swaylock_state *state = data; 63 struct swaylock_state *state = data;
64 xkb_state_update_mask(state->xkb.state, 64 xkb_state_update_mask(state->xkb.state,
65 mods_depressed, mods_latched, mods_locked, 0, 0, group); 65 mods_depressed, mods_latched, mods_locked, 0, 0, group);
66 state->xkb.caps_lock = xkb_state_mod_name_is_active(state->xkb.state, 66 int caps_lock = xkb_state_mod_name_is_active(state->xkb.state,
67 XKB_MOD_NAME_CAPS, XKB_STATE_MODS_LOCKED); 67 XKB_MOD_NAME_CAPS, XKB_STATE_MODS_LOCKED);
68 if (caps_lock != state->xkb.caps_lock) {
69 state->xkb.caps_lock = caps_lock;
70 damage_state(state);
71 }
68 state->xkb.control = xkb_state_mod_name_is_active(state->xkb.state, 72 state->xkb.control = xkb_state_mod_name_is_active(state->xkb.state,
69 XKB_MOD_NAME_CTRL, 73 XKB_MOD_NAME_CTRL,
70 XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED); 74 XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED);