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 | Merge pull request #2628 from RyanDwyer/remove-rejigger-assertion (diff) | |
| download | sway-0b64cce73385cb739ee89c983835b098f04ee68a.tar.gz sway-0b64cce73385cb739ee89c983835b098f04ee68a.tar.zst sway-0b64cce73385cb739ee89c983835b098f04ee68a.zip | |
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) { | |||
| 71 | return cmd_res; | 71 | return cmd_res; |
| 72 | } | 72 | } |
| 73 | free(src); | 73 | free(src); |
| 74 | src = strdup(p.we_wordv[0]); | 74 | src = join_args(p.we_wordv, p.we_wordc); |
| 75 | wordfree(&p); | 75 | wordfree(&p); |
| 76 | if (!src) { | 76 | if (!src) { |
| 77 | wlr_log(WLR_ERROR, "Failed to duplicate string"); | 77 | 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) { | |||
| 237 | wlr_log(WLR_DEBUG, "Setting background for output %d to %s", | 237 | wlr_log(WLR_DEBUG, "Setting background for output %d to %s", |
| 238 | output_i, oc->background); | 238 | output_i, oc->background); |
| 239 | 239 | ||
| 240 | size_t len = snprintf(NULL, 0, "%s %d %s %s %s", | 240 | size_t len = snprintf(NULL, 0, "%s %d \"%s\" %s %s", |
| 241 | config->swaybg_command ? config->swaybg_command : "swaybg", | 241 | config->swaybg_command ? config->swaybg_command : "swaybg", |
| 242 | output_i, oc->background, oc->background_option, | 242 | output_i, oc->background, oc->background_option, |
| 243 | oc->background_fallback ? oc->background_fallback : ""); | 243 | oc->background_fallback ? oc->background_fallback : ""); |
| @@ -246,7 +246,7 @@ void apply_output_config(struct output_config *oc, struct sway_output *output) { | |||
| 246 | wlr_log(WLR_DEBUG, "Unable to allocate swaybg command"); | 246 | wlr_log(WLR_DEBUG, "Unable to allocate swaybg command"); |
| 247 | return; | 247 | return; |
| 248 | } | 248 | } |
| 249 | snprintf(command, len + 1, "%s %d %s %s %s", | 249 | snprintf(command, len + 1, "%s %d \"%s\" %s %s", |
| 250 | config->swaybg_command ? config->swaybg_command : "swaybg", | 250 | config->swaybg_command ? config->swaybg_command : "swaybg", |
| 251 | output_i, oc->background, oc->background_option, | 251 | output_i, oc->background, oc->background_option, |
| 252 | oc->background_fallback ? oc->background_fallback : ""); | 252 | oc->background_fallback ? oc->background_fallback : ""); |