Merge branch 'master' into next

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

diff --git a/include/i3/ipc.h b/include/i3/ipc.h
index 30b2d3044e353cdb4c202a571e6acfde6138326d..e8de2e1eb1c5690edff19a94e8d05f62ebcb21bd 100644 (file)
--- a/include/i3/ipc.h
+++ b/include/i3/ipc.h
@@ -1,17 +1,13 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * This public header defines the different constants and message types to use
  * for the IPC interface to i3 (see docs/ipc for more information).
  *
  */
-
 #ifndef _I3_IPC_H
 #define _I3_IPC_H
 
@@ -41,6 +37,12 @@
 /** Request the current defined marks from i3 */
 #define I3_IPC_MESSAGE_TYPE_GET_MARKS           5
 
+/** Request the configuration for a specific 'bar' */
+#define I3_IPC_MESSAGE_TYPE_GET_BAR_CONFIG      6
+
+/** Request the SHM debug log start/wrap markers */
+#define I3_IPC_MESSAGE_TYPE_GET_LOG_MARKERS     7
+
 /*
  * Messages from i3 to clients
  *
@@ -61,9 +63,15 @@
 /** Tree reply type */
 #define I3_IPC_REPLY_TYPE_TREE                  4
 
-/** Marks reply type*/
+/** Marks reply type */
 #define I3_IPC_REPLY_TYPE_MARKS                 5
 
+/** Bar config reply type */
+#define I3_IPC_REPLY_TYPE_BAR_CONFIG            6
+
+/** Request the SHM debug log start/wrap markers */
+#define I3_IPC_REPLY_TYPE_LOG_MARKERS           7
+
 /*
  * Events from i3 to clients. Events have the first bit set high.
  *