Merge branch 'next' into master

[i3/i3] / include / config_parser.h

diff --git a/include/config_parser.h b/include/config_parser.h
index 0daf8118ec75ebbd85ce92245180d86ff6d0d102..28c28e4882e7f2b6fa220cfe98ca4d4b391f1819 100644 (file)
--- a/include/config_parser.h
+++ b/include/config_parser.h
@@ -2,22 +2,24 @@
  * 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
  *
  */
-#ifndef I3_CONFIG_PARSER_H
-#define I3_CONFIG_PARSER_H
+#pragma once
 
 #include <yajl/yajl_gen.h>
 
+extern pid_t config_error_nagbar_pid;
+
 /*
- * 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.
+ * 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.
  *
  */
-struct ConfigResult {
+struct ConfigResultIR {
     /* The JSON generator to append a reply to. */
     yajl_gen json_gen;
 
@@ -27,6 +29,14 @@ struct ConfigResult {
     int next_state;
 };
 
-struct ConfigResult *parse_config(const char *input, struct context *context);
+struct ConfigResultIR *parse_config(const char *input, struct context *context);
 
-#endif
+/**
+ * Parses the given file by first replacing the variables, then calling
+ * parse_config and launching i3-nagbar if use_nagbar is true.
+ *
+ * The return value is a boolean indicating whether there were errors during
+ * parsing.
+ *
+ */
+bool parse_file(const char *f, bool use_nagbar);