mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-27 15:36:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve how swaybars are spawned

Browse source
This commit is contained in:
Mikkel Oscar Lyderik 2016-02-24 18:52:57 +01:00
parent af7a251806
commit e15a8a0376
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/config.h
View file

@ -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); int sway_mouse_binding_cmp_buttons(const void *a, const void *b);
void free_sway_mouse_binding(struct sway_mouse_binding *smb); 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); void terminate_swaybg(pid_t pid);
/** /**

9
sway/commands.c
View file

@ -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."); if (!load_config(NULL)) return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config.");
int i; load_swaybars();
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);
}
}
arrange_windows(&root_container, -1, -1); arrange_windows(&root_container, -1, -1);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);

23
sway/config.c
View file

@ -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 // Check for bars
list_t *bars = create_list(); list_t *bars = create_list();
struct bar_config *bar = NULL; struct bar_config *bar = NULL;
@ -541,7 +554,7 @@ void load_swaybars(swayc_t *output) {
int j; int j;
for (j = 0; j < bar->outputs->length; ++j) { for (j = 0; j < bar->outputs->length; ++j) {
char *o = bar->outputs->items[j]; char *o = bar->outputs->items[j];
if (!strcmp(o, "*") || !strcasecmp(o, output->name)) { if (!strcmp(o, "*") || active_output(o)) {
apply = true; apply = true;
break; break;
} }
@ -559,7 +572,7 @@ void load_swaybars(swayc_t *output) {
if (bar->pid != 0) { if (bar->pid != 0) {
terminate_swaybar(bar->pid); 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); invoke_swaybar(bar);
} }
@ -683,8 +696,8 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
} }
} }
// load swaybars for output // reload swaybars
load_swaybars(output); load_swaybars();
} }
char *do_var_replacement(char *str) { char *do_var_replacement(char *str) {