Merge branch 'release-4.16.1'

[i3/i3] / include / config_parser.h

diff --git a/include/config_parser.h b/include/config_parser.h
index 9fc3bf2ffb5ea63e2b3e22bef34a69f9472dd9d5..009538f2d40625d31ba19976aeab2e4d88a63a8f 100644 (file)
--- a/include/config_parser.h
+++ b/include/config_parser.h
@@ -2,18 +2,21 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * config_parser.h: config parser-related definitions
  *
  */
 #pragma once
 
+#include <config.h>
+
 #include <yajl/yajl_gen.h>
 
+SLIST_HEAD(variables_head, Variable);
 extern pid_t config_error_nagbar_pid;
 
-/*
+/**
  * An intermediate reprsentation of the result of a parse_config call.
  * Currently unused, but the JSON output will be useful in the future when we
  * implement a config parsing IPC command.
@@ -31,6 +34,11 @@ struct ConfigResultIR {
 
 struct ConfigResultIR *parse_config(const char *input, struct context *context);
 
+/**
+ * launch nagbar to indicate errors in the configuration file.
+ */
+void start_config_error_nagbar(const char *configpath, bool has_errors);
+
 /**
  * Parses the given file by first replacing the variables, then calling
  * parse_config and launching i3-nagbar if use_nagbar is true.