inputw: improve correctness and startup performance

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 98507d9..d989d39 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -58,6 +58,13 @@ static Clr *scheme[SchemeLast];
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 
+static unsigned int
+textw_clamp(const char *str, unsigned int n)
+{
+       unsigned int w = drw_fontset_getwidth_clamp(drw, str, n) + lrpad;
+       return MIN(w, n);
+}
+
 static void
 appenditem(struct item *item, struct item **list, struct item **last)
 {
@@ -82,10 +89,10 @@ calcoffsets(void)
                n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
        /* calculate which items will begin the next page and previous page */
        for (i = 0, next = curr; next; next = next->right)
-               if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
+               if ((i += (lines > 0) ? bh : textw_clamp(next->text, n)) > n)
                        break;
        for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
-               if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
+               if ((i += (lines > 0) ? bh : textw_clamp(prev->left->text, n)) > n)
                        break;
 }
 
@@ -103,13 +110,20 @@ cleanup(void)
 }
 
 static char *
-cistrstr(const char *s, const char *sub)
+cistrstr(const char *h, const char *n)
 {
-       size_t len;
+       size_t i;
+
+       if (!n[0])
+               return (char *)h;
 
-       for (len = strlen(sub); *s; s++)
-               if (!strncasecmp(s, sub, len))
-                       return (char *)s;
+       for (; *h; ++h) {
+               for (i = 0; n[i] && tolower((unsigned char)n[i]) ==
+                           tolower((unsigned char)h[i]); ++i)
+                       ;
+               if (n[i] == '\0')
+                       return (char *)h;
+       }
        return NULL;
 }
 
@@ -165,7 +179,7 @@ drawmenu(void)
                }
                x += w;
                for (item = curr; item != next; item = item->right)
-                       x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
+                       x = drawitem(item, x, 0, textw_clamp(item->text, mw - x - TEXTW(">")));
                if (next) {
                        w = TEXTW(">");
                        drw_setscheme(drw, scheme[SchemeNorm]);
@@ -533,8 +547,7 @@ 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++) {
@@ -546,15 +559,9 @@ readstdin(void)
                if (!(items[i].text = strdup(buf)))
                        die("cannot strdup %u 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);
 }
 
@@ -600,12 +607,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;
@@ -645,7 +653,7 @@ setup(void)
                /* no focused window is on screen, so use pointer location instead */
                if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
                        for (i = 0; i < n; i++)
-                               if (INTERSECT(x, y, 1, 1, info[i]))
+                               if (INTERSECT(x, y, 1, 1, info[i]) != 0)
                                        break;
 
                x = info[i].x_org;
@@ -663,7 +671,12 @@ setup(void)
                mw = wa.width;
        }
        promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
-       inputw = MIN(inputw, mw/3);
+       for (item = items; item && item->text; ++item) {
+               if ((tmp = textw_clamp(item->text, mw/3)) > inputw) {
+                       if ((inputw = tmp) == mw/3)
+                               break;
+               }
+       }
        match();
 
        /* create menu window */