aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/keyboard.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-02-06 22:00:29 -0500
committerLibravatar emersion <contact@emersion.fr>2019-02-08 16:02:45 +0100
commitf5190d1f797f5a9d0596ab6d31240a0e179ac457 (patch)
treea521cf249c3ab38807961cd538390c6a3ced9b82 /sway/input/keyboard.c
parentMerge pull request #3619 from swaywm/revert-3595-ErrorIfConfigNotExist (diff)
downloadsway-f5190d1f797f5a9d0596ab6d31240a0e179ac457.tar.gz
sway-f5190d1f797f5a9d0596ab6d31240a0e179ac457.tar.zst
sway-f5190d1f797f5a9d0596ab6d31240a0e179ac457.zip
bar_cmd_modifier: add support for none
sway-bar(5) documents `modifier none`, which comes from i3. This implements the functionality for `modifier none` since it was not previously implemented. The bar modifier toggles visibility of the bar when the bar mode is set to hide. When the bar modifier is set to `none`, the ability to toggle visibility of the bar will be disabled.
Diffstat (limited to 'sway/input/keyboard.c')
-rw-r--r--sway/input/keyboard.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 12c57366..efd27f70 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -425,7 +425,8 @@ static void determine_bar_visibility(uint32_t modifiers) {
425 for (int i = 0; i < config->bars->length; ++i) { 425 for (int i = 0; i < config->bars->length; ++i) {
426 struct bar_config *bar = config->bars->items[i]; 426 struct bar_config *bar = config->bars->items[i];
427 if (strcmp(bar->mode, bar->hidden_state) == 0) { // both are "hide" 427 if (strcmp(bar->mode, bar->hidden_state) == 0) { // both are "hide"
428 bool should_be_visible = (~modifiers & bar->modifier) == 0; 428 bool should_be_visible =
429 bar->modifier != 0 && (~modifiers & bar->modifier) == 0;
429 if (bar->visible_by_modifier != should_be_visible) { 430 if (bar->visible_by_modifier != should_be_visible) {
430 bar->visible_by_modifier = should_be_visible; 431 bar->visible_by_modifier = should_be_visible;
431 ipc_event_bar_state_update(bar); 432 ipc_event_bar_state_update(bar);