summaryrefslogtreecommitdiffstats
path: root/sway/main.c
diff options
context:
space:
mode:
authorLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-03-26 12:31:53 +0100
committerLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-03-26 16:37:50 +0100
commit71a5350b681e022e9738b50f2977ddb529110bfb (patch)
tree4c199980a9f80c07d69130a72402a5cfe2a8a63f /sway/main.c
parentUpdate README.md (diff)
downloadsway-71a5350b681e022e9738b50f2977ddb529110bfb.tar.gz
sway-71a5350b681e022e9738b50f2977ddb529110bfb.tar.zst
sway-71a5350b681e022e9738b50f2977ddb529110bfb.zip
Implement include command
The include command (`include <path>`) makes it possible to include sub config files from the main config file (or from within other sub config files). The include command uses the following rules for including config files: * the `path` can be either a full path or a path that is relative to the parent config. Shell expansion is supported, so it's possible to do `include ~/.config/sway.d/*`. * The same config file can only be included once (to prevent include cycles). If a config is included multiple times it will just be ignored after it has been included once. * Including a sub config file is the same as inserting the content of that file into the parent config, thus rules about overwriting bindsyms etc. works the same as for a single config. Implement #542
Diffstat (limited to 'sway/main.c')
-rw-r--r--sway/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/main.c b/sway/main.c
index c4a5d497..4aaac556 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -206,11 +206,11 @@ int main(int argc, char **argv) {
206 init_layout(); 206 init_layout();
207 207
208 if (validate) { 208 if (validate) {
209 bool valid = load_config(config_path); 209 bool valid = load_main_config(config_path, false);
210 return valid ? 0 : 1; 210 return valid ? 0 : 1;
211 } 211 }
212 212
213 if (!load_config(config_path)) { 213 if (!load_main_config(config_path, false)) {
214 sway_terminate(EXIT_FAILURE); 214 sway_terminate(EXIT_FAILURE);
215 } 215 }
216 216