commit fec3da7d58c06421355e4b3dd1dcf291fd20627c
parent a2c73c9b8b426417e0253ea0420b98298af1c963
Author: mtvare6 <mtvare6@proton.me>
Date: Wed, 13 Nov 2024 22:32:00 +0530
commands/include: handle many files in single line
i3 supports including multiple files in a single line, whereas sway
limits to single file per line.
Diffstat:
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sway/commands/include.c b/sway/commands/include.c
@@ -3,12 +3,12 @@
struct cmd_results *cmd_include(int argc, char **argv) {
struct cmd_results *error = NULL;
- if ((error = checkarg(argc, "include", EXPECTED_EQUAL_TO, 1))) {
+ if ((error = checkarg(argc, "include", EXPECTED_AT_LEAST, 1))) {
return error;
}
-
+ char *files = join_args(argv, argc);
// We don't care if the included config(s) fails to load.
- load_include_configs(argv[0], config, &config->swaynag_config_errors);
+ load_include_configs(files, config, &config->swaynag_config_errors);
return cmd_results_new(CMD_SUCCESS, NULL);
}
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
@@ -66,8 +66,8 @@ The following commands may only be used in the configuration file.
*default_orientation* horizontal|vertical|auto
Sets the default container layout for tiled containers.
-*include* <path>
- Includes another file from _path_. _path_ can be either a full path or a
+*include* <paths...>
+ Include files from _paths_. _paths_ can include either a full path or a
path relative to the parent config, and expands shell syntax (see
*wordexp*(3) for details). The same include file can only be included once;
subsequent attempts will be ignored.