Merge branch 'next'

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

diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index e2582a02053bab03caacbc486774a47a27166cfa..1365082f54591c0720712ce346ce7c37373ff36d 100644 (file)
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -27,18 +27,32 @@ struct rect_t {
     int 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. This variable is
+    /* 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;
 };
@@ -50,6 +64,7 @@ TAILQ_HEAD(statusline_head, status_block) statusline_head;
 #include "outputs.h"
 #include "util.h"
 #include "workspaces.h"
+#include "mode.h"
 #include "trayclients.h"
 #include "xcb.h"
 #include "config.h"