Merge branch 'master' into next

[i3/i3] / i3bar / include / common.h

diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index 3b6967faf347cdace0c353c9b30680ac032eb82f..6f8a7b2db8ae87b378e34ce19160e8a29c686ed6 100644 (file)
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -9,6 +9,10 @@
 #define COMMON_H_
 
 #include <stdbool.h>
+#include <xcb/xcb.h>
+#include <xcb/xproto.h>
+#include "libi3.h"
+#include "queue.h"
 
 typedef struct rect_t rect;
 
@@ -23,7 +27,22 @@ struct rect_t {
     int h;
 };
 
-#include "queue.h"
+/* This data structure represents one JSON dictionary, multiple of these make
+ * up one status line. */
+struct status_block {
+    i3String *full_text;
+
+    char *color;
+
+    /* The amount of pixels necessary to render this block. This variable is
+     * only temporarily used in refresh_statusline(). */
+    uint32_t width;
+
+    TAILQ_ENTRY(status_block) blocks;
+};
+
+TAILQ_HEAD(statusline_head, status_block) statusline_head;
+
 #include "child.h"
 #include "ipc.h"
 #include "outputs.h"
@@ -31,8 +50,8 @@ struct rect_t {
 #include "workspaces.h"
 #include "trayclients.h"
 #include "xcb.h"
-#include "ucs2_to_utf8.h"
 #include "config.h"
 #include "libi3.h"
+#include "determine_json_version.h"
 
 #endif