aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2018-08-01 23:54:40 -0400
committerBrian Ashworth <bosrsf04@gmail.com>2018-08-03 10:37:35 -0400
commitf9a6407111a8730df51258c3b07502814a8ab3e1 (patch)
tree6cf180159caf4a45a8f37b026b2769d24468a07b /include
parent3e2bf7f3a550db995a38808e0abd53fefab96f80 (diff)
downloadsway-f9a6407111a8730df51258c3b07502814a8ab3e1.tar.xz
Show swaynag on config errors
Diffstat (limited to 'include')
-rw-r--r--include/sway/config.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index 909b6827..4fc3eadb 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -308,6 +308,7 @@ enum focus_wrapping_mode {
* The configuration struct. The result of loading a config file.
*/
struct sway_config {
+ pid_t swaynag_pid;
list_t *symbols;
list_t *modes;
list_t *bars;
@@ -403,17 +404,18 @@ struct sway_config {
* Loads the main config from the given path. is_active should be true when
* reloading the config.
*/
-bool load_main_config(const char *path, bool is_active);
+bool load_main_config(const char *path, bool is_active, char **errors);
/**
* Loads an included config. Can only be used after load_main_config.
*/
-bool load_include_configs(const char *path, struct sway_config *config);
+bool load_include_configs(const char *path, struct sway_config *config,
+ char **errors);
/**
* Reads the config from the given FILE.
*/
-bool read_config(FILE *file, struct sway_config *config);
+bool read_config(FILE *file, struct sway_config *config, char **errors);
/**
* Free config struct
@@ -422,6 +424,8 @@ void free_config(struct sway_config *config);
void free_sway_variable(struct sway_variable *var);
+void spawn_swaynag_config_errors(struct sway_config *config, char *errors);
+
/**
* Does variable replacement for a string based on the config's currently loaded variables.
*/