Merge branch 'master' into next

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

diff --git a/include/i3/ipc.h b/include/i3/ipc.h
index 0046b6376aea8512caf1ef205bde78147354e3fd..30b2d3044e353cdb4c202a571e6acfde6138326d 100644 (file)
--- a/include/i3/ipc.h
+++ b/include/i3/ipc.h
@@ -27,8 +27,19 @@
 #define I3_IPC_MESSAGE_TYPE_COMMAND            0
 
 /** Requests the current workspaces from i3 */
-#define I3_IPC_MESSAGE_TYPE_GET_TREE            1
+#define I3_IPC_MESSAGE_TYPE_GET_WORKSPACES      1
 
+/** Subscribe to the specified events */
+#define I3_IPC_MESSAGE_TYPE_SUBSCRIBE           2
+
+/** 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
@@ -39,7 +50,19 @@
 #define I3_IPC_REPLY_TYPE_COMMAND               0
 
 /** Workspaces reply type */
-#define I3_IPC_REPLY_TYPE_TREE                  1
+#define I3_IPC_REPLY_TYPE_WORKSPACES            1
+
+/** Subscription reply type */
+#define I3_IPC_REPLY_TYPE_SUBSCRIBE             2
+
+/** 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.