diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-08-02 21:37:29 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-08-03 10:37:35 -0400 |
commit | a7f7d4a488c8d3b2461122765f9904c8a411a583 (patch) | |
tree | 7abee51265a8b9550c62255d0c6649935ee1d6a2 /include/sway/config.h | |
parent | Show swaynag on config errors (diff) | |
download | sway-a7f7d4a488c8d3b2461122765f9904c8a411a583.tar.gz sway-a7f7d4a488c8d3b2461122765f9904c8a411a583.tar.zst sway-a7f7d4a488c8d3b2461122765f9904c8a411a583.zip |
Write to swaynag pipe fd directly on config errors
Diffstat (limited to 'include/sway/config.h')
-rw-r--r-- | include/sway/config.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 4fc3eadb..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,7 +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 { |
311 | pid_t swaynag_pid; | 312 | char *swaynag_command; |
313 | struct swaynag_instance swaynag_config_errors; | ||
312 | list_t *symbols; | 314 | list_t *symbols; |
313 | list_t *modes; | 315 | list_t *modes; |
314 | list_t *bars; | 316 | list_t *bars; |
@@ -346,6 +348,7 @@ struct sway_config { | |||
346 | bool failed; | 348 | bool failed; |
347 | bool reloading; | 349 | bool reloading; |
348 | bool reading; | 350 | bool reading; |
351 | bool validating; | ||
349 | bool auto_back_and_forth; | 352 | bool auto_back_and_forth; |
350 | bool show_marks; | 353 | bool show_marks; |
351 | 354 | ||
@@ -404,18 +407,19 @@ struct sway_config { | |||
404 | * 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 |
405 | * reloading the config. | 408 | * reloading the config. |
406 | */ | 409 | */ |
407 | bool load_main_config(const char *path, bool is_active, char **errors); | 410 | bool load_main_config(const char *path, bool is_active, bool validating); |
408 | 411 | ||
409 | /** | 412 | /** |
410 | * 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. |
411 | */ | 414 | */ |
412 | bool load_include_configs(const char *path, struct sway_config *config, | 415 | bool load_include_configs(const char *path, struct sway_config *config, |
413 | char **errors); | 416 | struct swaynag_instance *swaynag); |
414 | 417 | ||
415 | /** | 418 | /** |
416 | * Reads the config from the given FILE. | 419 | * Reads the config from the given FILE. |
417 | */ | 420 | */ |
418 | bool read_config(FILE *file, struct sway_config *config, char **errors); | 421 | bool read_config(FILE *file, struct sway_config *config, |
422 | struct swaynag_instance *swaynag); | ||
419 | 423 | ||
420 | /** | 424 | /** |
421 | * Free config struct | 425 | * Free config struct |
@@ -424,8 +428,6 @@ void free_config(struct sway_config *config); | |||
424 | 428 | ||
425 | void free_sway_variable(struct sway_variable *var); | 429 | void free_sway_variable(struct sway_variable *var); |
426 | 430 | ||
427 | void spawn_swaynag_config_errors(struct sway_config *config, char *errors); | ||
428 | |||
429 | /** | 431 | /** |
430 | * Does variable replacement for a string based on the config's currently loaded variables. | 432 | * Does variable replacement for a string based on the config's currently loaded variables. |
431 | */ | 433 | */ |