diff options
Diffstat (limited to 'include/sway/config.h')
-rw-r--r-- | include/sway/config.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 909b6827..632aca14 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <wlr/types/wlr_box.h> | 7 | #include <wlr/types/wlr_box.h> |
8 | #include <xkbcommon/xkbcommon.h> | 8 | #include <xkbcommon/xkbcommon.h> |
9 | #include "list.h" | 9 | #include "list.h" |
10 | #include "swaynag.h" | ||
10 | #include "tree/layout.h" | 11 | #include "tree/layout.h" |
11 | #include "tree/container.h" | 12 | #include "tree/container.h" |
12 | #include "wlr-layer-shell-unstable-v1-protocol.h" | 13 | #include "wlr-layer-shell-unstable-v1-protocol.h" |
@@ -308,6 +309,8 @@ enum focus_wrapping_mode { | |||
308 | * The configuration struct. The result of loading a config file. | 309 | * The configuration struct. The result of loading a config file. |
309 | */ | 310 | */ |
310 | struct sway_config { | 311 | struct sway_config { |
312 | char *swaynag_command; | ||
313 | struct swaynag_instance swaynag_config_errors; | ||
311 | list_t *symbols; | 314 | list_t *symbols; |
312 | list_t *modes; | 315 | list_t *modes; |
313 | list_t *bars; | 316 | list_t *bars; |
@@ -345,6 +348,7 @@ struct sway_config { | |||
345 | bool failed; | 348 | bool failed; |
346 | bool reloading; | 349 | bool reloading; |
347 | bool reading; | 350 | bool reading; |
351 | bool validating; | ||
348 | bool auto_back_and_forth; | 352 | bool auto_back_and_forth; |
349 | bool show_marks; | 353 | bool show_marks; |
350 | 354 | ||
@@ -403,17 +407,19 @@ struct sway_config { | |||
403 | * Loads the main config from the given path. is_active should be true when | 407 | * Loads the main config from the given path. is_active should be true when |
404 | * reloading the config. | 408 | * reloading the config. |
405 | */ | 409 | */ |
406 | bool load_main_config(const char *path, bool is_active); | 410 | bool load_main_config(const char *path, bool is_active, bool validating); |
407 | 411 | ||
408 | /** | 412 | /** |
409 | * Loads an included config. Can only be used after load_main_config. | 413 | * Loads an included config. Can only be used after load_main_config. |
410 | */ | 414 | */ |
411 | bool load_include_configs(const char *path, struct sway_config *config); | 415 | bool load_include_configs(const char *path, struct sway_config *config, |
416 | struct swaynag_instance *swaynag); | ||
412 | 417 | ||
413 | /** | 418 | /** |
414 | * Reads the config from the given FILE. | 419 | * Reads the config from the given FILE. |
415 | */ | 420 | */ |
416 | bool read_config(FILE *file, struct sway_config *config); | 421 | bool read_config(FILE *file, struct sway_config *config, |
422 | struct swaynag_instance *swaynag); | ||
417 | 423 | ||
418 | /** | 424 | /** |
419 | * Free config struct | 425 | * Free config struct |