ensure align = left is the default and update documentation accordingly

fixes #1403

diff --git a/docs/i3bar-protocol b/docs/i3bar-protocol
index 927631549fe9969622824b53c4435e6af08b77c1..0ca2fd82c9e3d3e0233d359dcdfe682e1c063588 100644 (file)
--- a/docs/i3bar-protocol
+++ b/docs/i3bar-protocol
@@ -148,7 +148,7 @@ min_width::
         when you want to set a sensible minimum width regardless of which font you
         are using, and at what particular size.
 align::
-       Align text on the +center+ (default), +right+ or +left+ of the block, when
+       Align text on the +center+, +right+ or +left+ (default) of the block, when
        the minimum width of the latter, specified by the +min_width+ key, is not
        reached.
 name and instance::

diff --git a/i3bar/include/common.h b/i3bar/include/common.h
index 31ac51613bb77d16860df5fa893ef3ea3d0a7c73..e8b6be0a57ec7e2788a9a68a9eb4ed161cfceb8a 100644 (file)
--- a/i3bar/include/common.h
+++ b/i3bar/include/common.h
@@ -27,6 +27,7 @@ struct rect_t {
 };
 
 typedef enum {
+    /* First value to make it the default. */
     ALIGN_LEFT,
     ALIGN_CENTER,
     ALIGN_RIGHT

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 0bbf2a46dbab342b30b3a52b6c0c03ca6529fae8..4b09daa9884fdf64efacd1ba678810998ce6b7fd 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -188,12 +188,12 @@ static int stdin_string(void *context, const unsigned char *val, size_t len) {
         sasprintf(&(ctx->block.color), "%.*s", len, val);
     }
     if (strcasecmp(ctx->last_map_key, "align") == 0) {
-        if (len == strlen("left") && !strncmp((const char *)val, "left", strlen("left"))) {
-            ctx->block.align = ALIGN_LEFT;
+        if (len == strlen("center") && !strncmp((const char *)val, "center", strlen("center"))) {
+            ctx->block.align = ALIGN_CENTER;
         } else if (len == strlen("right") && !strncmp((const char *)val, "right", strlen("right"))) {
             ctx->block.align = ALIGN_RIGHT;
         } else {
-            ctx->block.align = ALIGN_CENTER;
+            ctx->block.align = ALIGN_LEFT;
         }
     } else if (strcasecmp(ctx->last_map_key, "min_width") == 0) {
         i3String *text = i3string_from_utf8_with_length((const char *)val, len);