Revert "fix input text matching"

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 9278e91..d605ab4 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -228,7 +228,7 @@ match(void)
        len = tokc ? strlen(tokv[0]) : 0;
 
        matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
        len = tokc ? strlen(tokv[0]) : 0;
 
        matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;

-       textsize = strlen(text);
+       textsize = strlen(text) + 1;

        for (item = items; item && item->text; item++) {
                for (i = 0; i < tokc; i++)
                        if (!fstrstr(item->text, tokv[i]))
        for (item = items; item && item->text; item++) {
                for (i = 0; i < tokc; i++)
                        if (!fstrstr(item->text, tokv[i]))


@@ -539,15 +539,16 @@ run(void)
 static void
 setup(void)
 {
 static void
 setup(void)
 {

-       int x, y;
+       int x, y, i = 0;
+       unsigned int du;

        XSetWindowAttributes swa;
        XIM xim;
        XSetWindowAttributes swa;
        XIM xim;

+       Window w, dw, *dws;
+       XWindowAttributes wa;

 #ifdef XINERAMA
        XineramaScreenInfo *info;
 #ifdef XINERAMA
        XineramaScreenInfo *info;

-       Window w, pw, dw, *dws;
-       XWindowAttributes wa;
-       int a, j, di, n, i = 0, area = 0;
-       unsigned int du;
+       Window pw;
+       int a, j, di, n, area = 0;

 #endif
 
        /* init appearance */
 #endif
 
        /* init appearance */