aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/bar/tray_output.c
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-09-02 21:41:11 -0400
committerDrew DeVault <sir@cmpwn.com>2019-09-04 16:48:50 -1000
commit1fd2c6ba498e61f4fe823bf552f9d2fce8612de4 (patch)
tree8e2d9adab3451f1f05c76340d466a442c840e558 /sway/commands/bar/tray_output.c
parent187306640ba8f2ab2f246a5030617ee985cf9223 (diff)
swaybar: complete barconfig_update event handling
This adds complete support for the barconfig_update ipc event. This also changes the bar command and subcommand handlers to correctly emit the event. This makes it so all bar subcommands other than id and swaybar_command are dynamically changeable at runtime. sway-bar.5 has been updated accordingly
Diffstat (limited to 'sway/commands/bar/tray_output.c')
-rw-r--r--sway/commands/bar/tray_output.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c
index 8bfdf193..eb3b486e 100644
--- a/sway/commands/bar/tray_output.c
+++ b/sway/commands/bar/tray_output.c
@@ -24,9 +24,21 @@ struct cmd_results *bar_cmd_tray_output(int argc, char **argv) {
free(outputs->items[i]);
}
outputs->length = 0;
+ } else if (strcmp(argv[0], "*") == 0) {
+ sway_log(SWAY_DEBUG, "Showing tray on all outputs for bar: %s",
+ config->current_bar->id);
+ while (outputs->length) {
+ free(outputs->items[0]);
+ list_del(outputs, 0);
+ }
+ return cmd_results_new(CMD_SUCCESS, NULL);
} else {
sway_log(SWAY_DEBUG, "Showing tray on output '%s' for bar: %s", argv[0],
config->current_bar->id);
+ if (outputs->length == 1 && strcmp(outputs->items[0], "none") == 0) {
+ free(outputs->items[0]);
+ list_del(outputs, 0);
+ }
}
list_add(outputs, strdup(argv[0]));