diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-10-08 15:18:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-08 15:18:49 -0400 |
| commit | 3f328b62768d7801f0544b31ab8f9dde3014fd1d (patch) | |
| tree | 3572a9e1bff58710c22638d85ce1206af3999d94 /sway/config | |
| parent | d21d2c8665f8fdaad719bb81cc636052f7c1d1a1 (diff) | |
| parent | a03955f9368cfa1c190e4194eed8437dce22eb77 (diff) | |
Merge branch 'master' into popup-during-fullscreen
Diffstat (limited to 'sway/config')
| -rw-r--r-- | sway/config/output.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 6f337b66..2b041353 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -229,17 +229,16 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) { } } - if (oc && oc->background) { - if (output->bg_pid != 0) { - terminate_swaybg(output->bg_pid); - } - + if (output->bg_pid != 0) { + 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); size_t len = snprintf(NULL, 0, "%s %d \"%s\" %s %s", - config->swaybg_command ? config->swaybg_command : "swaybg", - output_i, oc->background, oc->background_option, + config->swaybg_command, output_i, oc->background, + oc->background_option, oc->background_fallback ? oc->background_fallback : ""); char *command = malloc(len + 1); if (!command) { @@ -247,8 +246,8 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) { return; } snprintf(command, len + 1, "%s %d \"%s\" %s %s", - config->swaybg_command ? config->swaybg_command : "swaybg", - output_i, oc->background, oc->background_option, + config->swaybg_command, output_i, oc->background, + oc->background_option, oc->background_fallback ? oc->background_fallback : ""); wlr_log(WLR_DEBUG, "-> %s", command); @@ -260,6 +259,7 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) { free(command); } } + if (oc) { switch (oc->dpms_state) { case DPMS_ON: @@ -353,4 +353,3 @@ void create_default_output_configs(void) { list_add(config->output_configs, oc); } } - |