diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2018-09-13 16:36:09 -0400 |
|---|---|---|
| committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-09-13 22:21:10 -0400 |
| commit | 0b64cce73385cb739ee89c983835b098f04ee68a (patch) | |
| tree | cc1a4212a98e24bcd5994dd24892b89fd8cf2d76 /sway | |
| parent | 5f9be1e1aaeaa58879d5979ced4bc29f90c6024a (diff) | |
| download | sway-0b64cce73385cb739ee89c983835b098f04ee68a.tar.xz | |
Allow spaces in background file paths
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands/output/background.c | 2 | ||||
| -rw-r--r-- | sway/config/output.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c index ddad679d..8ab52a2e 100644 --- a/sway/commands/output/background.c +++ b/sway/commands/output/background.c @@ -71,7 +71,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { return cmd_res; } free(src); - src = strdup(p.we_wordv[0]); + src = join_args(p.we_wordv, p.we_wordc); wordfree(&p); if (!src) { wlr_log(WLR_ERROR, "Failed to duplicate string"); diff --git a/sway/config/output.c b/sway/config/output.c index 74d79130..6f337b66 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -237,7 +237,7 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) { 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", + 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, oc->background_fallback ? oc->background_fallback : ""); @@ -246,7 +246,7 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) { wlr_log(WLR_DEBUG, "Unable to allocate swaybg command"); return; } - snprintf(command, len + 1, "%s %d %s %s %s", + snprintf(command, len + 1, "%s %d \"%s\" %s %s", config->swaybg_command ? config->swaybg_command : "swaybg", output_i, oc->background, oc->background_option, oc->background_fallback ? oc->background_fallback : ""); |