mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3457 from emersion/swaybg-no-escape

Browse source 
Don't escape swaybg arguments anymore
This commit is contained in:
Drew DeVault 2019-01-18 08:23:48 -05:00 committed by GitHub
parent 978d6cd854 d803861504
commit dd4a6586b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sway/commands/output/background.c
View file

@ -34,8 +34,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
struct output_config *output = config->handler_context.output_config; struct output_config *output = config->handler_context.output_config;
if (strcasecmp(argv[1], "solid_color") == 0) { if (strcasecmp(argv[1], "solid_color") == 0) {
output->background = calloc(1, strlen(argv[0]) + 3); output->background = strdup(argv[0]);
snprintf(output->background, strlen(argv[0]) + 3, "\"%s\"", argv[0]);
output->background_option = strdup("solid_color"); output->background_option = strdup("solid_color");
output->background_fallback = NULL; output->background_fallback = NULL;
argc -= 2; argv += 2; argc -= 2; argv += 2;
@ -119,16 +118,6 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
src); src);
free(src); free(src);
} else { } else {
// Escape double quotes in the final path for swaybg
for (size_t i = 0; i < strlen(src); i++) {
if (src[i] == '"') {
src = realloc(src, strlen(src) + 2);
memmove(src + i + 1, src + i, strlen(src + i) + 1);
*(src + i) = '\\';
i++;
}
}
output->background = src; output->background = src;
output->background_option = strdup(mode); output->background_option = strdup(mode);
} }
@ -136,9 +125,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
output->background_fallback = NULL; output->background_fallback = NULL;
if (argc && *argv[0] == '#') { if (argc && *argv[0] == '#') {
output->background_fallback = calloc(1, strlen(argv[0]) + 3); output->background_fallback = strdup(argv[0]);
snprintf(output->background_fallback, strlen(argv[0]) + 3,
"\"%s\"", argv[0]);
argc--; argv++; argc--; argv++;
if (!can_access) { if (!can_access) {
@ -153,4 +140,3 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
config->handler_context.leftovers.argv = argv; config->handler_context.leftovers.argv = argv;
return NULL; return NULL;
} }