diff options
-rw-r--r-- | sway/commands/bar/modifier.c | 29 | ||||
-rw-r--r-- | sway/input/keyboard.c | 3 |
2 files changed, 20 insertions, 12 deletions
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c index c95250d1..d25d01d4 100644 --- a/sway/commands/bar/modifier.c +++ b/sway/commands/bar/modifier.c | |||
@@ -15,19 +15,26 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | uint32_t mod = 0; | 17 | uint32_t mod = 0; |
18 | list_t *split = split_string(argv[0], "+"); | 18 | if (strcmp(argv[0], "none") != 0) { |
19 | for (int i = 0; i < split->length; ++i) { | 19 | list_t *split = split_string(argv[0], "+"); |
20 | uint32_t tmp_mod; | 20 | for (int i = 0; i < split->length; ++i) { |
21 | if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) { | 21 | uint32_t tmp_mod; |
22 | mod |= tmp_mod; | 22 | if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) { |
23 | } else { | 23 | mod |= tmp_mod; |
24 | error = cmd_results_new(CMD_INVALID, | 24 | } else if (strcmp(split->items[i], "none") == 0) { |
25 | "Unknown modifier '%s'", (char *)split->items[i]); | 25 | error = cmd_results_new(CMD_INVALID, |
26 | list_free_items_and_destroy(split); | 26 | "none cannot be used along with other modifiers"); |
27 | return error; | 27 | list_free_items_and_destroy(split); |
28 | return error; | ||
29 | } else { | ||
30 | error = cmd_results_new(CMD_INVALID, | ||
31 | "Unknown modifier '%s'", (char *)split->items[i]); | ||
32 | list_free_items_and_destroy(split); | ||
33 | return error; | ||
34 | } | ||
28 | } | 35 | } |
36 | list_free_items_and_destroy(split); | ||
29 | } | 37 | } |
30 | list_free_items_and_destroy(split); | ||
31 | config->current_bar->modifier = mod; | 38 | config->current_bar->modifier = mod; |
32 | sway_log(SWAY_DEBUG, | 39 | sway_log(SWAY_DEBUG, |
33 | "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); | 40 | "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); |
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); |