From bad4e22f3be658f8688f308e54a48b65c071a952 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Tue, 23 Feb 2016 14:25:09 +0100 Subject: Make sway spawn only one bar per bar config --- include/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h index 655d0a9c..0b19580c 100644 --- a/include/config.h +++ b/include/config.h @@ -125,6 +125,7 @@ struct bar_config { bool strip_workspace_numbers; bool binding_mode_indicator; bool verbose; + pid_t pid; struct { char background[10]; char statusline[10]; @@ -226,8 +227,7 @@ int sway_mouse_binding_cmp_qsort(const void *a, const void *b); int sway_mouse_binding_cmp_buttons(const void *a, const void *b); void free_sway_mouse_binding(struct sway_mouse_binding *smb); -void load_swaybars(swayc_t *output, int output_idx); -void terminate_swaybars(list_t *pids); +void load_swaybars(swayc_t *output); void terminate_swaybg(pid_t pid); /** -- cgit v1.2.3 From e15a8a03769736f588f68ae5e1cc24611ed334ae Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Wed, 24 Feb 2016 18:52:57 +0100 Subject: Improve how swaybars are spawned --- include/config.h | 2 +- sway/commands.c | 9 +-------- sway/config.c | 23 ++++++++++++++++++----- 3 files changed, 20 insertions(+), 14 deletions(-) (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h index 0b19580c..8907e019 100644 --- a/include/config.h +++ b/include/config.h @@ -227,7 +227,7 @@ int sway_mouse_binding_cmp_qsort(const void *a, const void *b); int sway_mouse_binding_cmp_buttons(const void *a, const void *b); void free_sway_mouse_binding(struct sway_mouse_binding *smb); -void load_swaybars(swayc_t *output); +void load_swaybars(); void terminate_swaybg(pid_t pid); /** diff --git a/sway/commands.c b/sway/commands.c index 548b7d9f..3b8556ca 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -1526,14 +1526,7 @@ static struct cmd_results *cmd_reload(int argc, char **argv) { } if (!load_config(NULL)) return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config."); - int i; - swayc_t *cont = NULL; - for (i = 0; i < root_container.children->length; ++i) { - cont = root_container.children->items[i]; - if (cont->type == C_OUTPUT) { - load_swaybars(cont); - } - } + load_swaybars(); arrange_windows(&root_container, -1, -1); return cmd_results_new(CMD_SUCCESS, NULL, NULL); diff --git a/sway/config.c b/sway/config.c index c34a660e..16adaf0d 100644 --- a/sway/config.c +++ b/sway/config.c @@ -529,7 +529,20 @@ void terminate_swaybg(pid_t pid) { } } -void load_swaybars(swayc_t *output) { +static bool active_output(const char *name) { + int i; + swayc_t *cont = NULL; + for (i = 0; i < root_container.children->length; ++i) { + cont = root_container.children->items[i]; + if (cont->type == C_OUTPUT && strcasecmp(name, cont->name) == 0) { + return true; + } + } + + return false; +} + +void load_swaybars() { // Check for bars list_t *bars = create_list(); struct bar_config *bar = NULL; @@ -541,7 +554,7 @@ void load_swaybars(swayc_t *output) { int j; for (j = 0; j < bar->outputs->length; ++j) { char *o = bar->outputs->items[j]; - if (!strcmp(o, "*") || !strcasecmp(o, output->name)) { + if (!strcmp(o, "*") || active_output(o)) { apply = true; break; } @@ -559,7 +572,7 @@ void load_swaybars(swayc_t *output) { if (bar->pid != 0) { terminate_swaybar(bar->pid); } - sway_log(L_DEBUG, "Invoking swaybar for output %s and bar '%s'", output->name, bar->id); + sway_log(L_DEBUG, "Invoking swaybar for bar id '%s'", bar->id); invoke_swaybar(bar); } @@ -683,8 +696,8 @@ void apply_output_config(struct output_config *oc, swayc_t *output) { } } - // load swaybars for output - load_swaybars(output); + // reload swaybars + load_swaybars(); } char *do_var_replacement(char *str) { -- cgit v1.2.3 From 67bbcceba1433e41b5edfca32532b7d55a39a395 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Wed, 24 Feb 2016 18:53:09 +0100 Subject: Free config before exiting sway. Apart from freeing the sway_config struct, this also terminates the swaybars spawned by sway, since they are linked by PID to the bar config structs. --- include/config.h | 4 ++++ sway/config.c | 2 +- sway/main.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'include/config.h') diff --git a/include/config.h b/include/config.h index 8907e019..d77872ee 100644 --- a/include/config.h +++ b/include/config.h @@ -192,6 +192,10 @@ bool load_config(const char *file); /** Reads the config from the given FILE. */ bool read_config(FILE *file, bool is_active); +/** + * Free config struct + */ +void free_config(struct sway_config *config); /** * Does variable replacement for a string based on the config's currently loaded variables. */ diff --git a/sway/config.c b/sway/config.c index 16adaf0d..296e164c 100644 --- a/sway/config.c +++ b/sway/config.c @@ -86,7 +86,7 @@ static void free_workspace_output(struct workspace_output *wo) { free(wo); } -static void free_config(struct sway_config *config) { +void free_config(struct sway_config *config) { int i; for (i = 0; i < config->symbols->length; ++i) { free_variable(config->symbols->items[i]); diff --git a/sway/main.c b/sway/main.c index 7ea392b6..7c712281 100644 --- a/sway/main.c +++ b/sway/main.c @@ -228,6 +228,10 @@ int main(int argc, char **argv) { ipc_terminate(); + if (config) { + free_config(config); + } + return exit_value; } -- cgit v1.2.3