Merge branch 'master' into next

[i3/i3] / include / i3 / ipc.h

diff --git a/include/i3/ipc.h b/include/i3/ipc.h
index 1ea3918284a9ed999e4e13d284f2b30f22ccd66c..30b2d3044e353cdb4c202a571e6acfde6138326d 100644 (file)
--- a/include/i3/ipc.h
+++ b/include/i3/ipc.h
@@ -35,6 +35,12 @@
 /** Requests the current outputs from i3 */
 #define I3_IPC_MESSAGE_TYPE_GET_OUTPUTS         3
 
+/** Requests the tree layout from i3 */
+#define I3_IPC_MESSAGE_TYPE_GET_TREE            4
+
+/** Request the current defined marks from i3 */
+#define I3_IPC_MESSAGE_TYPE_GET_MARKS           5
+
 /*
  * Messages from i3 to clients
  *
@@ -52,6 +58,12 @@
 /** Outputs reply type */
 #define I3_IPC_REPLY_TYPE_OUTPUTS               3
 
+/** Tree reply type */
+#define I3_IPC_REPLY_TYPE_TREE                  4
+
+/** Marks reply type*/
+#define I3_IPC_REPLY_TYPE_MARKS                 5
+
 /*
  * Events from i3 to clients. Events have the first bit set high.
  *