diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-02-06 22:00:29 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-02-11 10:22:53 -0500 |
commit | 4339ba6424ddb41e16a4a0674ecdd0dabbf68ab4 (patch) | |
tree | a521cf249c3ab38807961cd538390c6a3ced9b82 /sway/commands/bar | |
parent | seat_configure_tablet_tool: configure xcursor (diff) | |
download | sway-4339ba6424ddb41e16a4a0674ecdd0dabbf68ab4.tar.gz sway-4339ba6424ddb41e16a4a0674ecdd0dabbf68ab4.tar.zst sway-4339ba6424ddb41e16a4a0674ecdd0dabbf68ab4.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/commands/bar')
-rw-r--r-- | sway/commands/bar/modifier.c | 29 |
1 files changed, 18 insertions, 11 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]); |