From 7e696cc02d71d313a525d058f61762f5993632f2 Mon Sep 17 00:00:00 2001
From: Sascha Kruse <knopwob@googlemail.com>
Date: Sat, 30 Jun 2012 23:29:14 +0200
Subject: [PATCH] alignment

---
 dunst.c | 27 ++++++++++++++++++++++++++-
 dunst.h |  2 ++
 dunstrc |  5 +++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/dunst.c b/dunst.c
index 6e2dc37..f2a0ce2 100644
--- a/dunst.c
+++ b/dunst.c
@@ -47,6 +47,7 @@ typedef struct _screen_info {
 typedef struct _notification_buffer {
         char txt[BUFSIZ];
         notification *n;
+        int x_offset;
 } notification_buffer;
 
 /* global variables */
@@ -68,6 +69,7 @@ char *key_string = NULL;
 char *history_key_string = NULL;
 KeySym mask = 0;
 int idle_threshold = 0;
+enum alignment align = left;
 
 int verbosity = 0;
 
@@ -320,6 +322,7 @@ void draw_win(void)
 
         for (i = 0, iter = displayed_notifications->head; i < height; i++) {
                 memset(n_buf[i].txt, '\0', BUFSIZ);
+                n_buf[i].x_offset = 0;
                 if (iter) {
                         n_buf[i].n = (notification *) iter->data;
                         strncpy(n_buf[i].txt, n_buf[i].n->msg, BUFSIZ);
@@ -359,6 +362,18 @@ void draw_win(void)
                 width = scr.dim.w;
         }
 
+        /* calculate offsets for alignment */
+        for (i = 0; i < height; i++) {
+                if (strlen(n_buf[i].txt) < 1)
+                        continue;
+
+                if (align == right) {
+                        n_buf[i].x_offset = width - textw(dc, n_buf[i].txt);
+                } else if (align == center) {
+                        n_buf[i].x_offset = (width - textw(dc,
+                                                           n_buf[i].txt)) / 2;
+                }
+        }
 
         /* calculate window position */
         if (geometry.mask & XNegative) {
@@ -388,8 +403,9 @@ void draw_win(void)
                          * its attributes
                          */
                         n = n_buf[i].n ? n_buf[i].n : n_buf[i - 1].n;
-
+                        dc->x = 0;
                         drawrect(dc, 0, 0, width, font_h, True, n->colors->BG);
+                        dc->x = n_buf[i].x_offset;
                         drawtext(dc, n_buf[i].txt, n->colors);
                         dc->y += font_h;
                 }
@@ -1065,9 +1081,18 @@ dunst_ini_handle(void *user_data, const char *section,
                         } else if (!strcmp(mod, "mod1")) {
                                 mask = Mod1Mask;
                         } else {
+                                /* FIXME warning on unknown modifier */
                                 mask = 0;
                         }
                         free(mod);
+                } else if (strcmp(name, "alignment") == 0) {
+                        if (strcmp(value, "left") == 0)
+                                align = left;
+                        else if (strcmp(value, "center") == 0)
+                                align = center;
+                        else if (strcmp(value, "right") == 0)
+                                align = right;
+                        /* FIXME warning on unknown alignment */
                 }
         } else if (strcmp(section, "urgency_low") == 0) {
                 if (strcmp(name, "background") == 0)
diff --git a/dunst.h b/dunst.h
index 607eb4c..4af2ae6 100644
--- a/dunst.h
+++ b/dunst.h
@@ -13,6 +13,8 @@
 #define ColFG 1
 #define ColBG 0
 
+enum alignment {left, center, right};
+
 typedef struct _rule_t {
         char *name;
         /* filters */
diff --git a/dunstrc b/dunstrc
index a93f730..cb4151f 100644
--- a/dunstrc
+++ b/dunstrc
@@ -25,6 +25,10 @@
     # key to redisplay last message(s)
     history_key = grave
 
+    # alignment of message text.
+    # Possible values are "left", "center" and "right"
+    alignment = left
+
 
     # the geometry of the window
     # geometry [{width}]x{height}][+/-{x}+/-{y}]
@@ -45,6 +49,7 @@
     # Which monitor should the notifications be displayed one
     monitor = 0
 
+
 [urgency_low]
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the '#' and following  would be interpreted as a comment.