mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-22 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaybg: use output names instead of output indexes

Browse source
This commit is contained in:
emersion 2019-01-17 11:13:10 +01:00
parent 70637b40fe
commit 000b313985
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
2 changed files with 119 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sway/config/output.c
View file

@ -229,28 +229,29 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) {
terminate_swaybg(output->bg_pid);
}
if (oc && oc->background && config->swaybg_command) {
wlr_log(WLR_DEBUG, "Setting background for output %d to %s",
output_i, oc->background);
wlr_log(WLR_DEBUG, "Setting background for output %s to %s",
wlr_output->name, oc->background);
size_t len = snprintf(NULL, 0, "%s %d \"%s\" %s %s",
config->swaybg_command, output_i, oc->background,
oc->background_option,
oc->background_fallback ? oc->background_fallback : "");
size_t len = snprintf(NULL, 0, "%s \"%s\" \"%s\" %s %s",
config->swaybg_command, wlr_output->name, oc->background,
oc->background_option,
oc->background_fallback ? oc->background_fallback : "");
char *command = malloc(len + 1);
if (!command) {
wlr_log(WLR_DEBUG, "Unable to allocate swaybg command");
return;
}
snprintf(command, len + 1, "%s %d \"%s\" %s %s",
config->swaybg_command, output_i, oc->background,
oc->background_option,
oc->background_fallback ? oc->background_fallback : "");
snprintf(command, len + 1, "%s \"%s\" \"%s\" %s %s",
config->swaybg_command, wlr_output->name, oc->background,
oc->background_option,
oc->background_fallback ? oc->background_fallback : "");
wlr_log(WLR_DEBUG, "-> %s", command);
char *const cmd[] = { "sh", "-c", command, NULL };
output->bg_pid = fork();
if (output->bg_pid == 0) {
execvp(cmd[0], cmd);
wlr_log_errno(WLR_ERROR, "Failed to execute swaybg");
} else {
free(command);
}