bump version to 5.1

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index d764658..d95e6c6 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <strings.h>
 #include <time.h>
 #include <string.h>
 #include <strings.h>
 #include <time.h>

+#include <unistd.h>

 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>


@@ -102,13 +103,20 @@ cleanup(void)
 }
 
 static char *
 }
 
 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;
 }
 
        return NULL;
 }
 


@@ -359,9 +367,11 @@ keypress(XKeyEvent *ev)
                                          utf8, utf8, win, CurrentTime);
                        return;
                case XK_Left:
                                          utf8, utf8, win, CurrentTime);
                        return;
                case XK_Left:

+               case XK_KP_Left:

                        movewordedge(-1);
                        goto draw;
                case XK_Right:
                        movewordedge(-1);
                        goto draw;
                case XK_Right:

+               case XK_KP_Right:

                        movewordedge(+1);
                        goto draw;
                case XK_Return:
                        movewordedge(+1);
                        goto draw;
                case XK_Return:


@@ -399,6 +409,7 @@ insert:
                        insert(buf, len);
                break;
        case XK_Delete:
                        insert(buf, len);
                break;
        case XK_Delete:

+       case XK_KP_Delete:

                if (text[cursor] == '\0')
                        return;
                cursor = nextrune(+1);
                if (text[cursor] == '\0')
                        return;
                cursor = nextrune(+1);


@@ -409,6 +420,7 @@ insert:
                insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:
                insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:

+       case XK_KP_End:

                if (text[cursor] != '\0') {
                        cursor = strlen(text);
                        break;
                if (text[cursor] != '\0') {
                        cursor = strlen(text);
                        break;


@@ -428,6 +440,7 @@ insert:
                cleanup();
                exit(1);
        case XK_Home:
                cleanup();
                exit(1);
        case XK_Home:

+       case XK_KP_Home:

                if (sel == matches) {
                        cursor = 0;
                        break;
                if (sel == matches) {
                        cursor = 0;
                        break;


@@ -436,6 +449,7 @@ insert:
                calcoffsets();
                break;
        case XK_Left:
                calcoffsets();
                break;
        case XK_Left:

+       case XK_KP_Left:

                if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
                        cursor = nextrune(-1);
                        break;
                if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
                        cursor = nextrune(-1);
                        break;


@@ -444,18 +458,21 @@ insert:
                        return;
                /* fallthrough */
        case XK_Up:
                        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:
                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:
                if (!next)
                        return;
                sel = curr = next;
                calcoffsets();
                break;
        case XK_Prior:

+       case XK_KP_Prior:

                if (!prev)
                        return;
                sel = curr = prev;
                if (!prev)
                        return;
                sel = curr = prev;


@@ -472,6 +489,7 @@ insert:
                        sel->out = 1;
                break;
        case XK_Right:
                        sel->out = 1;
                break;
        case XK_Right:

+       case XK_KP_Right:

                if (text[cursor] != '\0') {
                        cursor = nextrune(+1);
                        break;
                if (text[cursor] != '\0') {
                        cursor = nextrune(+1);
                        break;


@@ -480,6 +498,7 @@ insert:
                        return;
                /* fallthrough */
        case XK_Down:
                        return;
                /* fallthrough */
        case XK_Down:

+       case XK_KP_Down:

                if (sel && sel->right && (sel = sel->right) == next) {
                        curr = next;
                        calcoffsets();
                if (sel && sel->right && (sel = sel->right) == next) {
                        curr = next;
                        calcoffsets();


@@ -552,9 +571,14 @@ run(void)
        XEvent ev;
 
        while (!XNextEvent(dpy, &ev)) {
        XEvent ev;
 
        while (!XNextEvent(dpy, &ev)) {

-               if (XFilterEvent(&ev, None))
+               if (XFilterEvent(&ev, win))

                        continue;
                switch(ev.type) {
                        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);
                case Expose:
                        if (ev.xexpose.count == 0)
                                drw_map(drw, win, 0, 0, mw, mh);


@@ -658,15 +682,17 @@ setup(void)
                            CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
        XSetClassHint(dpy, win, &ch);
 
                            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);
        xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
                        XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dpy, win);

-       XSetInputFocus(dpy, win, RevertToParent, CurrentTime);

        if (embed) {
        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);
                if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
                        for (i = 0; i < du && dws[i] != win; ++i)
                                XSelectInput(dpy, dws[i], FocusChangeMask);


@@ -730,8 +756,6 @@ main(int argc, char *argv[])
 
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
 
        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);
        if (!(dpy = XOpenDisplay(NULL)))
                die("cannot open display");
        screen = DefaultScreen(dpy);


@@ -746,7 +770,12 @@ main(int argc, char *argv[])
                die("no fonts could be loaded.");
        lrpad = drw->fonts->h;
 
                die("no fonts could be loaded.");
        lrpad = drw->fonts->h;
 

-       if (fast) {
+#ifdef __OpenBSD__
+       if (pledge("stdio rpath", NULL) == -1)
+               die("pledge");
+#endif
+
+       if (fast && !isatty(0)) {

                grabkeyboard();
                readstdin();
        } else {
                grabkeyboard();
                readstdin();
        } else {