diff options
Diffstat (limited to 'include/config.h')
-rw-r--r-- | include/config.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/config.h b/include/config.h index 9356140d..4bcf55e8 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -184,15 +184,27 @@ struct sway_config { | |||
184 | bool smart_gaps; | 184 | bool smart_gaps; |
185 | int gaps_inner; | 185 | int gaps_inner; |
186 | int gaps_outer; | 186 | int gaps_outer; |
187 | |||
188 | list_t *config_chain; | ||
189 | const char *current_config; | ||
187 | }; | 190 | }; |
188 | 191 | ||
189 | /** | 192 | /** |
190 | * Loads the config from the given path. | 193 | * Loads the main config from the given path. is_active should be true when |
194 | * reloading the config. | ||
191 | */ | 195 | */ |
192 | bool load_config(const char *file); | 196 | bool load_main_config(const char *path, bool is_active); |
193 | /** Reads the config from the given FILE. | 197 | |
198 | /** | ||
199 | * Loads an included config. Can only be used after load_main_config. | ||
194 | */ | 200 | */ |
195 | bool read_config(FILE *file, bool is_active); | 201 | bool load_include_configs(const char *path, struct sway_config *config); |
202 | |||
203 | /** | ||
204 | * Reads the config from the given FILE. | ||
205 | */ | ||
206 | bool read_config(FILE *file, struct sway_config *config); | ||
207 | |||
196 | /** | 208 | /** |
197 | * Free config struct | 209 | * Free config struct |
198 | */ | 210 | */ |