Merge branch 'master' into next

[i3/i3] / include / commands_parser.h

diff --git a/include/commands_parser.h b/include/commands_parser.h
index 795cb0265715c44a5d41319a561d161682dc490f..37c4d4b1705459da0894d8ef2f0c4e0390dd9d2e 100644 (file)
--- a/include/commands_parser.h
+++ b/include/commands_parser.h
@@ -7,8 +7,8 @@
  * commands.c: all command functions (see commands_parser.c)
  *
  */
-#ifndef _COMMANDS_PARSER_H
-#define _COMMANDS_PARSER_H
+#ifndef I3_COMMANDS_PARSER_H
+#define I3_COMMANDS_PARSER_H
 
 #include <yajl/yajl_gen.h>
 
@@ -25,6 +25,11 @@ struct CommandResult {
     /* The JSON generator to append a reply to. */
     yajl_gen json_gen;
 
+    /* The next state to transition to. Passed to the function so that we can
+     * determine the next state as a result of a function call, like
+     * cfg_criteria_pop_state() does. */
+    int next_state;
+
     /* Whether the command requires calling tree_render. */
     bool needs_tree_render;
 };