diff options
Diffstat (limited to 'sway/commands.c')
-rw-r--r-- | sway/commands.c | 75 |
1 files changed, 40 insertions, 35 deletions
diff --git a/sway/commands.c b/sway/commands.c index 053b5792..7247a407 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -1651,47 +1651,52 @@ static struct cmd_results *cmd_output(int argc, char **argv) { | |||
1651 | } else if (strcasecmp(command, "background") == 0 || strcasecmp(command, "bg") == 0) { | 1651 | } else if (strcasecmp(command, "background") == 0 || strcasecmp(command, "bg") == 0) { |
1652 | wordexp_t p; | 1652 | wordexp_t p; |
1653 | if (++i >= argc) { | 1653 | if (++i >= argc) { |
1654 | return cmd_results_new(CMD_INVALID, "output", "Missing background file."); | 1654 | return cmd_results_new(CMD_INVALID, "output", "Missing background file or color specification."); |
1655 | } | 1655 | } |
1656 | if (i + 1 >= argc) { | 1656 | if (i + 1 >= argc) { |
1657 | return cmd_results_new(CMD_INVALID, "output", "Missing background scaling mode."); | 1657 | return cmd_results_new(CMD_INVALID, "output", "Missing background scaling mode or `solid_color`."); |
1658 | } | 1658 | } |
1659 | char *src = join_args(argv + i, argc - i - 1); | 1659 | if (strcasecmp(argv[argc - 1], "solid_color") == 0) { |
1660 | char *mode = argv[argc - 1]; | 1660 | output->background = strdup(argv[argc - 2]); |
1661 | if (wordexp(src, &p, 0) != 0 || p.we_wordv[0] == NULL) { | 1661 | output->background_option = strdup("solid_color"); |
1662 | return cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src); | 1662 | } else { |
1663 | } | 1663 | char *src = join_args(argv + i, argc - i - 1); |
1664 | free(src); | 1664 | char *mode = argv[argc - 1]; |
1665 | src = p.we_wordv[0]; | 1665 | if (wordexp(src, &p, 0) != 0 || p.we_wordv[0] == NULL) { |
1666 | if (config->reading && *src != '/') { | 1666 | return cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src); |
1667 | char *conf = strdup(config->current_config); | ||
1668 | char *conf_path = dirname(conf); | ||
1669 | src = malloc(strlen(conf_path) + strlen(src) + 2); | ||
1670 | sprintf(src, "%s/%s", conf_path, p.we_wordv[0]); | ||
1671 | free(conf); | ||
1672 | } | ||
1673 | if (access(src, F_OK) == -1) { | ||
1674 | return cmd_results_new(CMD_INVALID, "output", "Background file unreadable (%s)", src); | ||
1675 | } | ||
1676 | for (char *m = mode; *m; ++m) *m = tolower(*m); | ||
1677 | // Check mode | ||
1678 | bool valid = false; | ||
1679 | size_t j; | ||
1680 | for (j = 0; j < sizeof(bg_options) / sizeof(char *); ++j) { | ||
1681 | if (strcasecmp(mode, bg_options[j]) == 0) { | ||
1682 | valid = true; | ||
1683 | break; | ||
1684 | } | 1667 | } |
1685 | } | ||
1686 | if (!valid) { | ||
1687 | return cmd_results_new(CMD_INVALID, "output", "Invalid background scaling mode."); | ||
1688 | } | ||
1689 | output->background = strdup(src); | ||
1690 | output->background_option = strdup(mode); | ||
1691 | if (src != p.we_wordv[0]) { | ||
1692 | free(src); | 1668 | free(src); |
1669 | src = p.we_wordv[0]; | ||
1670 | if (config->reading && *src != '/') { | ||
1671 | char *conf = strdup(config->current_config); | ||
1672 | char *conf_path = dirname(conf); | ||
1673 | src = malloc(strlen(conf_path) + strlen(src) + 2); | ||
1674 | sprintf(src, "%s/%s", conf_path, p.we_wordv[0]); | ||
1675 | free(conf); | ||
1676 | } | ||
1677 | if (access(src, F_OK) == -1) { | ||
1678 | return cmd_results_new(CMD_INVALID, "output", "Background file unreadable (%s)", src); | ||
1679 | } | ||
1680 | for (char *m = mode; *m; ++m) *m = tolower(*m); | ||
1681 | // Check mode | ||
1682 | bool valid = false; | ||
1683 | size_t j; | ||
1684 | for (j = 0; j < sizeof(bg_options) / sizeof(char *); ++j) { | ||
1685 | if (strcasecmp(mode, bg_options[j]) == 0) { | ||
1686 | valid = true; | ||
1687 | break; | ||
1688 | } | ||
1689 | } | ||
1690 | if (!valid) { | ||
1691 | return cmd_results_new(CMD_INVALID, "output", "Invalid background scaling mode."); | ||
1692 | } | ||
1693 | output->background = strdup(src); | ||
1694 | output->background_option = strdup(mode); | ||
1695 | if (src != p.we_wordv[0]) { | ||
1696 | free(src); | ||
1697 | } | ||
1698 | wordfree(&p); | ||
1693 | } | 1699 | } |
1694 | wordfree(&p); | ||
1695 | } | 1700 | } |
1696 | } | 1701 | } |
1697 | 1702 | ||