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

Style fix, redundant entry removal, fix extra keysym delete

Browse Source
This commit is contained in:
frsfnrrg 2018-06-01 18:40:51 -04:00
parent 480f0c593c
commit 78b7b46895
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sway/input/keyboard.c
View File

@ -17,9 +17,8 @@ static void update_shortcut_state(struct sway_shortcut_state *state,
bool last_key_was_a_modifier) { bool last_key_was_a_modifier) {
if (event->state == WLR_KEY_PRESSED) { if (event->state == WLR_KEY_PRESSED) {
if (last_key_was_a_modifier && state->last_key_index >= 0) { if (last_key_was_a_modifier && state->last_key_index >= 0) {
// Last pressed key before this one was a modifier. We nullify // Last pressed key before this one was a modifier
// the key id but not the keycode (as that is used for erasure state->pressed_keycodes[state->last_key_index] = 0;
// on release)
state->pressed_keys[state->last_key_index] = 0; state->pressed_keys[state->last_key_index] = 0;
state->last_key_index = -1; state->last_key_index = -1;
} }
@ -62,8 +61,8 @@ static struct sway_binding *get_active_binding(
struct sway_binding *binding = bindings->items[i]; struct sway_binding *binding = bindings->items[i];
if (modifiers ^ binding->modifiers || if (modifiers ^ binding->modifiers ||
npressed_keys != binding->keys->length || npressed_keys != binding->keys->length ||
locked > binding->locked) { locked > binding->locked) {
continue; continue;
} }
@ -219,12 +218,12 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
for (size_t i = 0; i < translated_keysyms_len; ++i) { for (size_t i = 0; i < translated_keysyms_len; ++i) {
update_shortcut_state(&keyboard->state_keysyms_translated, update_shortcut_state(&keyboard->state_keysyms_translated,
event, (uint32_t)translated_keysyms[i], event, (uint32_t)translated_keysyms[i],
last_key_was_a_modifier); last_key_was_a_modifier && i == 0);
} }
for (size_t i = 0; i < raw_keysyms_len; ++i) { for (size_t i = 0; i < raw_keysyms_len; ++i) {
update_shortcut_state(&keyboard->state_keysyms_raw, update_shortcut_state(&keyboard->state_keysyms_raw,
event, (uint32_t)raw_keysyms[i], event, (uint32_t)raw_keysyms[i],
last_key_was_a_modifier); last_key_was_a_modifier && i == 0);
} }
// identify which binding should be executed. // identify which binding should be executed.