Xinqi Bao's Git

projects / dmenu.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
inputw: improve correctness and startup performance
[dmenu.git] / dmenu.c
diff --git a/dmenu.c b/dmenu.c
index 12902ac..d989d39 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -4,314 +4,451 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
+#include <time.h>
 #include <unistd.h>
 #include <unistd.h>
-#include <X11/keysym.h>
-#include <X11/Xatom.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xlib.h>
+#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#include <draw.h>
-#include "config.h"
+#include <X11/Xft/Xft.h>
+
+#include "drw.h"
+#include "util.h"
 
 
-#define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
-#define MIN(a,b)                ((a) < (b) ? (a) : (b))
-#define MAX(a,b)                ((a) > (b) ? (a) : (b))
-#define UTF8_CODEPOINT(c)       (((c) & 0xc0) != 0x80)
+/* macros */
+#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 TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)
 
 
-typedef struct Item Item;
-struct Item {
+/* enums */
+enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
+
+struct item {
        char *text;
        char *text;
-       Item *next;          /* traverses all items */
-       Item *left, *right;  /* traverses matching items */
+       struct item *left, *right;
+       int out;
 };
 
 };
 
-static void appenditem(Item *item, Item **list, Item **last);
-static void calcoffsetsh(void);
-static void calcoffsetsv(void);
-static char *cistrstr(const char *s, const char *sub);
-static void drawmenu(void);
-static void drawmenuh(void);
-static void drawmenuv(void);
-static void grabkeyboard(void);
-static void insert(const char *s, ssize_t n);
-static void keypress(XKeyEvent *e);
-static void match(void);
-static void paste(Atom atom);
-static void readstdin(void);
-static void run(void);
-static void setup(void);
-static void usage(void);
-
-static char *prompt;
-static char text[4096];
-static int screen;
-static size_t cursor = 0;
-static unsigned int inputw = 0;
-static unsigned int lines = 0;
-static unsigned int mw, mh;
-static unsigned int promptw = 0;
-static unsigned long normcol[ColLast];
-static unsigned long selcol[ColLast];
-static Atom utf8;
-static Bool topbar = True;
-static DC dc;
-static Item *allitems, *matches;
-static Item *curr, *prev, *next, *sel;
-static Window root, win;
+static char text[BUFSIZ] = "";
+static char *embed;
+static int bh, mw, mh;
+static int inputw = 0, promptw;
+static int lrpad; /* sum of left and right padding */
+static size_t cursor;
+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 Window root, parentwin, win;
+static XIC xic;
+
+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;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
-static void (*calcoffsets)(void) = calcoffsetsh;
 
 
-void
-appenditem(Item *item, Item **list, Item **last) {
-       if(!(*last))
-               *list = item;
-       else
+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
+appenditem(struct item *item, struct item **list, struct item **last)
+{
+       if (*last)
                (*last)->right = item;
                (*last)->right = item;
+       else
+               *list = item;
+
        item->left = *last;
        item->right = NULL;
        *last = item;
 }
 
        item->left = *last;
        item->right = NULL;
        *last = item;
 }
 
-void
-calcoffsetsh(void) {
-       unsigned int w, x;
+static void
+calcoffsets(void)
+{
+       int i, n;
 
 
-       w = promptw + inputw + textw(&dc, "<") + textw(&dc, ">");
-       for(x = w, next = curr; next; next = next->right)
-               if((x += MIN(textw(&dc, next->text), mw / 3)) > mw)
+       if (lines > 0)
+               n = lines * bh;
+       else
+               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 : textw_clamp(next->text, n)) > n)
                        break;
                        break;
-       for(x = w, prev = curr; prev && prev->left; prev = prev->left)
-               if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
+       for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
+               if ((i += (lines > 0) ? bh : textw_clamp(prev->left->text, n)) > n)
                        break;
 }
 
                        break;
 }
 
-void
-calcoffsetsv(void) {
-       unsigned int i;
-
-       next = prev = curr;
-       for(i = 0; i < lines && next; i++)
-               next = next->right;
-       mh = (dc.font.height + 2) * (i + 1);
-       for(i = 0; i < lines && prev && prev->left; i++)
-               prev = prev->left;
+static void
+cleanup(void)
+{
+       size_t i;
+
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       for (i = 0; i < SchemeLast; i++)
+               free(scheme[i]);
+       drw_free(drw);
+       XSync(dpy, False);
+       XCloseDisplay(dpy);
 }
 
 }
 
-char *
-cistrstr(const char *s, const char *sub) {
-       int c, csub;
-       unsigned int len;
+static char *
+cistrstr(const char *h, const char *n)
+{
+       size_t i;
 
 
-       if(!sub)
-               return (char *)s;
-       if((c = tolower(*sub++)) != '\0') {
-               len = strlen(sub);
-               do {
-                       do {
-                               if((csub = *s++) == '\0')
-                                       return NULL;
-                       }
-                       while(tolower(csub) != c);
-               }
-               while(strncasecmp(s, sub, len) != 0);
-               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 (char *)s;
+       return NULL;
 }
 
 }
 
-void
-drawmenu(void) {
-       dc.x = 0;
-       dc.y = 0;
-       dc.w = mw;
-       dc.h = mh;
-       drawbox(&dc, normcol);
-       dc.h = dc.font.height + 2;
-       dc.y = topbar ? 0 : mh - dc.h;
-       /* print prompt? */
-       if(prompt) {
-               dc.w = promptw;
-               drawbox(&dc, selcol);
-               drawtext(&dc, prompt, selcol);
-               dc.x += dc.w;
-       }
-       dc.w = mw - dc.x;
-       /* print input area */
-       if(matches && lines == 0 && textw(&dc, text) <= inputw)
-               dc.w = inputw;
-       drawtext(&dc, text, normcol);
-       drawline(&dc, textnw(&dc, text, cursor) + dc.h/2 - 2, 2, 1, dc.h-4, normcol);
-       if(lines > 0)
-               drawmenuv();
-       else if(curr && (dc.w == inputw || curr->next))
-               drawmenuh();
-       commitdraw(&dc, win);
+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);
 }
 
 }
 
-void
-drawmenuh(void) {
-       Item *item;
-
-       dc.x += inputw;
-       dc.w = textw(&dc, "<");
-       if(curr->left)
-               drawtext(&dc, "<", normcol);
-       dc.x += dc.w;
-       for(item = curr; item != next; item = item->right) {
-               dc.w = MIN(textw(&dc, item->text), mw / 3);
-               if(item == sel)
-                       drawbox(&dc, selcol);
-               drawtext(&dc, item->text, (item == sel) ? selcol : normcol);
-               dc.x += dc.w;
+static void
+drawmenu(void)
+{
+       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);
+
+       if (prompt && *prompt) {
+               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;
+       drw_setscheme(drw, scheme[SchemeNorm]);
+       drw_text(drw, x, 0, w, bh, lrpad / 2, text, 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 */
+               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) {
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);
+               }
+               x += w;
+               for (item = curr; item != next; item = item->right)
+                       x = drawitem(item, x, 0, textw_clamp(item->text, mw - x - TEXTW(">")));
+               if (next) {
+                       w = TEXTW(">");
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
+               }
        }
        }
-       dc.w = textw(&dc, ">");
-       dc.x = mw - dc.w;
-       if(next)
-               drawtext(&dc, ">", normcol);
+       drw_map(drw, win, 0, 0, mw, mh);
 }
 
 }
 
-void
-drawmenuv(void) {
-       Item *item;
-       XWindowAttributes wa;
+static void
+grabfocus(void)
+{
+       struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000  };
+       Window focuswin;
+       int i, revertwin;
 
 
-       dc.y = topbar ? dc.h : 0;
-       dc.w = mw - dc.x;
-       for(item = curr; item != next; item = item->right) {
-               if(item == sel)
-                       drawbox(&dc, selcol);
-               drawtext(&dc, item->text, (item == sel) ? selcol : normcol);
-               dc.y += dc.h;
+       for (i = 0; i < 100; ++i) {
+               XGetInputFocus(dpy, &focuswin, &revertwin);
+               if (focuswin == win)
+                       return;
+               XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
+               nanosleep(&ts, NULL);
        }
        }
-       if(!XGetWindowAttributes(dc.dpy, win, &wa))
-               eprintf("cannot get window attributes\n");
-       if(wa.height != mh)
-               XMoveResizeWindow(dc.dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
+       die("cannot grab focus");
 }
 
 }
 
-void
-grabkeyboard(void) {
+static void
+grabkeyboard(void)
+{
+       struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
        int i;
 
        int i;
 
-       for(i = 0; i < 1000; i++) {
-               if(!XGrabKeyboard(dc.dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+       if (embed)
+               return;
+       /* 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)
                        return;
                        return;
-               usleep(1000);
+               nanosleep(&ts, NULL);
        }
        }
-       eprintf("cannot grab keyboard\n");
+       die("cannot grab keyboard");
 }
 
 }
 
-void
-insert(const char *s, ssize_t n) {
-       memmove(text + cursor + n, text + cursor, sizeof text - cursor - n);
-       if(n > 0)
-               memcpy(text + cursor, s, n);
+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
+insert(const char *str, ssize_t n)
+{
+       if (strlen(text) + n > sizeof text - 1)
+               return;
+       /* move existing text out of the way, insert new text, and update cursor */
+       memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
+       if (n > 0)
+               memcpy(&text[cursor], str, n);
        cursor += n;
        match();
 }
 
        cursor += n;
        match();
 }
 
-void
-keypress(XKeyEvent *e) {
-       char buf[sizeof text];
-       int n;
-       size_t len;
+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;
        KeySym ksym;
        KeySym ksym;
+       Status status;
+
+       len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+       switch (status) {
+       default: /* XLookupNone, XBufferOverflow */
+               return;
+       case XLookupChars:
+               goto insert;
+       case XLookupKeySym:
+       case XLookupBoth:
+               break;
+       }
 
 
-       len = strlen(text);
-       XLookupString(e, buf, sizeof buf, &ksym, NULL);
-       if(e->state & ControlMask) {
-               switch(tolower(ksym)) {
-               default:
-                       return;
-               case XK_a:
-                       ksym = XK_Home;
-                       break;
-               case XK_b:
-                       ksym = XK_Left;
-                       break;
-               case XK_c:
-                       ksym = XK_Escape;
-                       break;
-               case XK_e:
-                       ksym = XK_End;
-                       break;
-               case XK_f:
-                       ksym = XK_Right;
-                       break;
-               case XK_h:
-                       ksym = XK_BackSpace;
-                       break;
-               case XK_i:
-                       ksym = XK_Tab;
-                       break;
-               case XK_j:
-               case XK_m:
-                       ksym = XK_Return;
-                       break;
-               case XK_k:  /* delete right */
+       if (ev->state & ControlMask) {
+               switch(ksym) {
+               case XK_a: ksym = XK_Home;      break;
+               case XK_b: ksym = XK_Left;      break;
+               case XK_c: ksym = XK_Escape;    break;
+               case XK_d: ksym = XK_Delete;    break;
+               case XK_e: ksym = XK_End;       break;
+               case XK_f: ksym = XK_Right;     break;
+               case XK_g: ksym = XK_Escape;    break;
+               case XK_h: ksym = XK_BackSpace; break;
+               case XK_i: ksym = XK_Tab;       break;
+               case XK_j: /* fallthrough */
+               case XK_J: /* fallthrough */
+               case XK_m: /* fallthrough */
+               case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break;
+               case XK_n: ksym = XK_Down;      break;
+               case XK_p: ksym = XK_Up;        break;
+
+               case XK_k: /* delete right */
                        text[cursor] = '\0';
                        text[cursor] = '\0';
+                       match();
                        break;
                        break;
-               case XK_n:
-                       ksym = XK_Down;
-                       break;
-               case XK_p:
-                       ksym = XK_Up;
+               case XK_u: /* delete left */
+                       insert(NULL, 0 - cursor);
                        break;
                        break;
-               case XK_u:  /* delete left */
-                       insert(NULL, -cursor);
+               case XK_w: /* delete word */
+                       while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
+                               insert(NULL, nextrune(-1) - cursor);
+                       while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
+                               insert(NULL, nextrune(-1) - cursor);
                        break;
                        break;
-               case XK_w:  /* delete word */
-                       if(cursor == 0)
-                               return;
-                       n = 0;
-                       while(cursor - n++ > 0 && text[cursor - n] == ' ');
-                       while(cursor - n++ > 0 && text[cursor - n] != ' ');
-                       insert(NULL, -(--n));
+               case XK_y: /* paste selection */
+               case XK_Y:
+                       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;
                        break;
-               case XK_y:  /* paste selection */
-                       XConvertSelection(dc.dpy, XA_PRIMARY, utf8, None, win, CurrentTime);
-                       /* causes SelectionNotify event */
+               case XK_bracketleft:
+                       cleanup();
+                       exit(1);
+               default:
+                       return;
+               }
+       } else if (ev->state & Mod1Mask) {
+               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_j: ksym = XK_Next;  break;
+               case XK_k: ksym = XK_Prior; break;
+               case XK_l: ksym = XK_Down;  break;
+               default:
                        return;
                }
        }
                        return;
                }
        }
+
        switch(ksym) {
        default:
        switch(ksym) {
        default:
-               if(!iscntrl((int)*buf))
-                       insert(buf, MIN(strlen(buf), sizeof text - cursor));
-               break;
-       case XK_BackSpace:
-               if(cursor == 0)
-                       return;
-               for(n = 1; cursor - n > 0 && !UTF8_CODEPOINT(text[cursor - n]); n++);
-               insert(NULL, -n);
+insert:
+               if (!iscntrl(*buf))
+                       insert(buf, len);
                break;
        case XK_Delete:
                break;
        case XK_Delete:
-               if(cursor == len)
+       case XK_KP_Delete:
+               if (text[cursor] == '\0')
+                       return;
+               cursor = nextrune(+1);
+               /* fallthrough */
+       case XK_BackSpace:
+               if (cursor == 0)
                        return;
                        return;
-               for(n = 1; cursor + n < len && !UTF8_CODEPOINT(text[cursor + n]); n++);
-               cursor += n;
-               insert(NULL, -n);
+               insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:
                break;
        case XK_End:
-               if(cursor < len) {
-                       cursor = len;
+       case XK_KP_End:
+               if (text[cursor] != '\0') {
+                       cursor = strlen(text);
                        break;
                }
                        break;
                }
-               while(next) {
-                       sel = curr = next;
+               if (next) {
+                       /* jump to end of list and position items in reverse */
+                       curr = matchend;
                        calcoffsets();
                        calcoffsets();
+                       curr = prev;
+                       calcoffsets();
+                       while (next && (curr = curr->right))
+                               calcoffsets();
                }
                }
-               while(sel && sel->right)
-                       sel = sel->right;
+               sel = matchend;
                break;
        case XK_Escape:
                break;
        case XK_Escape:
-               exit(EXIT_FAILURE);
+               cleanup();
+               exit(1);
        case XK_Home:
        case XK_Home:
-               if(sel == matches) {
+       case XK_KP_Home:
+               if (sel == matches) {
                        cursor = 0;
                        break;
                }
                        cursor = 0;
                        break;
                }
@@ -319,282 +456,340 @@ keypress(XKeyEvent *e) {
                calcoffsets();
                break;
        case XK_Left:
                calcoffsets();
                break;
        case XK_Left:
-               if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
-                       while(cursor-- > 0 && !UTF8_CODEPOINT(text[cursor]));
+       case XK_KP_Left:
+               if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
+                       cursor = nextrune(-1);
                        break;
                }
                        break;
                }
-               else if(lines > 0)
+               if (lines > 0)
                        return;
                        return;
+               /* fallthrough */
        case XK_Up:
        case XK_Up:
-               if(!sel || !sel->left)
-                       return;
-               sel = sel->left;
-               if(sel->right == curr) {
+       case XK_KP_Up:
+               if (sel && sel->left && (sel = sel->left)->right == curr) {
                        curr = prev;
                        calcoffsets();
                }
                break;
        case XK_Next:
                        curr = prev;
                        calcoffsets();
                }
                break;
        case XK_Next:
-               if(!next)
+       case XK_KP_Next:
+               if (!next)
                        return;
                sel = curr = next;
                calcoffsets();
                break;
        case XK_Prior:
                        return;
                sel = curr = next;
                calcoffsets();
                break;
        case XK_Prior:
-               if(!prev)
+       case XK_KP_Prior:
+               if (!prev)
                        return;
                sel = curr = prev;
                calcoffsets();
                break;
        case XK_Return:
        case XK_KP_Enter:
                        return;
                sel = curr = prev;
                calcoffsets();
                break;
        case XK_Return:
        case XK_KP_Enter:
-               fputs(((e->state & ShiftMask) || sel) ? sel->text : text, stdout);
-               fflush(stdout);
-               exit(EXIT_SUCCESS);
+               puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+               if (!(ev->state & ControlMask)) {
+                       cleanup();
+                       exit(0);
+               }
+               if (sel)
+                       sel->out = 1;
+               break;
        case XK_Right:
        case XK_Right:
-               if(cursor < len) {
-                       while(cursor++ < len && !UTF8_CODEPOINT(text[cursor]));
+       case XK_KP_Right:
+               if (text[cursor] != '\0') {
+                       cursor = nextrune(+1);
                        break;
                }
                        break;
                }
-               else if(lines > 0)
+               if (lines > 0)
                        return;
                        return;
+               /* fallthrough */
        case XK_Down:
        case XK_Down:
-               if(!sel || !sel->right)
-                       return;
-               sel = sel->right;
-               if(sel == next) {
+       case XK_KP_Down:
+               if (sel && sel->right && (sel = sel->right) == next) {
                        curr = next;
                        calcoffsets();
                }
                break;
        case XK_Tab:
                        curr = next;
                        calcoffsets();
                }
                break;
        case XK_Tab:
-               if(!sel)
+               if (!sel)
                        return;
                        return;
-               strncpy(text, sel->text, sizeof text);
+               strncpy(text, sel->text, sizeof text - 1);
+               text[sizeof text - 1] = '\0';
                cursor = strlen(text);
                match();
                break;
        }
                cursor = strlen(text);
                match();
                break;
        }
-       drawmenu();
-}
 
 
-void
-match(void) {
-       unsigned int len;
-       Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
-
-       len = strlen(text);
-       matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-       for(item = allitems; item; item = item->next)
-               if(!fstrncmp(text, item->text, len + 1))
-                       appenditem(item, &lexact, &exactend);
-               else if(!fstrncmp(text, item->text, len))
-                       appenditem(item, &lprefix, &prefixend);
-               else if(fstrstr(item->text, text))
-                       appenditem(item, &lsubstr, &substrend);
-       if(lexact) {
-               matches = lexact;
-               itemend = exactend;
-       }
-       if(lprefix) {
-               if(itemend) {
-                       itemend->right = lprefix;
-                       lprefix->left = itemend;
-               }
-               else
-                       matches = lprefix;
-               itemend = prefixend;
-       }
-       if(lsubstr) {
-               if(itemend) {
-                       itemend->right = lsubstr;
-                       lsubstr->left = itemend;
-               }
-               else
-                       matches = lsubstr;
-       }
-       curr = prev = next = sel = matches;
-       calcoffsets();
+draw:
+       drawmenu();
 }
 
 }
 
-void
-paste(Atom atom)
+static void
+paste(void)
 {
        char *p, *q;
        int di;
        unsigned long dl;
        Atom da;
 
 {
        char *p, *q;
        int di;
        unsigned long dl;
        Atom da;
 
-       XGetWindowProperty(dc.dpy, win, atom, 0, sizeof text - cursor, True,
-                       utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
-       insert(p, (q = strchr(p, '\n')) ? q-p : strlen(p));
-       XFree(p);
+       /* we have been given the current selection, now insert it into input */
+       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();
 }
 
        drawmenu();
 }
 
-void
-readstdin(void) {
-       char buf[sizeof text];
-       size_t len;
-       Item *item, *new;
-
-       allitems = NULL;
-       for(item = NULL; fgets(buf, sizeof buf, stdin); item = new) {
-               len = strlen(buf);
-               if(buf[len-1] == '\n')
-                       buf[--len] = '\0';
-               if(!(new = malloc(sizeof *new)))
-                       eprintf("cannot malloc %u bytes\n", sizeof *new);
-               if(!(new->text = strdup(buf)))
-                       eprintf("cannot strdup %u bytes\n", len);
-               inputw = MAX(inputw, textw(&dc, new->text));
-               new->next = new->left = new->right = NULL;
-               if(item)
-                       item->next = new;
-               else 
-                       allitems = new;
+static void
+readstdin(void)
+{
+       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++) {
+               if (i + 1 >= size / sizeof *items)
+                       if (!(items = realloc(items, (size += BUFSIZ))))
+                               die("cannot realloc %u bytes:", size);
+               if ((p = strchr(buf, '\n')))
+                       *p = '\0';
+               if (!(items[i].text = strdup(buf)))
+                       die("cannot strdup %u bytes:", strlen(buf) + 1);
+               items[i].out = 0;
        }
        }
+       if (items)
+               items[i].text = NULL;
+       lines = MIN(lines, i);
 }
 
 }
 
-void
-run(void) {
+static void
+run(void)
+{
        XEvent ev;
 
        XEvent ev;
 
-       while(!XNextEvent(dc.dpy, &ev))
+       while (!XNextEvent(dpy, &ev)) {
+               if (XFilterEvent(&ev, win))
+                       continue;
                switch(ev.type) {
                switch(ev.type) {
+               case DestroyNotify:
+                       if (ev.xdestroywindow.window != win)
+                               break;
+                       cleanup();
+                       exit(1);
                case Expose:
                case Expose:
-                       if(ev.xexpose.count == 0)
-                               drawmenu();
+                       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 SelectionNotify:
                        break;
                case KeyPress:
                        keypress(&ev.xkey);
                        break;
                case SelectionNotify:
-                       if(ev.xselection.property != None)
-                               paste(ev.xselection.property);
+                       if (ev.xselection.property == utf8)
+                               paste();
                        break;
                case VisibilityNotify:
                        break;
                case VisibilityNotify:
-                       if(ev.xvisibility.state != VisibilityUnobscured)
-                               XRaiseWindow(dc.dpy, win);
+                       if (ev.xvisibility.state != VisibilityUnobscured)
+                               XRaiseWindow(dpy, win);
                        break;
                }
                        break;
                }
+       }
 }
 
 }
 
-void
-setup(void) {
-       int x, y;
+static void
+setup(void)
+{
+       int x, y, i, j;
+       unsigned int du, tmp;
+       XSetWindowAttributes swa;
+       XIM xim;
+       Window w, dw, *dws;
+       XWindowAttributes wa;
+       XClassHint ch = {"dmenu", "dmenu"};
+       struct item *item;
 #ifdef XINERAMA
 #ifdef XINERAMA
-       int i, n;
        XineramaScreenInfo *info;
        XineramaScreenInfo *info;
+       Window pw;
+       int a, di, n, area = 0;
 #endif
 #endif
-       XSetWindowAttributes wa;
+       /* init appearance */
+       for (j = 0; j < SchemeLast; j++)
+               scheme[j] = drw_scm_create(drw, colors[j], 2);
 
 
-       normcol[ColBG] = getcolor(&dc, normbgcolor);
-       normcol[ColFG] = getcolor(&dc, normfgcolor);
-       selcol[ColBG] = getcolor(&dc, selbgcolor);
-       selcol[ColFG] = getcolor(&dc, selfgcolor);
+       clip = XInternAtom(dpy, "CLIPBOARD",   False);
+       utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
 
-       /* input window geometry */
-       mh = (dc.font.height + 2) * (lines + 1);
+       /* calculate menu geometry */
+       bh = drw->fonts->h + 2;
+       lines = MAX(lines, 0);
+       mh = (lines + 1) * bh;
 #ifdef XINERAMA
 #ifdef XINERAMA
-       if((info = XineramaQueryScreens(dc.dpy, &n))) {
-               int di;
-               unsigned int du;
-               Window dw;
-
-               XQueryPointer(dc.dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
-               for(i = 0; i < n; i++)
-                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
-                               break;
+       i = 0;
+       if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
+               XGetInputFocus(dpy, &w, &di);
+               if (mon >= 0 && mon < n)
+                       i = mon;
+               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)
+                                       XFree(dws);
+                       } while (w != root && w != pw);
+                       /* find xinerama screen with which the window intersects most */
+                       if (XGetWindowAttributes(dpy, pw, &wa))
+                               for (j = 0; j < n; j++)
+                                       if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
+                                               area = a;
+                                               i = j;
+                                       }
+               }
+               /* no focused window is on screen, so use pointer location instead */
+               if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+                       for (i = 0; i < n; i++)
+                               if (INTERSECT(x, y, 1, 1, info[i]) != 0)
+                                       break;
+
                x = info[i].x_org;
                y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
                mw = info[i].width;
                XFree(info);
                x = info[i].x_org;
                y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
                mw = info[i].width;
                XFree(info);
-       }
-       else
+       } else
 #endif
        {
 #endif
        {
+               if (!XGetWindowAttributes(dpy, parentwin, &wa))
+                       die("could not get embedding window attributes: 0x%lx",
+                           parentwin);
                x = 0;
                x = 0;
-               y = topbar ? 0 : DisplayHeight(dc.dpy, screen) - mh;
-               mw = DisplayWidth(dc.dpy, screen);
+               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;
+               }
        }
        }
-
-       /* input window */
-       wa.override_redirect = True;
-       wa.background_pixmap = ParentRelative;
-       wa.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);
-
        match();
        match();
-       grabkeyboard();
-       setupdraw(&dc, win);
-       inputw = MIN(inputw, mw / 3);
-       utf8 = XInternAtom(dc.dpy, "UTF8_STRING", False);
-       XMapRaised(dc.dpy, win);
+
+       /* create menu window */
+       swa.override_redirect = True;
+       swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
+       swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+       win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
+                           CopyFromParent, CopyFromParent, CopyFromParent,
+                           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");
+
+       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();
 }
 
 }
 
-void
-usage(void) {
-       fputs("usage: dmenu [-b] [-i] [-l <lines>] [-p <prompt>] [-fn <font>] [-nb <color>]\n"
-                     "             [-nf <color>] [-sb <color>] [-sf <color>] [-v]\n", stderr);
-       exit(EXIT_FAILURE);
+static void
+usage(void)
+{
+       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
 }
 
 int
-main(int argc, char *argv[]) {
-       int i;
-
-       progname = "dmenu";
-       for(i = 1; i < argc; i++)
-               /* 1-arg flags */
-               if(!strcmp(argv[i], "-v")) {
-                       fputs("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n", stdout);
-                       exit(EXIT_SUCCESS);
-               }
-               else if(!strcmp(argv[i], "-b"))
-                       topbar = False;
-               else if(!strcmp(argv[i], "-i")) {
+main(int argc, char *argv[])
+{
+       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);
+               } 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 */
+                       fast = 1;
+               else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;
-               }
-               else if(i == argc-1)
+               } else if (i + 1 == argc)
                        usage();
                        usage();
-               /* 2-arg flags */
-               else if(!strcmp(argv[i], "-l")) {
-                       if((lines = atoi(argv[++i])) > 0)
-                               calcoffsets = calcoffsetsv;
-               }
-               else if(!strcmp(argv[i], "-p")) {
+               /* these options take one argument */
+               else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
+                       lines = atoi(argv[++i]);
+               else if (!strcmp(argv[i], "-m"))
+                       mon = atoi(argv[++i]);
+               else if (!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
                        prompt = argv[++i];
                        prompt = argv[++i];
-                       promptw = MIN(textw(&dc, prompt), mw/5);
-               }
-               else if(!strcmp(argv[i], "-fn"))
-                       font = argv[++i];
-               else if(!strcmp(argv[i], "-nb"))
-                       normbgcolor = argv[++i];
-               else if(!strcmp(argv[i], "-nf"))
-                       normfgcolor = argv[++i];
-               else if(!strcmp(argv[i], "-sb"))
-                       selbgcolor = argv[++i];
-               else if(!strcmp(argv[i], "-sf"))
-                       selfgcolor = argv[++i];
+               else if (!strcmp(argv[i], "-fn"))  /* font or font set */
+                       fonts[0] = argv[++i];
+               else if (!strcmp(argv[i], "-nb"))  /* normal background color */
+                       colors[SchemeNorm][ColBg] = argv[++i];
+               else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
+                       colors[SchemeNorm][ColFg] = argv[++i];
+               else if (!strcmp(argv[i], "-sb"))  /* selected background color */
+                       colors[SchemeSel][ColBg] = argv[++i];
+               else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
+                       colors[SchemeSel][ColFg] = argv[++i];
+               else if (!strcmp(argv[i], "-w"))   /* embedding window id */
+                       embed = argv[++i];
                else
                        usage();
 
                else
                        usage();
 
-       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-               fputs("dmenu: warning: no locale support\n", stderr);
-       if(!(dc.dpy = XOpenDisplay(NULL)))
-               eprintf("cannot open display\n");
-       screen = DefaultScreen(dc.dpy);
-       root = RootWindow(dc.dpy, screen);
-       initfont(&dc, font);
+       if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fputs("warning: no locale support\n", stderr);
+       if (!(dpy = XOpenDisplay(NULL)))
+               die("cannot open display");
+       screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
+       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
 
 
-       readstdin();
+       if (fast && !isatty(0)) {
+               grabkeyboard();
+               readstdin();
+       } else {
+               readstdin();
+               grabkeyboard();
+       }
        setup();
        run();
 
        setup();
        run();
 
-       return EXIT_FAILURE;  /* should not reach */
+       return 1; /* unreachable */
 }
 }