Revert "Print highlighted input text only on single match"

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 0e7b70bdc74043a46bae25d34f78969d1c9e8372..8e84fbdf9afb6e572d2cae240d0d2801851c1765 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -81,10 +81,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 : TEXTW(next->text)) > n)
+               if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
                        break;
        for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
-               if ((i += (lines > 0) ? bh : TEXTW(prev->left->text)) > n)
+               if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
                        break;
 }
 
@@ -480,7 +480,7 @@ readstdin(void)
        }
        if (items)
                items[i].text = NULL;
-       inputw = TEXTW(items[imax].text);
+       inputw = items ? TEXTW(items[imax].text) : 0;
        lines = MIN(lines, i);
 }