aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-02-24 18:52:57 +0100
committerMikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-02-27 22:12:35 +0100
commite15a8a03769736f588f68ae5e1cc24611ed334ae (patch)
treeee47cb6a964a2507447ae082eef25eb3ad84783a
parentaf7a251806661bbe7ed7a7573ffd8e16ef4b28a2 (diff)
Improve how swaybars are spawned
-rw-r--r--include/config.h2
-rw-r--r--sway/commands.c9
-rw-r--r--sway/config.c23
3 files changed, 20 insertions, 14 deletions
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) {