diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-09-17 17:00:36 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-17 17:00:36 +0900 |
commit | 75f82808e2e5e4950d436ff6d30a58ac9fabd599 (patch) | |
tree | 1c96a901a341a314be49844080fdb813b2e7f8b5 | |
parent | Merge pull request #902 from zandrmartin/patch-2 (diff) | |
parent | Fix swaybar when running on named outputs. (diff) | |
download | sway-75f82808e2e5e4950d436ff6d30a58ac9fabd599.tar.gz sway-75f82808e2e5e4950d436ff6d30a58ac9fabd599.tar.zst sway-75f82808e2e5e4950d436ff6d30a58ac9fabd599.zip |
Merge pull request #903 from RyanDwyer/fix-swaybar-output
Fix swaybar when running on named outputs.
-rw-r--r-- | sway/config.c | 3 | ||||
-rw-r--r-- | sway/container.c | 1 | ||||
-rw-r--r-- | swaybar/ipc.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/sway/config.c b/sway/config.c index a187fe3e..c0fbd210 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -936,9 +936,6 @@ void apply_output_config(struct output_config *oc, swayc_t *output) { | |||
936 | execvp(cmd[0], cmd); | 936 | execvp(cmd[0], cmd); |
937 | } | 937 | } |
938 | } | 938 | } |
939 | |||
940 | // reload swaybars | ||
941 | load_swaybars(); | ||
942 | } | 939 | } |
943 | 940 | ||
944 | char *do_var_replacement(char *str) { | 941 | char *do_var_replacement(char *str) { |
diff --git a/sway/container.c b/sway/container.c index 5614293c..561dcba6 100644 --- a/sway/container.c +++ b/sway/container.c | |||
@@ -156,6 +156,7 @@ swayc_t *new_output(wlc_handle handle) { | |||
156 | 156 | ||
157 | apply_output_config(oc, output); | 157 | apply_output_config(oc, output); |
158 | add_child(&root_container, output); | 158 | add_child(&root_container, output); |
159 | load_swaybars(); | ||
159 | 160 | ||
160 | // Create workspace | 161 | // Create workspace |
161 | char *ws_name = NULL; | 162 | char *ws_name = NULL; |
diff --git a/swaybar/ipc.c b/swaybar/ipc.c index bce9dc79..2c092853 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c | |||
@@ -278,7 +278,7 @@ void ipc_bar_init(struct bar *bar, const char *bar_id) { | |||
278 | } else { | 278 | } else { |
279 | int j = 0; | 279 | int j = 0; |
280 | for (j = 0; j < bar->config->outputs->length; ++j) { | 280 | for (j = 0; j < bar->config->outputs->length; ++j) { |
281 | const char *conf_name = bar->config->outputs->items[i]; | 281 | const char *conf_name = bar->config->outputs->items[j]; |
282 | if (strcasecmp(name, conf_name) == 0) { | 282 | if (strcasecmp(name, conf_name) == 0) { |
283 | use_output = true; | 283 | use_output = true; |
284 | break; | 284 | break; |