improve performance of case-insensitive matching

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 7745947..d06bea1 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <strings.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -24,12 +25,6 @@
 #define LENGTH(X)             (sizeof X / sizeof X[0])
 #define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)
 
-#ifdef __OpenBSD__
-#include <unistd.h>
-#else
-#define pledge(a,b) 0
-#endif
-
 /* enums */
 enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 
@@ -107,17 +102,6 @@ cleanup(void)
        XCloseDisplay(dpy);
 }
 
-static char *
-cistrstr(const char *s, const char *sub)
-{
-       size_t len;
-
-       for (len = strlen(sub); *s; s++)
-               if (!strncasecmp(s, sub, len))
-                       return (char *)s;
-       return NULL;
-}
-
 static int
 drawitem(struct item *item, int x, int y, int w)
 {
@@ -365,9 +349,11 @@ keypress(XKeyEvent *ev)
                                          utf8, utf8, win, CurrentTime);
                        return;
                case XK_Left:
+               case XK_KP_Left:
                        movewordedge(-1);
                        goto draw;
                case XK_Right:
+               case XK_KP_Right:
                        movewordedge(+1);
                        goto draw;
                case XK_Return:
@@ -405,6 +391,7 @@ insert:
                        insert(buf, len);
                break;
        case XK_Delete:
+       case XK_KP_Delete:
                if (text[cursor] == '\0')
                        return;
                cursor = nextrune(+1);
@@ -415,6 +402,7 @@ insert:
                insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:
+       case XK_KP_End:
                if (text[cursor] != '\0') {
                        cursor = strlen(text);
                        break;
@@ -434,6 +422,7 @@ insert:
                cleanup();
                exit(1);
        case XK_Home:
+       case XK_KP_Home:
                if (sel == matches) {
                        cursor = 0;
                        break;
@@ -442,6 +431,7 @@ insert:
                calcoffsets();
                break;
        case XK_Left:
+       case XK_KP_Left:
                if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
                        cursor = nextrune(-1);
                        break;
@@ -450,18 +440,21 @@ insert:
                        return;
                /* fallthrough */
        case XK_Up:
+       case XK_KP_Up:
                if (sel && sel->left && (sel = sel->left)->right == curr) {
                        curr = prev;
                        calcoffsets();
                }
                break;
        case XK_Next:
+       case XK_KP_Next:
                if (!next)
                        return;
                sel = curr = next;
                calcoffsets();
                break;
        case XK_Prior:
+       case XK_KP_Prior:
                if (!prev)
                        return;
                sel = curr = prev;
@@ -478,6 +471,7 @@ insert:
                        sel->out = 1;
                break;
        case XK_Right:
+       case XK_KP_Right:
                if (text[cursor] != '\0') {
                        cursor = nextrune(+1);
                        break;
@@ -486,6 +480,7 @@ insert:
                        return;
                /* fallthrough */
        case XK_Down:
+       case XK_KP_Down:
                if (sel && sel->right && (sel = sel->right) == next) {
                        curr = next;
                        calcoffsets();
@@ -558,9 +553,14 @@ run(void)
        XEvent ev;
 
        while (!XNextEvent(dpy, &ev)) {
-               if (XFilterEvent(&ev, None))
+               if (XFilterEvent(&ev, win))
                        continue;
                switch(ev.type) {
+               case DestroyNotify:
+                       if (ev.xdestroywindow.window != win)
+                               break;
+                       cleanup();
+                       exit(1);
                case Expose:
                        if (ev.xexpose.count == 0)
                                drw_map(drw, win, 0, 0, mw, mh);
@@ -664,15 +664,17 @@ setup(void)
                            CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
        XSetClassHint(dpy, win, &ch);
 
-       /* open input methods */
-       xim = XOpenIM(dpy, NULL, NULL, NULL);
+
+       /* input methods */
+       if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
+               die("XOpenIM failed: could not open input device");
+
        xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
                        XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dpy, win);
-       XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
        if (embed) {
-               XSelectInput(dpy, parentwin, FocusChangeMask);
+               XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
                if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
                        for (i = 0; i < du && dws[i] != win; ++i)
                                XSelectInput(dpy, dws[i], FocusChangeMask);
@@ -709,7 +711,7 @@ main(int argc, char *argv[])
                        fast = 1;
                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
-                       fstrstr = cistrstr;
+                       fstrstr = strcasestr;
                } else if (i + 1 == argc)
                        usage();
                /* these options take one argument */
@@ -736,8 +738,6 @@ main(int argc, char *argv[])
 
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
-       if (!XSetLocaleModifiers(""))
-               fputs("warning: no locale modifiers support\n", stderr);
        if (!(dpy = XOpenDisplay(NULL)))
                die("cannot open display");
        screen = DefaultScreen(dpy);
@@ -752,10 +752,12 @@ main(int argc, char *argv[])
                die("no fonts could be loaded.");
        lrpad = drw->fonts->h;
 
-       if (pledge("stdio rpath", NULL) < 0)
+#ifdef __OpenBSD__
+       if (pledge("stdio rpath", NULL) == -1)
                die("pledge");
+#endif
 
-       if (fast) {
+       if (fast && !isatty(0)) {
                grabkeyboard();
                readstdin();
        } else {