diff options
Diffstat (limited to 'sway/commands/bind.c')
-rw-r--r-- | sway/commands/bind.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 5ec89982..0ddee742 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c | |||
@@ -72,7 +72,8 @@ static bool binding_key_compare(struct sway_binding *binding_a, | |||
72 | } | 72 | } |
73 | 73 | ||
74 | uint32_t conflict_generating_flags = BINDING_RELEASE | BINDING_BORDER | 74 | uint32_t conflict_generating_flags = BINDING_RELEASE | BINDING_BORDER |
75 | | BINDING_CONTENTS | BINDING_TITLEBAR | BINDING_LOCKED; | 75 | | BINDING_CONTENTS | BINDING_TITLEBAR | BINDING_LOCKED |
76 | | BINDING_INHIBITED; | ||
76 | if ((binding_a->flags & conflict_generating_flags) != | 77 | if ((binding_a->flags & conflict_generating_flags) != |
77 | (binding_b->flags & conflict_generating_flags)) { | 78 | (binding_b->flags & conflict_generating_flags)) { |
78 | return false; | 79 | return false; |
@@ -354,6 +355,8 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv, | |||
354 | binding->flags |= BINDING_RELEASE; | 355 | binding->flags |= BINDING_RELEASE; |
355 | } else if (strcmp("--locked", argv[0]) == 0) { | 356 | } else if (strcmp("--locked", argv[0]) == 0) { |
356 | binding->flags |= BINDING_LOCKED; | 357 | binding->flags |= BINDING_LOCKED; |
358 | } else if (strcmp("--inhibited", argv[0]) == 0) { | ||
359 | binding->flags |= BINDING_INHIBITED; | ||
357 | } else if (strcmp("--whole-window", argv[0]) == 0) { | 360 | } else if (strcmp("--whole-window", argv[0]) == 0) { |
358 | binding->flags |= BINDING_BORDER | BINDING_CONTENTS | BINDING_TITLEBAR; | 361 | binding->flags |= BINDING_BORDER | BINDING_CONTENTS | BINDING_TITLEBAR; |
359 | } else if (strcmp("--border", argv[0]) == 0) { | 362 | } else if (strcmp("--border", argv[0]) == 0) { |