Merge branch 'next'

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

diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index 74bd21528501d3b4701043ef51691c30e2891a61..1365082f54591c0720712ce346ce7c37373ff36d 100644 (file)
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -1,15 +1,18 @@
 /*
- * i3bar - an xcb-based status- and ws-bar for i3
- *
- * © 2010-2011 Axel Wagner and contributors
+ * vim:ts=4:sw=4:expandtab
  *
- * See file LICNSE for license information
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2011 Axel Wagner and contributors (see also: LICENSE)
  *
  */
 #ifndef COMMON_H_
 #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;
 
@@ -24,15 +27,48 @@ struct rect_t {
     int h;
 };
 
-#include "queue.h"
+typedef enum {
+    ALIGN_LEFT,
+    ALIGN_CENTER,
+    ALIGN_RIGHT
+} blockalign_t;
+
+/* This data structure represents one JSON dictionary, multiple of these make
+ * up one status line. */
+struct status_block {
+    i3String *full_text;
+
+    char *color;
+    uint32_t min_width;
+    blockalign_t align;
+
+    bool urgent;
+    bool no_separator;
+
+    /* The amount of pixels necessary to render a separater after the block. */
+    uint32_t sep_block_width;
+
+    /* The amount of pixels necessary to render this block. These variables are
+     * only temporarily used in refresh_statusline(). */
+    uint32_t width;
+    uint32_t x_offset;
+    uint32_t x_append;
+
+    TAILQ_ENTRY(status_block) blocks;
+};
+
+TAILQ_HEAD(statusline_head, status_block) statusline_head;
+
 #include "child.h"
 #include "ipc.h"
 #include "outputs.h"
 #include "util.h"
 #include "workspaces.h"
+#include "mode.h"
 #include "trayclients.h"
 #include "xcb.h"
-#include "ucs2_to_utf8.h"
 #include "config.h"
+#include "libi3.h"
+#include "parse_json_header.h"
 
 #endif