patch: center

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index cde394b..35ce141 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -96,6 +96,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)
 {
@@ -104,6 +113,9 @@ cleanup(void)
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        for (i = 0; i < SchemeLast; i++)
                free(scheme[i]);
+       for (i = 0; items && items[i].text; ++i)
+               free(items[i].text);
+       free(items);
        drw_free(drw);
        XSync(dpy, False);
        XCloseDisplay(dpy);
@@ -239,7 +251,7 @@ match(void)
        /* separate input text into tokens to be matched individually */
        for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
                if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
-                       die("cannot realloc %u bytes:", tokn * sizeof *tokv);
+                       die("cannot realloc %zu bytes:", tokn * sizeof *tokv);
        len = tokc ? strlen(tokv[0]) : 0;
 
        matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
@@ -412,7 +424,7 @@ keypress(XKeyEvent *ev)
        switch(ksym) {
        default:
 insert:
-               if (!iscntrl(*buf))
+               if (!iscntrl((unsigned char)*buf))
                        insert(buf, len);
                break;
        case XK_Delete:
@@ -547,28 +559,21 @@ static void
 readstdin(void)
 {
        char buf[sizeof text], *p;
-       size_t i, imax = 0, size = 0;
-       unsigned int tmpmax = 0;
+       size_t i, size = 0;
 
        /* read each line from stdin and add it to the item list */
        for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
                if (i + 1 >= size / sizeof *items)
                        if (!(items = realloc(items, (size += BUFSIZ))))
-                               die("cannot realloc %u bytes:", size);
+                               die("cannot realloc %zu bytes:", size);
                if ((p = strchr(buf, '\n')))
                        *p = '\0';
                if (!(items[i].text = strdup(buf)))
-                       die("cannot strdup %u bytes:", strlen(buf) + 1);
+                       die("cannot strdup %zu bytes:", strlen(buf) + 1);
                items[i].out = 0;
-               drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
-               if (tmpmax > inputw) {
-                       inputw = tmpmax;
-                       imax = i;
-               }
        }
        if (items)
                items[i].text = NULL;
-       inputw = items ? TEXTW(items[imax].text) : 0;
        lines = MIN(lines, i);
 }
 
@@ -614,12 +619,13 @@ static void
 setup(void)
 {
        int x, y, i, j;
-       unsigned int du;
+       unsigned int du, tmp;
        XSetWindowAttributes swa;
        XIM xim;
        Window w, dw, *dws;
        XWindowAttributes wa;
        XClassHint ch = {"dmenu", "dmenu"};
+       struct item *item;
 #ifdef XINERAMA
        XineramaScreenInfo *info;
        Window pw;
@@ -636,6 +642,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))) {
@@ -662,9 +669,16 @@ setup(void)
                                if (INTERSECT(x, y, 1, 1, info[i]) != 0)
                                        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
@@ -672,12 +686,23 @@ 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;
+               }
+       }
+       for (item = items; item && item->text; ++item) {
+               if ((tmp = textw_clamp(item->text, mw/3)) > inputw) {
+                       if ((inputw = tmp) == mw/3)
+                               break;
+               }
        }
-       promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
-       inputw = MIN(inputw, mw/3);
        match();
 
        /* create menu window */
@@ -734,6 +759,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;