Merge branch 'master' into next

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

diff --git a/include/i3/ipc.h b/include/i3/ipc.h
index 19d932981fa9304b8a878277a8f10b3bc796c8d3..30b2d3044e353cdb4c202a571e6acfde6138326d 100644 (file)
--- a/include/i3/ipc.h
+++ b/include/i3/ipc.h
@@ -29,6 +29,18 @@
 /** Requests the current workspaces from i3 */
 #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
  *
@@ -40,4 +52,28 @@
 /** Workspaces reply type */
 #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.
+ *
+ */
+#define I3_IPC_EVENT_MASK                       (1 << 31)
+
+/* The workspace event will be triggered upon changes in the workspace list */
+#define I3_IPC_EVENT_WORKSPACE                  (I3_IPC_EVENT_MASK | 0)
+
+/* The output event will be triggered upon changes in the output list */
+#define I3_IPC_EVENT_OUTPUT                     (I3_IPC_EVENT_MASK | 1)
+
 #endif