bump version to 5.1

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index ae56f4f..d95e6c6 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -103,13 +103,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;
 }
 
@@ -360,9 +367,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:
@@ -400,6 +409,7 @@ insert:
                        insert(buf, len);
                break;
        case XK_Delete:
+       case XK_KP_Delete:
                if (text[cursor] == '\0')
                        return;
                cursor = nextrune(+1);
@@ -410,6 +420,7 @@ insert:
                insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:
+       case XK_KP_End:
                if (text[cursor] != '\0') {
                        cursor = strlen(text);
                        break;
@@ -429,6 +440,7 @@ insert:
                cleanup();
                exit(1);
        case XK_Home:
+       case XK_KP_Home:
                if (sel == matches) {
                        cursor = 0;
                        break;
@@ -437,6 +449,7 @@ insert:
                calcoffsets();
                break;
        case XK_Left:
+       case XK_KP_Left:
                if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
                        cursor = nextrune(-1);
                        break;
@@ -445,18 +458,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;
@@ -473,6 +489,7 @@ insert:
                        sel->out = 1;
                break;
        case XK_Right:
+       case XK_KP_Right:
                if (text[cursor] != '\0') {
                        cursor = nextrune(+1);
                        break;
@@ -481,6 +498,7 @@ insert:
                        return;
                /* fallthrough */
        case XK_Down:
+       case XK_KP_Down:
                if (sel && sel->right && (sel = sel->right) == next) {
                        curr = next;
                        calcoffsets();
@@ -553,7 +571,7 @@ run(void)
        XEvent ev;
 
        while (!XNextEvent(dpy, &ev)) {
-               if (XFilterEvent(&ev, None))
+               if (XFilterEvent(&ev, win))
                        continue;
                switch(ev.type) {
                case DestroyNotify:
@@ -666,20 +684,13 @@ setup(void)
 
 
        /* input methods */
-       if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) {
-               XSetLocaleModifiers("@im=local");
-               if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) {
-                       XSetLocaleModifiers("@im=");
-                       if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
-                               die("XOpenIM failed. Could not open input device.\n");
-               }
-       }
+       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 | SubstructureNotifyMask);
                if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
@@ -745,8 +756,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);