mirror/ sway
1
1
Fork 0
mirror of https://github.com/swaywm/sway synced 2024-06-02 19:06:26 +02:00
Code Issues

Merge 2b5d8a0978 into 646019cad9

This commit is contained in:
Keith 2024-04-26 17:58:52 +02:00 committed by GitHub
parent 646019cad9 2b5d8a0978
commit 78ce24a701
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sway/input/keyboard.c
View File

@ -163,7 +163,7 @@ static void get_active_binding(const struct sway_shortcut_state *state,
bool binding_inhibited = (binding->flags & BINDING_INHIBITED) != 0; bool binding_inhibited = (binding->flags & BINDING_INHIBITED) != 0;
bool binding_release = binding->flags & BINDING_RELEASE; bool binding_release = binding->flags & BINDING_RELEASE;
if (modifiers ^ binding->modifiers || if ((modifiers ^ binding->modifiers && !release) ||
release != binding_release || release != binding_release ||
locked > binding_locked || locked > binding_locked ||
inhibited > binding_inhibited || inhibited > binding_inhibited ||

2
sway/input/seatop_default.c
View File

@ -131,7 +131,7 @@ static struct sway_binding* get_active_mouse_binding(
struct sway_binding *current = NULL; struct sway_binding *current = NULL;
for (int i = 0; i < bindings->length; ++i) { for (int i = 0; i < bindings->length; ++i) {
struct sway_binding *binding = bindings->items[i]; struct sway_binding *binding = bindings->items[i];
if (modifiers ^ binding->modifiers || if ((modifiers ^ binding->modifiers && !release) ||
e->pressed_button_count != (size_t)binding->keys->length || e->pressed_button_count != (size_t)binding->keys->length ||
release != (binding->flags & BINDING_RELEASE) || release != (binding->flags & BINDING_RELEASE) ||
!(click_region & binding->flags) || !(click_region & binding->flags) ||