applied center patch

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 96b2581..8862150 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -94,6 +94,15 @@ calcoffsets(void)
                        break;
 }
 
+static int
+max_textw(void)
+{
+       int len = 0;
+       for (struct item *item = items; item && item->text; item++)
+               len = MAX(TEXTW(item->text), len);
+       return len;
+}
+
 static void
 cleanup(void)
 {
@@ -621,6 +630,7 @@ setup(void)
        bh = drw->fonts->h + 2;
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
+       promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
 #ifdef XINERAMA
        i = 0;
        if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
@@ -647,9 +657,16 @@ setup(void)
                                if (INTERSECT(x, y, 1, 1, info[i]))
                                        break;
 
-               x = info[i].x_org;
-               y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
-               mw = info[i].width;
+               if (centered) {
+                       mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width);
+                       x = info[i].x_org + ((info[i].width  - mw) / 2);
+                       y = info[i].y_org + ((info[i].height - mh) / 2);
+               } else {
+                       x = info[i].x_org;
+                       y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
+                       mw = info[i].width;
+               }
+
                XFree(info);
        } else
 #endif
@@ -657,11 +674,17 @@ setup(void)
                if (!XGetWindowAttributes(dpy, parentwin, &wa))
                        die("could not get embedding window attributes: 0x%lx",
                            parentwin);
-               x = 0;
-               y = topbar ? 0 : wa.height - mh;
-               mw = wa.width;
+
+               if (centered) {
+                       mw = MIN(MAX(max_textw() + promptw, min_width), wa.width);
+                       x = (wa.width  - mw) / 2;
+                       y = (wa.height - mh) / 2;
+               } else {
+                       x = 0;
+                       y = topbar ? 0 : wa.height - mh;
+                       mw = wa.width;
+               }
        }
-       promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
        inputw = MIN(inputw, mw/3);
        match();
 
@@ -754,6 +777,8 @@ main(int argc, char *argv[])
                        topbar = 0;
                else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
                        fast = 1;
+               else if (!strcmp(argv[i], "-c"))   /* centers dmenu on screen */
+                       centered = 1;
                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;