introduce drw_fontset_getwidth_clamp()

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index d06bea1..eca67ac 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -102,6 +102,24 @@ cleanup(void)
        XCloseDisplay(dpy);
 }
 
+static char *
+cistrstr(const char *h, const char *n)
+{
+       size_t i;
+
+       if (!n[0])
+               return (char *)h;
+
+       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;
+}
+
 static int
 drawitem(struct item *item, int x, int y, int w)
 {
@@ -634,7 +652,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;
@@ -711,7 +729,7 @@ main(int argc, char *argv[])
                        fast = 1;
                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
-                       fstrstr = strcasestr;
+                       fstrstr = cistrstr;
                } else if (i + 1 == argc)
                        usage();
                /* these options take one argument */