mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-13 05:54:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Invoke swaybar when an output matches a bar config

Browse Source
This commit is contained in:
Drew DeVault 2015-12-16 19:29:47 -05:00
parent f6da4dda4b
commit 60c204a09b
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sway/commands.c
View File

@ -1785,6 +1785,10 @@ static struct cmd_results *bar_cmd_output(int argc, char **argv) {
const char *output = argv[0]; const char *output = argv[0];
list_t *outputs = config->current_bar->outputs; list_t *outputs = config->current_bar->outputs;
if (!outputs) {
outputs = create_list();
config->current_bar->outputs = outputs;
}
int i; int i;
int add_output = 1; int add_output = 1;

46
sway/config.c
View File

@ -424,6 +424,50 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
execvp(cmd[0], cmd); execvp(cmd[0], cmd);
} }
} }
// Check for a bar
struct bar_config *bar = NULL;
int i;
for (i = 0; i < config->bars->length; ++i) {
bar = config->bars->items[i];
bool apply = false;
if (bar->outputs) {
int j;
for (j = 0; j < bar->outputs->length; ++j) {
char *o = bar->outputs->items[j];
if (strcmp(o, "*") || strcasecmp(o, output->name)) {
apply = true;
break;
}
}
} else {
apply = true;
}
if (apply) {
break;
} else {
bar = NULL;
}
}
if (bar) {
sway_log(L_DEBUG, "Invoking swaybar for output %s and bar %s", output->name, bar->id);
size_t bufsize = 4;
char output_id[bufsize];
snprintf(output_id, bufsize, "%d", i);
output_id[bufsize-1] = 0;
char *const cmd[] = {
"./bin/swaybar",
"-b",
bar->id,
output_id,
NULL,
};
if (fork() == 0) {
execvp(cmd[0], cmd);
}
}
} }
char *do_var_replacement(char *str) { char *do_var_replacement(char *str) {
@ -561,7 +605,7 @@ struct bar_config *default_bar_config(void) {
bar->mode = strdup("dock"); bar->mode = strdup("dock");
bar->hidden_state = strdup("hide"); bar->hidden_state = strdup("hide");
bar->modifier = 0; bar->modifier = 0;
bar->outputs = create_list(); bar->outputs = NULL;
bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
bar->bindings = create_list(); bar->bindings = create_list();
bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done"); bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done");