drw_text: improve performance when there's no match

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index cf5d976..d989d39 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,12 +1,13 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>

-#include <stdbool.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <time.h>

+#include <unistd.h>
+

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


@@ -22,60 +23,50 @@
 #define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
 #define LENGTH(X)             (sizeof X / sizeof X[0])
 #define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
 #define LENGTH(X)             (sizeof X / sizeof X[0])

-#define TEXTNW(X,N)           (drw_font_getexts_width(drw->fonts[0], (X), (N)))
-#define TEXTW(X)              (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
+#define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)

 
 /* enums */
 enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 
 
 /* enums */
 enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 

-typedef struct Item Item;
-struct Item {
+struct item {

        char *text;
        char *text;

-       Item *left, *right;
-       bool out;
+       struct item *left, *right;
+       int out;

 };
 
 };
 

-static void appenditem(Item *, Item **, Item **);
-static void calcoffsets(void);
-static char *cistrstr(const char *, const char *);
-static void cleanup(void);
-static void drawmenu(void);
-static void grabkeyboard(void);
-static void insert(const char *, ssize_t);
-static void keypress(XKeyEvent *);
-static void match(void);
-static size_t nextrune(int);
-static void paste(void);
-static void readstdin(void);
-static void run(void);
-static void setup(void);
-static void usage(void);
-

 static char text[BUFSIZ] = "";
 static char text[BUFSIZ] = "";

+static char *embed;

 static int bh, mw, mh;
 static int bh, mw, mh;

-static int sw, sh; /* X display screen geometry width, height */
-static int inputw, promptw;
+static int inputw = 0, promptw;
+static int lrpad; /* sum of left and right padding */

 static size_t cursor;
 static size_t cursor;

-static Item *items = NULL;
-static Item *matches, *matchend;
-static Item *prev, *curr, *next, *sel;
+static struct item *items = NULL;
+static struct item *matches, *matchend;
+static struct item *prev, *curr, *next, *sel;

 static int mon = -1, screen;
 
 static Atom clip, utf8;
 static Display *dpy;
 static int mon = -1, screen;
 
 static Atom clip, utf8;
 static Display *dpy;

-static Window root, win;
+static Window root, parentwin, win;

 static XIC xic;
 
 static XIC xic;
 

-static ClrScheme scheme[SchemeLast];

 static Drw *drw;
 static Drw *drw;

+static Clr *scheme[SchemeLast];

 
 #include "config.h"
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 
 
 #include "config.h"
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 

+static unsigned int
+textw_clamp(const char *str, unsigned int n)
+{
+       unsigned int w = drw_fontset_getwidth_clamp(drw, str, n) + lrpad;
+       return MIN(w, n);
+}
+

 static void
 static void

-appenditem(Item *item, Item **list, Item **last)
+appenditem(struct item *item, struct item **list, struct item **last)

 {
        if (*last)
                (*last)->right = item;
 {
        if (*last)
                (*last)->right = item;


@@ -98,122 +89,193 @@ calcoffsets(void)
                n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
        /* calculate which items will begin the next page and previous page */
        for (i = 0, next = curr; next; next = next->right)
                n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
        /* calculate which items will begin the next page and previous page */
        for (i = 0, next = curr; next; next = next->right)

-               if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
+               if ((i += (lines > 0) ? bh : textw_clamp(next->text, n)) > n)

                        break;
        for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
                        break;
        for (i = 0, prev = curr; prev && prev->left; prev = prev->left)

-               if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
+               if ((i += (lines > 0) ? bh : textw_clamp(prev->left->text, n)) > n)

                        break;
 }
 
 static void
 cleanup(void)
 {
                        break;
 }
 
 static void
 cleanup(void)
 {

+       size_t i;
+

        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);

-       drw_clr_free(scheme[SchemeNorm].bg);
-       drw_clr_free(scheme[SchemeNorm].fg);
-       drw_clr_free(scheme[SchemeSel].fg);
-       drw_clr_free(scheme[SchemeSel].bg);
-       drw_clr_free(scheme[SchemeOut].fg);
-       drw_clr_free(scheme[SchemeOut].bg);
+       for (i = 0; i < SchemeLast; i++)
+               free(scheme[i]);

        drw_free(drw);
        XSync(dpy, False);
        XCloseDisplay(dpy);
 }
 
 static char *
        drw_free(drw);
        XSync(dpy, False);
        XCloseDisplay(dpy);
 }
 
 static char *

-cistrstr(const char *s, const char *sub)
+cistrstr(const char *h, const char *n)

 {
 {

-       size_t len;
+       size_t i;

 
 

-       for (len = strlen(sub); *s; s++)
-               if (!strncasecmp(s, sub, len))
-                       return (char *)s;
+       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;
 }
 
        return NULL;
 }
 

+static int
+drawitem(struct item *item, int x, int y, int w)
+{
+       if (item == sel)
+               drw_setscheme(drw, scheme[SchemeSel]);
+       else if (item->out)
+               drw_setscheme(drw, scheme[SchemeOut]);
+       else
+               drw_setscheme(drw, scheme[SchemeNorm]);
+
+       return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
+}
+

 static void
 drawmenu(void)
 {
 static void
 drawmenu(void)
 {

-       int curpos;
-       Item *item;
-       int x = 0, y = 0, h = bh, w;
+       unsigned int curpos;
+       struct item *item;
+       int x = 0, y = 0, w;

 
 

-       drw_setscheme(drw, &scheme[SchemeNorm]);
-       drw_rect(drw, 0, 0, mw, mh, 1, 1, 1);
+       drw_setscheme(drw, scheme[SchemeNorm]);
+       drw_rect(drw, 0, 0, mw, mh, 1, 1);

 
        if (prompt && *prompt) {
 
        if (prompt && *prompt) {

-               drw_setscheme(drw, &scheme[SchemeSel]);
-               drw_text(drw, x, 0, promptw, bh, prompt, 0);
-               x += promptw;
+               drw_setscheme(drw, scheme[SchemeSel]);
+               x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);

        }
        /* draw input field */
        w = (lines > 0 || !matches) ? mw - x : inputw;
        }
        /* draw input field */
        w = (lines > 0 || !matches) ? mw - x : inputw;

-       drw_setscheme(drw, &scheme[SchemeNorm]);
-       drw_text(drw, x, 0, w, bh, text, 0);
+       drw_setscheme(drw, scheme[SchemeNorm]);
+       drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);

 
 

-       if ((curpos = TEXTNW(text, cursor) + bh / 2 - 2) < w) {
-               drw_setscheme(drw, &scheme[SchemeNorm]);
-               drw_rect(drw, x + curpos + 2, 2, 1, bh - 4, 1, 1, 0);
+       curpos = TEXTW(text) - TEXTW(&text[cursor]);
+       if ((curpos += lrpad / 2 - 1) < w) {
+               drw_setscheme(drw, scheme[SchemeNorm]);
+               drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);

        }
 
        if (lines > 0) {
                /* draw vertical list */
        }
 
        if (lines > 0) {
                /* draw vertical list */

-               w = mw - x;
-               for (item = curr; item != next; item = item->right) {
-                       y += h;
-                       if (item == sel)
-                               drw_setscheme(drw, &scheme[SchemeSel]);
-                       else if (item->out)
-                               drw_setscheme(drw, &scheme[SchemeOut]);
-                       else
-                               drw_setscheme(drw, &scheme[SchemeNorm]);
-
-                       drw_text(drw, x, y, w, bh, item->text, 0);
-               }
+               for (item = curr; item != next; item = item->right)
+                       drawitem(item, x, y += bh, mw - x);

        } else if (matches) {
                /* draw horizontal list */
                x += inputw;
                w = TEXTW("<");
                if (curr->left) {
        } else if (matches) {
                /* draw horizontal list */
                x += inputw;
                w = TEXTW("<");
                if (curr->left) {

-                       drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, "<", 0);
-               }
-               for (item = curr; item != next; item = item->right) {
-                       x += w;
-                       w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
-
-                       if (item == sel)
-                               drw_setscheme(drw, &scheme[SchemeSel]);
-                       else if (item->out)
-                               drw_setscheme(drw, &scheme[SchemeOut]);
-                       else
-                               drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, item->text, 0);
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);

                }
                }

-               w = TEXTW(">");
-               x = mw - w;
+               x += w;
+               for (item = curr; item != next; item = item->right)
+                       x = drawitem(item, x, 0, textw_clamp(item->text, mw - x - TEXTW(">")));

                if (next) {
                if (next) {

-                       drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, ">", 0);
+                       w = TEXTW(">");
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);

                }
        }
        drw_map(drw, win, 0, 0, mw, mh);
 }
 
                }
        }
        drw_map(drw, win, 0, 0, mw, mh);
 }
 

+static void
+grabfocus(void)
+{
+       struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000  };
+       Window focuswin;
+       int i, revertwin;
+
+       for (i = 0; i < 100; ++i) {
+               XGetInputFocus(dpy, &focuswin, &revertwin);
+               if (focuswin == win)
+                       return;
+               XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
+               nanosleep(&ts, NULL);
+       }
+       die("cannot grab focus");
+}
+

 static void
 grabkeyboard(void)
 {
        struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
        int i;
 
 static void
 grabkeyboard(void)
 {
        struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
        int i;
 

+       if (embed)
+               return;

        /* try to grab keyboard, we may have to wait for another process to ungrab */
        for (i = 0; i < 1000; i++) {
        /* try to grab keyboard, we may have to wait for another process to ungrab */
        for (i = 0; i < 1000; i++) {

-               if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True,
-                                GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
+               if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
+                                 GrabModeAsync, CurrentTime) == GrabSuccess)

                        return;
                nanosleep(&ts, NULL);
        }
                        return;
                nanosleep(&ts, NULL);
        }

-       die("cannot grab keyboard\n");
+       die("cannot grab keyboard");
+}
+
+static void
+match(void)
+{
+       static char **tokv = NULL;
+       static int tokn = 0;
+
+       char buf[sizeof text], *s;
+       int i, tokc = 0;
+       size_t len, textsize;
+       struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+
+       strcpy(buf, text);
+       /* separate input text into tokens to be matched individually */
+       for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
+               if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
+                       die("cannot realloc %u bytes:", tokn * sizeof *tokv);
+       len = tokc ? strlen(tokv[0]) : 0;
+
+       matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+       textsize = strlen(text) + 1;
+       for (item = items; item && item->text; item++) {
+               for (i = 0; i < tokc; i++)
+                       if (!fstrstr(item->text, tokv[i]))
+                               break;
+               if (i != tokc) /* not all tokens match */
+                       continue;
+               /* exact matches go first, then prefixes, then substrings */
+               if (!tokc || !fstrncmp(text, item->text, textsize))
+                       appenditem(item, &matches, &matchend);
+               else if (!fstrncmp(tokv[0], item->text, len))
+                       appenditem(item, &lprefix, &prefixend);
+               else
+                       appenditem(item, &lsubstr, &substrend);
+       }
+       if (lprefix) {
+               if (matches) {
+                       matchend->right = lprefix;
+                       lprefix->left = matchend;
+               } else
+                       matches = lprefix;
+               matchend = prefixend;
+       }
+       if (lsubstr) {
+               if (matches) {
+                       matchend->right = lsubstr;
+                       lsubstr->left = matchend;
+               } else
+                       matches = lsubstr;
+               matchend = substrend;
+       }
+       curr = sel = matches;
+       calcoffsets();

 }
 
 static void
 }
 
 static void


@@ -229,18 +291,53 @@ insert(const char *str, ssize_t n)
        match();
 }
 
        match();
 }
 

+static size_t
+nextrune(int inc)
+{
+       ssize_t n;
+
+       /* return location of next utf8 rune in the given direction (+1 or -1) */
+       for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
+               ;
+       return n;
+}
+
+static void
+movewordedge(int dir)
+{
+       if (dir < 0) { /* move cursor to the start of the word*/
+               while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
+                       cursor = nextrune(-1);
+               while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
+                       cursor = nextrune(-1);
+       } else { /* move cursor to the end of the word */
+               while (text[cursor] && strchr(worddelimiters, text[cursor]))
+                       cursor = nextrune(+1);
+               while (text[cursor] && !strchr(worddelimiters, text[cursor]))
+                       cursor = nextrune(+1);
+       }
+}
+

 static void
 keypress(XKeyEvent *ev)
 {
        char buf[32];
        int len;
 static void
 keypress(XKeyEvent *ev)
 {
        char buf[32];
        int len;

-       KeySym ksym = NoSymbol;
+       KeySym ksym;

        Status status;
 
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
        Status status;
 
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);

-       if (status == XBufferOverflow)
+       switch (status) {
+       default: /* XLookupNone, XBufferOverflow */

                return;
                return;

-       if (ev->state & ControlMask)
+       case XLookupChars:
+               goto insert;
+       case XLookupKeySym:
+       case XLookupBoth:
+               break;
+       }
+
+       if (ev->state & ControlMask) {

                switch(ksym) {
                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;
                switch(ksym) {
                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;


@@ -266,15 +363,24 @@ keypress(XKeyEvent *ev)
                        insert(NULL, 0 - cursor);
                        break;
                case XK_w: /* delete word */
                        insert(NULL, 0 - cursor);
                        break;
                case XK_w: /* delete word */

-                       while (cursor > 0 && text[nextrune(-1)] == ' ')
+                       while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))

                                insert(NULL, nextrune(-1) - cursor);
                                insert(NULL, nextrune(-1) - cursor);

-                       while (cursor > 0 && text[nextrune(-1)] != ' ')
+                       while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))

                                insert(NULL, nextrune(-1) - cursor);
                        break;
                case XK_y: /* paste selection */
                                insert(NULL, nextrune(-1) - cursor);
                        break;
                case XK_y: /* paste selection */

+               case XK_Y:

                        XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
                                          utf8, utf8, win, CurrentTime);
                        return;
                        XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
                                          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:
                case XK_KP_Enter:
                        break;
                case XK_Return:
                case XK_KP_Enter:
                        break;


@@ -284,8 +390,14 @@ keypress(XKeyEvent *ev)
                default:
                        return;
                }
                default:
                        return;
                }

-       else if (ev->state & Mod1Mask)
+       } else if (ev->state & Mod1Mask) {

                switch(ksym) {
                switch(ksym) {

+               case XK_b:
+                       movewordedge(-1);
+                       goto draw;
+               case XK_f:
+                       movewordedge(+1);
+                       goto draw;

                case XK_g: ksym = XK_Home;  break;
                case XK_G: ksym = XK_End;   break;
                case XK_h: ksym = XK_Up;    break;
                case XK_g: ksym = XK_Home;  break;
                case XK_G: ksym = XK_End;   break;
                case XK_h: ksym = XK_Up;    break;


@@ -295,12 +407,16 @@ keypress(XKeyEvent *ev)
                default:
                        return;
                }
                default:
                        return;
                }

+       }
+

        switch(ksym) {
        default:
        switch(ksym) {
        default:

+insert:

                if (!iscntrl(*buf))
                        insert(buf, len);
                break;
        case XK_Delete:
                if (!iscntrl(*buf))
                        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);


@@ -311,6 +427,7 @@ keypress(XKeyEvent *ev)
                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;


@@ -330,6 +447,7 @@ keypress(XKeyEvent *ev)
                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;


@@ -338,6 +456,7 @@ keypress(XKeyEvent *ev)
                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;


@@ -346,18 +465,21 @@ keypress(XKeyEvent *ev)
                        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;


@@ -371,9 +493,10 @@ keypress(XKeyEvent *ev)
                        exit(0);
                }
                if (sel)
                        exit(0);
                }
                if (sel)

-                       sel->out = true;
+                       sel->out = 1;

                break;
        case XK_Right:
                break;
        case XK_Right:

+       case XK_KP_Right:

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


@@ -382,6 +505,7 @@ keypress(XKeyEvent *ev)
                        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();


@@ -396,71 +520,9 @@ keypress(XKeyEvent *ev)
                match();
                break;
        }
                match();
                break;
        }

-       drawmenu();
-}

 
 

-static void
-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);
-       /* separate input text into tokens to be matched individually */
-       for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
-               if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
-                       die("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) /* not all tokens match */
-                       continue;
-               /* exact matches go first, then prefixes, then substrings */
-               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
-                       appenditem(item, &lsubstr, &substrend);
-       }
-       if (lprefix) {
-               if (matches) {
-                       matchend->right = lprefix;
-                       lprefix->left = matchend;
-               } else
-                       matches = lprefix;
-               matchend = prefixend;
-       }
-       if (lsubstr) {
-               if (matches) {
-                       matchend->right = lsubstr;
-                       lsubstr->left = matchend;
-               } else
-                       matches = lsubstr;
-               matchend = substrend;
-       }
-       curr = sel = matches;
-       calcoffsets();
-}
-
-static size_t
-nextrune(int inc)
-{
-       ssize_t n;
-
-       /* return location of next utf8 rune in the given direction (+1 or -1) */
-       for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
-               ;
-       return n;
+draw:
+       drawmenu();

 }
 
 static void
 }
 
 static void


@@ -472,18 +534,20 @@ paste(void)
        Atom da;
 
        /* we have been given the current selection, now insert it into input */
        Atom da;
 
        /* we have been given the current selection, now insert it into input */

-       XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
-                          utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
-       insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
-       XFree(p);
+       if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
+                          utf8, &da, &di, &dl, &dl, (unsigned char **)&p)
+           == Success && p) {
+               insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
+               XFree(p);
+       }

        drawmenu();
 }
 
 static void
 readstdin(void)
 {
        drawmenu();
 }
 
 static void
 readstdin(void)
 {

-       char buf[sizeof text], *p, *maxstr = NULL;
-       size_t i, max = 0, size = 0;
+       char buf[sizeof text], *p;
+       size_t i, size = 0;

 
        /* read each line from stdin and add it to the item list */
        for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
 
        /* read each line from stdin and add it to the item list */
        for (i = 0; fgets(buf, sizeof buf, stdin); i++) {


@@ -494,13 +558,10 @@ readstdin(void)
                        *p = '\0';
                if (!(items[i].text = strdup(buf)))
                        die("cannot strdup %u bytes:", strlen(buf) + 1);
                        *p = '\0';
                if (!(items[i].text = strdup(buf)))
                        die("cannot strdup %u bytes:", strlen(buf) + 1);

-               items[i].out = false;
-               if (strlen(items[i].text) > max)
-                       max = strlen(maxstr = items[i].text);
+               items[i].out = 0;

        }
        if (items)
                items[i].text = NULL;
        }
        if (items)
                items[i].text = NULL;

-       inputw = maxstr ? TEXTW(maxstr) : 0;

        lines = MIN(lines, i);
 }
 
        lines = MIN(lines, i);
 }
 


@@ -513,10 +574,20 @@ run(void)
                if (XFilterEvent(&ev, win))
                        continue;
                switch(ev.type) {
                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);
                        break;
                case Expose:
                        if (ev.xexpose.count == 0)
                                drw_map(drw, win, 0, 0, mw, mh);
                        break;

+               case FocusIn:
+                       /* regrab focus from parent window */
+                       if (ev.xfocus.window != win)
+                               grabfocus();
+                       break;

                case KeyPress:
                        keypress(&ev.xkey);
                        break;
                case KeyPress:
                        keypress(&ev.xkey);
                        break;


@@ -535,38 +606,37 @@ run(void)
 static void
 setup(void)
 {
 static void
 setup(void)
 {

-       int x, y;
+       int x, y, i, j;
+       unsigned int du, tmp;

        XSetWindowAttributes swa;
        XIM xim;
        XSetWindowAttributes swa;
        XIM xim;

+       Window w, dw, *dws;
+       XWindowAttributes wa;
+       XClassHint ch = {"dmenu", "dmenu"};
+       struct item *item;

 #ifdef XINERAMA
        XineramaScreenInfo *info;
 #ifdef XINERAMA
        XineramaScreenInfo *info;

-       Window w, pw, dw, *dws;
-       XWindowAttributes wa;
-       int a, j, di, n, i = 0, area = 0;
-       unsigned int du;
+       Window pw;
+       int a, di, n, area = 0;

 #endif
 #endif

-

        /* init appearance */
        /* init appearance */

-       scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
-       scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
-       scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
-       scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
-       scheme[SchemeOut].bg = drw_clr_create(drw, outbgcolor);
-       scheme[SchemeOut].fg = drw_clr_create(drw, outfgcolor);
+       for (j = 0; j < SchemeLast; j++)
+               scheme[j] = drw_scm_create(drw, colors[j], 2);

 
        clip = XInternAtom(dpy, "CLIPBOARD",   False);
        utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
        /* calculate menu geometry */
 
        clip = XInternAtom(dpy, "CLIPBOARD",   False);
        utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
        /* calculate menu geometry */

-       bh = drw->fonts[0]->h + 2;
+       bh = drw->fonts->h + 2;

        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA

-       if ((info = XineramaQueryScreens(dpy, &n))) {
+       i = 0;
+       if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {

                XGetInputFocus(dpy, &w, &di);
                XGetInputFocus(dpy, &w, &di);

-               if (mon != -1 && mon < n)
+               if (mon >= 0 && mon < n)

                        i = mon;
                        i = mon;

-               if (!i && w != root && w != PointerRoot && w != None) {
+               else if (w != root && w != PointerRoot && w != None) {

                        /* find top-level window containing current input focus */
                        do {
                                if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
                        /* find top-level window containing current input focus */
                        do {
                                if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)


@@ -581,9 +651,9 @@ setup(void)
                                        }
                }
                /* no focused window is on screen, so use pointer location instead */
                                        }
                }
                /* no focused window is on screen, so use pointer location instead */

-               if (mon == -1 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+               if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))

                        for (i = 0; i < n; i++)
                        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;
                                        break;
 
                x = info[i].x_org;


@@ -593,29 +663,49 @@ setup(void)
        } else
 #endif
        {
        } else
 #endif
        {

+               if (!XGetWindowAttributes(dpy, parentwin, &wa))
+                       die("could not get embedding window attributes: 0x%lx",
+                           parentwin);

                x = 0;
                x = 0;

-               y = topbar ? 0 : sh - mh;
-               mw = sw;
+               y = topbar ? 0 : wa.height - mh;
+               mw = wa.width;
+       }
+       promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
+       for (item = items; item && item->text; ++item) {
+               if ((tmp = textw_clamp(item->text, mw/3)) > inputw) {
+                       if ((inputw = tmp) == mw/3)
+                               break;
+               }

        }
        }

-       promptw = (prompt && *prompt) ? TEXTW(prompt) : 0;
-       inputw = MIN(inputw, mw/3);

        match();
 
        /* create menu window */
        swa.override_redirect = True;
        match();
 
        /* create menu window */
        swa.override_redirect = True;

-       swa.background_pixel = scheme[SchemeNorm].bg->pix;
+       swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;

        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;

-       win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
-                           DefaultDepth(dpy, screen), CopyFromParent,
-                           DefaultVisual(dpy, screen),
+       win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
+                           CopyFromParent, CopyFromParent, CopyFromParent,

                            CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
                            CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);

+       XSetClassHint(dpy, win, &ch);
+
+
+       /* input methods */
+       if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
+               die("XOpenIM failed: could not open input device");

 
 

-       /* open input methods */
-       xim = XOpenIM(dpy, NULL, NULL, NULL);

        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);

+       if (embed) {
+               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);
+                       XFree(dws);
+               }
+               grabfocus();
+       }

        drw_resize(drw, mw, mh);
        drawmenu();
 }
        drw_resize(drw, mw, mh);
        drawmenu();
 }


@@ -623,26 +713,26 @@ setup(void)
 static void
 usage(void)
 {
 static void
 usage(void)
 {

-       fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
-             "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+       fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+             "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);

        exit(1);
 }
 
 int
 main(int argc, char *argv[])
 {
        exit(1);
 }
 
 int
 main(int argc, char *argv[])
 {

-       bool fast = false;
-       int i;
+       XWindowAttributes wa;
+       int i, fast = 0;

 
        for (i = 1; i < argc; i++)
                /* these options take no arguments */
                if (!strcmp(argv[i], "-v")) {      /* prints version information */
                        puts("dmenu-"VERSION);
                        exit(0);
 
        for (i = 1; i < argc; i++)
                /* these options take no arguments */
                if (!strcmp(argv[i], "-v")) {      /* prints version information */
                        puts("dmenu-"VERSION);
                        exit(0);

-               } else if (!strcmp(argv[i], "-b"))   /* appears at the bottom of the screen */
-                       topbar = false;
+               } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
+                       topbar = 0;

                else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
                else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */

-                       fast = true;
+                       fast = 1;

                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;
                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;


@@ -658,31 +748,40 @@ main(int argc, char *argv[])
                else if (!strcmp(argv[i], "-fn"))  /* font or font set */
                        fonts[0] = argv[++i];
                else if (!strcmp(argv[i], "-nb"))  /* normal background color */
                else if (!strcmp(argv[i], "-fn"))  /* font or font set */
                        fonts[0] = argv[++i];
                else if (!strcmp(argv[i], "-nb"))  /* normal background color */

-                       normbgcolor = argv[++i];
+                       colors[SchemeNorm][ColBg] = argv[++i];

                else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
                else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */

-                       normfgcolor = argv[++i];
+                       colors[SchemeNorm][ColFg] = argv[++i];

                else if (!strcmp(argv[i], "-sb"))  /* selected background color */
                else if (!strcmp(argv[i], "-sb"))  /* selected background color */

-                       selbgcolor = argv[++i];
+                       colors[SchemeSel][ColBg] = argv[++i];

                else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
                else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */

-                       selfgcolor = argv[++i];
+                       colors[SchemeSel][ColFg] = argv[++i];
+               else if (!strcmp(argv[i], "-w"))   /* embedding window id */
+                       embed = argv[++i];

                else
                        usage();
 
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
        if (!(dpy = XOpenDisplay(NULL)))
                else
                        usage();
 
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
        if (!(dpy = XOpenDisplay(NULL)))

-               die("cannot open display\n");
+               die("cannot open display");

        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);

-       sw = DisplayWidth(dpy, screen);
-       sh = DisplayHeight(dpy, screen);
-       drw = drw_create(dpy, screen, root, sw, sh);
-       drw_load_fonts(drw, fonts, LENGTH(fonts));
-       if (!drw->fontcount)
-               die("no fonts could be loaded.\n");
-       drw_setscheme(drw, &scheme[SchemeNorm]);
-
-       if (fast) {
+       if (!embed || !(parentwin = strtol(embed, NULL, 0)))
+               parentwin = root;
+       if (!XGetWindowAttributes(dpy, parentwin, &wa))
+               die("could not get embedding window attributes: 0x%lx",
+                   parentwin);
+       drw = drw_create(dpy, screen, root, wa.width, wa.height);
+       if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+               die("no fonts could be loaded.");
+       lrpad = drw->fonts->h;
+
+#ifdef __OpenBSD__
+       if (pledge("stdio rpath", NULL) == -1)
+               die("pledge");
+#endif
+
+       if (fast && !isatty(0)) {

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