mirror/ sway
1
1
Fork 0
mirror of https://github.com/swaywm/sway synced 2024-06-16 06:16:43 +02:00
Code Issues

Add support for running swaybar_command

This commit is contained in:
Mikkel Oscar Lyderik 2015-12-19 01:03:39 +01:00
parent 2ab4e5676e
commit 207678e809
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sway/config.c
View File

@ -371,18 +371,35 @@ static void invoke_swaybar(swayc_t *output, struct bar_config *bar, int output_i
snprintf(output_id, bufsize, "%d", output_i);
output_id[bufsize-1] = 0;
char *const cmd[] = {
"swaybar",
"-b",
bar->id,
output_id,
NULL,
};
pid_t *pid = malloc(sizeof(pid_t));
*pid = fork();
if (*pid == 0) {
execvp(cmd[0], cmd);
if (!bar->swaybar_command) {
char *const cmd[] = {
"swaybar",
"-b",
bar->id,
output_id,
NULL,
};
execvp(cmd[0], cmd);
} else {
// run custom swaybar
int len = strlen(bar->swaybar_command) + strlen(bar->id) + strlen(output_id) + 6;
char *command = malloc(len * sizeof(char));
snprintf(command, len, "%s -b %s %s", bar->swaybar_command, bar->id, output_id);
char *const cmd[] = {
"sh",
"-c",
command,
NULL,
};
execvp(cmd[0], cmd);
free(command);
}
}
// add swaybar pid to output