mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-27 02:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2172 from apreiml/fix-keybinding-modifier-handling

Browse source 
fix handling key modifiers if not pressed at first
This commit is contained in:
Drew DeVault 2018-06-28 16:16:31 -07:00 committed by GitHub
parent 92e81df470 1eede432fc
commit d3ea07f828
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/input/keyboard.c
View file

@ -64,12 +64,12 @@ static void update_shortcut_state(struct sway_shortcut_state *state,
bool last_key_was_a_modifier = raw_modifiers != state->last_raw_modifiers; bool last_key_was_a_modifier = raw_modifiers != state->last_raw_modifiers;
state->last_raw_modifiers = raw_modifiers; state->last_raw_modifiers = raw_modifiers;
if (event->state == WLR_KEY_PRESSED) {
if (last_key_was_a_modifier && state->last_keycode) { if (last_key_was_a_modifier && state->last_keycode) {
// Last pressed key before this one was a modifier // Last pressed key before this one was a modifier
state_erase_key(state, state->last_keycode); state_erase_key(state, state->last_keycode);
} }
if (event->state == WLR_KEY_PRESSED) {
// Add current key to set; there may be duplicates // Add current key to set; there may be duplicates
state_add_key(state, event->keycode, new_key); state_add_key(state, event->keycode, new_key);
state->last_keycode = event->keycode; state->last_keycode = event->keycode;