aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/bar
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-02-06 22:00:29 -0500
committeremersion <contact@emersion.fr>2019-02-08 16:02:45 +0100
commitf5190d1f797f5a9d0596ab6d31240a0e179ac457 (patch)
treea521cf249c3ab38807961cd538390c6a3ced9b82 /sway/commands/bar
parentf00fbe6861bad18fc0615be8fe5ba0102c609067 (diff)
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.c29
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) {
}
uint32_t mod = 0;
- list_t *split = split_string(argv[0], "+");
- for (int i = 0; i < split->length; ++i) {
- uint32_t tmp_mod;
- if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) {
- mod |= tmp_mod;
- } else {
- error = cmd_results_new(CMD_INVALID,
- "Unknown modifier '%s'", (char *)split->items[i]);
- list_free_items_and_destroy(split);
- return error;
+ if (strcmp(argv[0], "none") != 0) {
+ list_t *split = split_string(argv[0], "+");
+ for (int i = 0; i < split->length; ++i) {
+ uint32_t tmp_mod;
+ if ((tmp_mod = get_modifier_mask_by_name(split->items[i])) > 0) {
+ mod |= tmp_mod;
+ } else if (strcmp(split->items[i], "none") == 0) {
+ error = cmd_results_new(CMD_INVALID,
+ "none cannot be used along with other modifiers");
+ list_free_items_and_destroy(split);
+ return error;
+ } else {
+ error = cmd_results_new(CMD_INVALID,
+ "Unknown modifier '%s'", (char *)split->items[i]);
+ list_free_items_and_destroy(split);
+ return error;
+ }
}
+ list_free_items_and_destroy(split);
}
- list_free_items_and_destroy(split);
config->current_bar->modifier = mod;
sway_log(SWAY_DEBUG,
"Show/Hide the bar when pressing '%s' in hide mode.", argv[0]);