alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #903 from RyanDwyer/fix-swaybar-output

Browse source 
Fix swaybar when running on named outputs.
This commit is contained in:
Drew DeVault 2016-09-17 17:00:36 +09:00 committed by GitHub
parent 461e250e26 e4cb4d1b5c
commit 75f82808e2
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/config.c
View file

@ -936,9 +936,6 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
execvp(cmd[0], cmd); execvp(cmd[0], cmd);
} }
} }
// reload swaybars
load_swaybars();
} }
char *do_var_replacement(char *str) { char *do_var_replacement(char *str) {

1
sway/container.c
View file

@ -156,6 +156,7 @@ swayc_t *new_output(wlc_handle handle) {
apply_output_config(oc, output); apply_output_config(oc, output);
add_child(&root_container, output); add_child(&root_container, output);
load_swaybars();
// Create workspace // Create workspace
char *ws_name = NULL; char *ws_name = NULL;

2
swaybar/ipc.c
View file

@ -278,7 +278,7 @@ void ipc_bar_init(struct bar *bar, const char *bar_id) {
} else { } else {
int j = 0; int j = 0;
for (j = 0; j < bar->config->outputs->length; ++j) { for (j = 0; j < bar->config->outputs->length; ++j) {
const char *conf_name = bar->config->outputs->items[i]; const char *conf_name = bar->config->outputs->items[j];
if (strcasecmp(name, conf_name) == 0) { if (strcasecmp(name, conf_name) == 0) {
use_output = true; use_output = true;
break; break;