mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 16:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

commands/include: handle many files in single line

Browse source 
i3 supports including multiple files in a single line, whereas sway
limits to single file per line.
This commit is contained in:
mtvare6 2024-11-13 22:32:00 +05:30 committed by Simon Ser
parent a2c73c9b8b
commit fec3da7d58
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/commands/include.c
View file

@ -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);
}

4
sway/sway.5.scd
View file

@ -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.