diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-09-21 15:36:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 15:36:08 -0400 |
| commit | d2a0a3cc0a29b3c3145bfedeb00ec68c1b8c5057 (patch) | |
| tree | 56f257c17c0d97666c498d2eb35012838c82b451 /sway/config | |
| parent | e5542746734ff20793079f89dfd727abebb877be (diff) | |
| parent | 04862e2121203965dad834b731a5c32b1d1f4e84 (diff) | |
| download | sway-d2a0a3cc0a29b3c3145bfedeb00ec68c1b8c5057.tar.xz | |
Merge pull request #2666 from emersion/swaybar-hotplug
swaybar: handle hotplugging
Diffstat (limited to 'sway/config')
| -rw-r--r-- | sway/config/bar.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/sway/config/bar.c b/sway/config/bar.c index f83b37d1..48a632fb 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c @@ -165,7 +165,7 @@ cleanup: return NULL; } -void invoke_swaybar(struct bar_config *bar) { +static void invoke_swaybar(struct bar_config *bar) { // Pipe to communicate errors int filedes[2]; if (pipe(filedes) == -1) { @@ -219,27 +219,13 @@ void invoke_swaybar(struct bar_config *bar) { close(filedes[1]); } -void load_swaybars() { +void load_swaybars(void) { for (int i = 0; i < config->bars->length; ++i) { struct bar_config *bar = config->bars->items[i]; - bool apply = false; - if (bar->outputs) { - for (int j = 0; j < bar->outputs->length; ++j) { - char *o = bar->outputs->items[j]; - if (!strcmp(o, "*") || output_by_name(o)) { - apply = true; - break; - } - } - } else { - apply = true; - } - if (apply) { - if (bar->pid != 0) { - terminate_swaybar(bar->pid); - } - wlr_log(WLR_DEBUG, "Invoking swaybar for bar id '%s'", bar->id); - invoke_swaybar(bar); + if (bar->pid != 0) { + terminate_swaybar(bar->pid); } + wlr_log(WLR_DEBUG, "Invoking swaybar for bar id '%s'", bar->id); + invoke_swaybar(bar); } } |