From 00745d6280d36b57e661f9de7af84c93fde60efa Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Tue, 9 Oct 2018 13:41:12 -0400 Subject: [PATCH 1/4] Fix bar subcommand handler structs and selection --- include/sway/config.h | 2 ++ sway/commands/bar.c | 40 ++++++++++++++++++++++++---------------- sway/config/bar.c | 14 +++++++++----- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/include/sway/config.h b/include/sway/config.h index bc02c0fd1..2396e9efd 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -531,6 +531,8 @@ void free_sway_binding(struct sway_binding *sb); void seat_execute_command(struct sway_seat *seat, struct sway_binding *binding); +void load_swaybar(struct bar_config *bar); + void load_swaybars(void); void terminate_swaybg(pid_t pid); diff --git a/sway/commands/bar.c b/sway/commands/bar.c index 03f4c5574..49a94104e 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c @@ -17,7 +17,6 @@ static struct cmd_handler bar_handlers[] = { { "height", bar_cmd_height }, { "hidden_state", bar_cmd_hidden_state }, { "icon_theme", bar_cmd_icon_theme }, - { "id", bar_cmd_id }, { "mode", bar_cmd_mode }, { "modifier", bar_cmd_modifier }, { "output", bar_cmd_output }, @@ -27,7 +26,6 @@ static struct cmd_handler bar_handlers[] = { { "separator_symbol", bar_cmd_separator_symbol }, { "status_command", bar_cmd_status_command }, { "strip_workspace_numbers", bar_cmd_strip_workspace_numbers }, - { "swaybar_command", bar_cmd_swaybar_command }, { "tray_output", bar_cmd_tray_output }, { "tray_padding", bar_cmd_tray_padding }, { "workspace_buttons", bar_cmd_workspace_buttons }, @@ -36,8 +34,8 @@ static struct cmd_handler bar_handlers[] = { // Must be in alphabetical order for bsearch static struct cmd_handler bar_config_handlers[] = { - { "hidden_state", bar_cmd_hidden_state }, - { "mode", bar_cmd_mode } + { "id", bar_cmd_id }, + { "swaybar_command", bar_cmd_swaybar_command }, }; struct cmd_results *cmd_bar(int argc, char **argv) { @@ -46,16 +44,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) { return error; } - if (find_handler(argv[0], bar_config_handlers, - sizeof(bar_config_handlers))) { - if (config->reading) { - return config_subcommand(argv, argc, bar_config_handlers, - sizeof(bar_config_handlers)); - } - return cmd_results_new(CMD_FAILURE, "bar", - "Can only be used in config file."); - } - + bool spawn = false; if (argc > 1) { struct bar_config *bar = NULL; if (!find_handler(argv[0], bar_handlers, sizeof(bar_handlers)) @@ -69,6 +58,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) { } } if (!bar) { + spawn = !config->reading; wlr_log(WLR_DEBUG, "Creating bar: %s", argv[0]); bar = default_bar_config(); if (!bar) { @@ -83,7 +73,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) { } } - if (!config->current_bar) { + if (!config->current_bar && config->reading) { // Create new bar with default values struct bar_config *bar = default_bar_config(); if (!bar) { @@ -111,5 +101,23 @@ struct cmd_results *cmd_bar(int argc, char **argv) { wlr_log(WLR_DEBUG, "Creating bar %s", bar->id); } - return config_subcommand(argv, argc, bar_handlers, sizeof(bar_handlers)); + if (find_handler(argv[0], bar_config_handlers, + sizeof(bar_config_handlers))) { + if (config->reading) { + return config_subcommand(argv, argc, bar_config_handlers, + sizeof(bar_config_handlers)); + } + return cmd_results_new(CMD_INVALID, "bar", + "Can only be used in the config file."); + } + + struct cmd_results *res = + config_subcommand(argv, argc, bar_handlers, sizeof(bar_handlers)); + if (!config->reading) { + if (spawn) { + load_swaybar(config->current_bar); + } + config->current_bar = NULL; + } + return res; } diff --git a/sway/config/bar.c b/sway/config/bar.c index c6899f577..5726e95b6 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c @@ -226,13 +226,17 @@ static void invoke_swaybar(struct bar_config *bar) { close(filedes[1]); } +void load_swaybar(struct bar_config *bar) { + if (bar->pid != 0) { + terminate_swaybar(bar->pid); + } + wlr_log(WLR_DEBUG, "Invoking swaybar for bar id '%s'", bar->id); + invoke_swaybar(bar); +} + void load_swaybars(void) { for (int i = 0; i < config->bars->length; ++i) { struct bar_config *bar = config->bars->items[i]; - if (bar->pid != 0) { - terminate_swaybar(bar->pid); - } - wlr_log(WLR_DEBUG, "Invoking swaybar for bar id '%s'", bar->id); - invoke_swaybar(bar); + load_swaybar(bar); } } From 2340b14eba4b0845394c776a056765f10af1e5c2 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Tue, 9 Oct 2018 18:37:53 -0400 Subject: [PATCH 2/4] bar_cmd_status_command: only reload current bar Ideally, this will be replaced with an IPC barconfig_update event in the near future --- sway/commands/bar/status_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sway/commands/bar/status_command.c b/sway/commands/bar/status_command.c index 5b4fdc87d..490393f17 100644 --- a/sway/commands/bar/status_command.c +++ b/sway/commands/bar/status_command.c @@ -25,7 +25,7 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) { } if (config->active && !config->validating) { - load_swaybars(); + load_swaybar(config->current_bar); } return cmd_results_new(CMD_SUCCESS, NULL, NULL); From 84b28dc5937e156db27df50854f93a7cfad82387 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 10 Oct 2018 10:49:34 -0400 Subject: [PATCH 3/4] cmd_bar: fix bar id issues Allows bar-subcommand to be a valid bar-ids Destroys runtime created bar if trying to use a config only subcommand Allow subcommands (except for id) to be ids --- sway/commands/bar.c | 19 +++++++++++++++++-- sway/commands/bar/id.c | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sway/commands/bar.c b/sway/commands/bar.c index 49a94104e..8d118fb69 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c @@ -38,6 +38,12 @@ static struct cmd_handler bar_config_handlers[] = { { "swaybar_command", bar_cmd_swaybar_command }, }; +// Determines whether the subcommand is valid in any bar handler struct +static bool is_subcommand(char *name) { + return find_handler(name, bar_handlers, sizeof(bar_handlers)) || + find_handler(name, bar_config_handlers, sizeof(bar_config_handlers)); +} + struct cmd_results *cmd_bar(int argc, char **argv) { struct cmd_results *error = NULL; if ((error = checkarg(argc, "bar", EXPECTED_AT_LEAST, 1))) { @@ -47,8 +53,8 @@ struct cmd_results *cmd_bar(int argc, char **argv) { bool spawn = false; if (argc > 1) { struct bar_config *bar = NULL; - if (!find_handler(argv[0], bar_handlers, sizeof(bar_handlers)) - && find_handler(argv[1], bar_handlers, sizeof(bar_handlers))) { + if (!is_subcommand(argv[0]) || + (strcmp(argv[0], "id") != 0 && is_subcommand(argv[1]))) { for (int i = 0; i < config->bars->length; ++i) { struct bar_config *item = config->bars->items[i]; if (strcmp(item->id, argv[0]) == 0) { @@ -106,6 +112,15 @@ struct cmd_results *cmd_bar(int argc, char **argv) { if (config->reading) { return config_subcommand(argv, argc, bar_config_handlers, sizeof(bar_config_handlers)); + } else if (spawn) { + for (int i = config->bars->length - 1; i >= 0; i--) { + struct bar_config *bar = config->bars->items[i]; + if (bar == config->current_bar) { + list_del(config->bars, i); + free_bar_config(bar); + break; + } + } } return cmd_results_new(CMD_INVALID, "bar", "Can only be used in the config file."); diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c index 65fa69fda..7690a852e 100644 --- a/sway/commands/bar/id.c +++ b/sway/commands/bar/id.c @@ -13,6 +13,8 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) { const char *oldname = config->current_bar->id; if (strcmp(name, oldname) == 0) { return cmd_results_new(CMD_SUCCESS, NULL, NULL); // NOP + } else if (strcmp(name, "id") == 0) { + return cmd_results_new(CMD_INVALID, "id", "id cannot be 'id'"); } // check if id is used by a previously defined bar for (int i = 0; i < config->bars->length; ++i) { From 2a0c7ebd43a82197754586de32deb3cdbbfa3cd9 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Fri, 12 Oct 2018 21:53:40 -0400 Subject: [PATCH 4/4] cmd_bar: simplify logic --- sway/commands/bar.c | 66 ++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/sway/commands/bar.c b/sway/commands/bar.c index 8d118fb69..c808aef24 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c @@ -46,37 +46,34 @@ static bool is_subcommand(char *name) { struct cmd_results *cmd_bar(int argc, char **argv) { struct cmd_results *error = NULL; - if ((error = checkarg(argc, "bar", EXPECTED_AT_LEAST, 1))) { + if ((error = checkarg(argc, "bar", EXPECTED_AT_LEAST, 2))) { return error; } bool spawn = false; - if (argc > 1) { - struct bar_config *bar = NULL; - if (!is_subcommand(argv[0]) || - (strcmp(argv[0], "id") != 0 && is_subcommand(argv[1]))) { - for (int i = 0; i < config->bars->length; ++i) { - struct bar_config *item = config->bars->items[i]; - if (strcmp(item->id, argv[0]) == 0) { - wlr_log(WLR_DEBUG, "Selecting bar: %s", argv[0]); - bar = item; - break; - } + struct bar_config *bar = NULL; + if (strcmp(argv[0], "id") != 0 && is_subcommand(argv[1])) { + for (int i = 0; i < config->bars->length; ++i) { + struct bar_config *item = config->bars->items[i]; + if (strcmp(item->id, argv[0]) == 0) { + wlr_log(WLR_DEBUG, "Selecting bar: %s", argv[0]); + bar = item; + break; } - if (!bar) { - spawn = !config->reading; - wlr_log(WLR_DEBUG, "Creating bar: %s", argv[0]); - bar = default_bar_config(); - if (!bar) { - return cmd_results_new(CMD_FAILURE, "bar", - "Unable to allocate bar state"); - } - - bar->id = strdup(argv[0]); - } - config->current_bar = bar; - ++argv; --argc; } + if (!bar) { + spawn = !config->reading; + wlr_log(WLR_DEBUG, "Creating bar: %s", argv[0]); + bar = default_bar_config(); + if (!bar) { + return cmd_results_new(CMD_FAILURE, "bar", + "Unable to allocate bar state"); + } + + bar->id = strdup(argv[0]); + } + config->current_bar = bar; + ++argv; --argc; } if (!config->current_bar && config->reading) { @@ -88,18 +85,13 @@ struct cmd_results *cmd_bar(int argc, char **argv) { } // set bar id - for (int i = 0; i < config->bars->length; ++i) { - if (bar == config->bars->items[i]) { - const int len = 5 + numlen(i); // "bar-" + i + \0 - bar->id = malloc(len * sizeof(char)); - if (bar->id) { - snprintf(bar->id, len, "bar-%d", i); - } else { - return cmd_results_new(CMD_FAILURE, - "bar", "Unable to allocate bar ID"); - } - break; - } + const int len = 5 + numlen(config->bars->length - 1); // "bar-"+i+\0 + bar->id = malloc(len * sizeof(char)); + if (bar->id) { + snprintf(bar->id, len, "bar-%d", config->bars->length - 1); + } else { + return cmd_results_new(CMD_FAILURE, + "bar", "Unable to allocate bar ID"); } // Set current bar