diff options
author | 2018-04-25 11:00:56 +0200 | |
---|---|---|
committer | 2018-04-25 11:00:56 +0200 | |
commit | c54097428a8f36e456d203d986d76702bd339066 (patch) | |
tree | ec248905f4c73d8f52c3e2c08ce26decbda2d704 /swaylock/seat.c | |
parent | Update wording about unmanaged/unmapped views (diff) | |
parent | Merge pull request #1861 from emersion/swaybar-memory-leaks (diff) | |
download | sway-c54097428a8f36e456d203d986d76702bd339066.tar.gz sway-c54097428a8f36e456d203d986d76702bd339066.tar.zst sway-c54097428a8f36e456d203d986d76702bd339066.zip |
Merge branch 'master' into criteria-commands
Diffstat (limited to 'swaylock/seat.c')
-rw-r--r-- | swaylock/seat.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/swaylock/seat.c b/swaylock/seat.c index 21db7c4f..a81899a6 100644 --- a/swaylock/seat.c +++ b/swaylock/seat.c | |||
@@ -88,6 +88,7 @@ static void keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard, | |||
88 | xkb_mod_mask_t mask = xkb_state_serialize_mods(state->xkb.state, | 88 | xkb_mod_mask_t mask = xkb_state_serialize_mods(state->xkb.state, |
89 | XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED); | 89 | XKB_STATE_MODS_DEPRESSED | XKB_STATE_MODS_LATCHED); |
90 | state->xkb.modifiers = 0; | 90 | state->xkb.modifiers = 0; |
91 | state->xkb.caps_lock = xkb_state_mod_name_is_active(state->xkb.state, XKB_MOD_NAME_CAPS, XKB_STATE_MODS_LOCKED); | ||
91 | for (uint32_t i = 0; i < MASK_LAST; ++i) { | 92 | for (uint32_t i = 0; i < MASK_LAST; ++i) { |
92 | if (mask & state->xkb.masks[i]) { | 93 | if (mask & state->xkb.masks[i]) { |
93 | state->xkb.modifiers |= XKB_MODS[i]; | 94 | state->xkb.modifiers |= XKB_MODS[i]; |