lsx: detect read errors

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index cff3e65..f105b56 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -30,7 +30,7 @@ static void drawmenu(void);
 static void grabkeyboard(void);
 static void insert(const char *str, ssize_t n);
 static void keypress(XKeyEvent *ev);
-static void match(Bool sub);
+static void match(void);
 static size_t nextrune(int inc);
 static void paste(void);
 static void readstdin(void);
@@ -120,10 +120,10 @@ main(int argc, char *argv[]) {
 
 void
 appenditem(Item *item, Item **list, Item **last) {
-       if(!*last)
-               *list = item;
-       else
+       if(*last)
                (*last)->right = item;
+       else
+               *list = item;
 
        item->left = *last;
        item->right = NULL;
@@ -223,7 +223,7 @@ insert(const char *str, ssize_t n) {
        if(n > 0)
                memcpy(&text[cursor], str, n);
        cursor += n;
-       match(n > 0 && text[cursor] == '\0');
+       match();
 }
 
 void
@@ -252,7 +252,7 @@ keypress(XKeyEvent *ev) {
 
                case XK_k: /* delete right */
                        text[cursor] = '\0';
-                       match(False);
+                       match();
                        break;
                case XK_u: /* delete left */
                        insert(NULL, 0 - cursor);
@@ -279,6 +279,7 @@ keypress(XKeyEvent *ev) {
                if(text[cursor] == '\0')
                        return;
                cursor = nextrune(+1);
+               /* fallthrough */
        case XK_BackSpace:
                if(cursor == 0)
                        return;
@@ -354,33 +355,44 @@ keypress(XKeyEvent *ev) {
                        return;
                strncpy(text, sel->text, sizeof text);
                cursor = strlen(text);
-               match(True);
+               match();
                break;
        }
        drawmenu();
 }
 
 void
-match(Bool sub) {
-       size_t len = strlen(text);
-       Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
-       Item *item, *lnext;
-
-       lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
-       for(item = sub ? matches : items; item && item->text; item = lnext) {
-               lnext = sub ? item->right : item + 1;
-               if(!fstrncmp(text, item->text, len + 1))
-                       appenditem(item, &lexact, &exactend);
-               else if(!fstrncmp(text, item->text, len))
+match(void) {
+       static char **tokv = NULL;
+       static int tokn = 0;
+
+       char buf[sizeof text], *s;
+       int i, tokc = 0;
+       size_t len;
+       Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+
+       strcpy(buf, text);
+       for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " "))
+               if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
+                       eprintf("cannot realloc %u bytes\n", tokn * sizeof *tokv);
+       len = tokc ? strlen(tokv[0]) : 0;
+
+       matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+       for(item = items; item && item->text; item++) {
+               for(i = 0; i < tokc; i++)
+                       if(!fstrstr(item->text, tokv[i]))
+                               break;
+               if(i != tokc)
+                       continue;
+               if(!tokc || !fstrncmp(tokv[0], item->text, len+1))
+                       appenditem(item, &matches, &matchend);
+               else if(!fstrncmp(tokv[0], item->text, len))
                        appenditem(item, &lprefix, &prefixend);
-               else if(fstrstr(item->text, text))
+               else
                        appenditem(item, &lsubstr, &substrend);
        }
-       matches = lexact;
-       matchend = exactend;
-
        if(lprefix) {
-               if(matchend) {
+               if(matches) {
                        matchend->right = lprefix;
                        lprefix->left = matchend;
                }
@@ -389,7 +401,7 @@ match(Bool sub) {
                matchend = prefixend;
        }
        if(lsubstr) {
-               if(matchend) {
+               if(matches) {
                        matchend->right = lsubstr;
                        lsubstr->left = matchend;
                }
@@ -442,6 +454,7 @@ readstdin(void) {
        if(items)
                items[i].text = NULL;
        inputw = maxstr ? textw(dc, maxstr) : 0;
+       lines = MIN(lines, i);
 }
 
 void
@@ -472,7 +485,7 @@ void
 setup(void) {
        int x, y, screen = DefaultScreen(dc->dpy);
        Window root = RootWindow(dc->dpy, screen);
-       XSetWindowAttributes wa;
+       XSetWindowAttributes swa;
 #ifdef XINERAMA
        int n;
        XineramaScreenInfo *info;
@@ -493,9 +506,14 @@ setup(void) {
        if((info = XineramaQueryScreens(dc->dpy, &n))) {
                int i, di;
                unsigned int du;
-               Window dw;
+               Window w, dw;
+               XWindowAttributes wa;
 
-               XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
+               XGetInputFocus(dc->dpy, &w, &di);
+               if(w != root && w != PointerRoot && w != None && XGetWindowAttributes(dc->dpy, w, &wa))
+                       XTranslateCoordinates(dc->dpy, w, root, wa.x, wa.y, &x, &y, &dw);
+               else
+                       XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
                for(i = 0; i < n-1; i++)
                        if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
                                break;
@@ -513,16 +531,16 @@ setup(void) {
        }
        promptw = prompt ? textw(dc, prompt) : 0;
        inputw = MIN(inputw, mw/3);
-       match(False);
+       match();
 
        /* menu window */
-       wa.override_redirect = True;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+       swa.override_redirect = True;
+       swa.background_pixmap = ParentRelative;
+       swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
                            DefaultDepth(dc->dpy, screen), CopyFromParent,
                            DefaultVisual(dc->dpy, screen),
-                           CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+                           CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
 
        XMapRaised(dc->dpy, win);
        resizedc(dc, mw, mh);