Xinqi Bao's Git

projects / dmenu.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
add xim support
[dmenu.git] / dmenu.c
diff --git a/dmenu.c b/dmenu.c
index 5cb638b..6d1cdf0 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,438 +1,326 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stdlib.h>
 #include <stdio.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
+#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include <X11/Xutil.h>
-#include <X11/keysym.h>
-
-/* macros */
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
-
-/* enums */
-enum { ColFG, ColBG, ColLast };
-
-/* typedefs */
-typedef struct {
-       int x, y, w, h;
-       unsigned long norm[ColLast];
-       unsigned long sel[ColLast];
-       Drawable drawable;
-       GC gc;
-       struct {
-               XFontStruct *xfont;
-               XFontSet set;
-               int ascent;
-               int descent;
-               int height;
-       } font;
-} DC; /* draw context */
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+#include "draw.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))
 
 typedef struct Item Item;
 struct Item {
 
 typedef struct Item Item;
 struct Item {
-       Item *next;             /* traverses all items */
-       Item *left, *right;     /* traverses items matching current search pattern */
        char *text;
        char *text;
+       Item *left, *right;
 };
 
 };
 
-/* forward declarations */
-void calcoffsets(void);
-void cleanup(void);
-void drawmenu(void);
-void drawtext(const char *text, unsigned long col[ColLast]);
-void *emalloc(unsigned int size);
-void eprint(const char *errstr, ...);
-char *estrdup(const char *str);
-unsigned long getcolor(const char *colstr);
-Bool grabkeyboard(void);
-void initfont(const char *fontstr);
-void kpress(XKeyEvent * e);
-void match(char *pattern);
-void readstdin(void);
-void run(void);
-void setup(Bool bottom);
-int strido(const char *text, const char *pattern);
-unsigned int textnw(const char *text, unsigned int len);
-unsigned int textw(const char *text);
-
-#include "config.h"
-
-/* variables */
-char *font = FONT;
-char *maxname = NULL;
-char *normbg = NORMBGCOLOR;
-char *normfg = NORMFGCOLOR;
-char *prompt = NULL;
-char *selbg = SELBGCOLOR;
-char *selfg = SELFGCOLOR;
-char text[4096];
-int screen;
-int ret = 0;
-unsigned int cmdw = 0;
-unsigned int mw, mh;
-unsigned int promptw = 0;
-unsigned int nitem = 0;
-unsigned int numlockmask = 0;
-Bool running = True;
-Display *dpy;
-DC dc = {0};
-Item *allitems = NULL; /* first of all items */
-Item *item = NULL;     /* first of pattern matching items */
-Item *sel = NULL;
-Item *next = NULL;
-Item *prev = NULL;
-Item *curr = NULL;
-Window root, win;
+static void appenditem(Item *item, Item **list, Item **last);
+static void calcoffsets(void);
+static char *cistrstr(const char *s, const char *sub);
+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(void);
+static size_t nextrune(int inc);
+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 int bh, mw, mh;
+static int inputw, promptw;
+static int lines = 0;
+static size_t cursor = 0;
+static const char *font = NULL;
+static const char *prompt = NULL;
+static const char *normbgcolor = "#cccccc";
+static const char *normfgcolor = "#000000";
+static const char *selbgcolor  = "#0066ff";
+static const char *selfgcolor  = "#ffffff";
+static unsigned long normcol[ColLast];
+static unsigned long selcol[ColLast];
+static Atom utf8;
+static Bool topbar = True;
+static DC *dc;
+static Item *items = NULL;
+static Item *matches, *matchend;
+static Item *prev, *curr, *next, *sel;
+static Window win;
+static XIC xic;
+
+static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+static char *(*fstrstr)(const char *, const char *) = strstr;
 
 
-void
-calcoffsets(void) {
-       unsigned int tw, w;
+int
+main(int argc, char *argv[]) {
+       Bool fast = False;
+       int i;
 
 
-       if(!curr)
-               return;
-       w = promptw + cmdw + 2 * SPACE;
-       for(next = curr; next; next=next->right) {
-               tw = textw(next->text);
-               if(tw > mw / 3)
-                       tw = mw / 3;
-               w += tw;
-               if(w > mw)
-                       break;
-       }
-       w = promptw + cmdw + 2 * SPACE;
-       for(prev = curr; prev && prev->left; prev=prev->left) {
-               tw = textw(prev->left->text);
-               if(tw > mw / 3)
-                       tw = mw / 3;
-               w += tw;
-               if(w > mw)
-                       break;
-       }
-}
+       for(i = 1; i < argc; i++)
+               /* single flags */
+               if(!strcmp(argv[i], "-v")) {
+                       puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
+                       exit(EXIT_SUCCESS);
+               }
+               else if(!strcmp(argv[i], "-b"))
+                       topbar = False;
+               else if(!strcmp(argv[i], "-f"))
+                       fast = True;
+               else if(!strcmp(argv[i], "-i")) {
+                       fstrncmp = strncasecmp;
+                       fstrstr = cistrstr;
+               }
+               else if(i+1 == argc)
+                       usage();
+               /* double flags */
+               else if(!strcmp(argv[i], "-l"))
+                       lines = atoi(argv[++i]);
+               else if(!strcmp(argv[i], "-p"))
+                       prompt = argv[++i];
+               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
+                       usage();
 
 
-void
-cleanup(void) {
-       Item *itm;
-
-       while(allitems) {
-               itm = allitems->next;
-               free(allitems->text);
-               free(allitems);
-               allitems = itm;
-       }
-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);
-       else
-               XFreeFont(dpy, dc.font.xfont);
-       XFreePixmap(dpy, dc.drawable);
-       XFreeGC(dpy, dc.gc);
-       XDestroyWindow(dpy, win);
-       XUngrabKeyboard(dpy, CurrentTime);
-}
+       dc = initdc();
+       initfont(dc, font);
 
 
-void
-drawmenu(void) {
-       Item *i;
-
-       dc.x = 0;
-       dc.y = 0;
-       dc.w = mw;
-       dc.h = mh;
-       drawtext(NULL, dc.norm);
-       /* print prompt? */
-       if(promptw) {
-               dc.w = promptw;
-               drawtext(prompt, dc.sel);
+       if(fast) {
+               grabkeyboard();
+               readstdin();
        }
        }
-       dc.x += promptw;
-       dc.w = mw - promptw;
-       /* print command */
-       if(cmdw && item)
-               dc.w = cmdw;
-       drawtext(text[0] ? text : NULL, dc.norm);
-       dc.x += cmdw;
-       if(curr) {
-               dc.w = SPACE;
-               drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
-               dc.x += dc.w;
-               /* determine maximum items */
-               for(i = curr; i != next; i=i->right) {
-                       dc.w = textw(i->text);
-                       if(dc.w > mw / 3)
-                               dc.w = mw / 3;
-                       drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
-                       dc.x += dc.w;
-               }
-               dc.x = mw - SPACE;
-               dc.w = SPACE;
-               drawtext(next ? ">" : NULL, dc.norm);
+       else {
+               readstdin();
+               grabkeyboard();
        }
        }
-       XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
-       XFlush(dpy);
+       setup();
+       run();
+
+       return EXIT_FAILURE; /* unreachable */
 }
 
 void
 }
 
 void
-drawtext(const char *text, unsigned long col[ColLast]) {
-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       XSetForeground(dpy, dc.gc, col[ColBG]);
-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       if(!text)
-               return;
-       w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
-       memcpy(buf, text, len);
-       buf[len] = 0;
-       h = dc.font.ascent + dc.font.descent;
-       y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
-       x = dc.x + (h / 2);
-       /* shorten text if necessary */
-       while(len && (w = textnw(buf, len)) > dc.w - h)
-               buf[--len] = 0;
-       if(len < olen) {
-               if(len > 1)
-                       buf[len - 1] = '.';
-               if(len > 2)
-                       buf[len - 2] = '.';
-               if(len > 3)
-                       buf[len - 3] = '.';
-       }
-       if(w > dc.w)
-               return; /* too long */
-       XSetForeground(dpy, dc.gc, col[ColFG]);
-       if(dc.font.set)
-               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+appenditem(Item *item, Item **list, Item **last) {
+       if(*last)
+               (*last)->right = item;
        else
        else
-               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-}
-
-void *
-emalloc(unsigned int size) {
-       void *res = malloc(size);
+               *list = item;
 
 
-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", size);
-       return res;
+       item->left = *last;
+       item->right = NULL;
+       *last = item;
 }
 
 void
 }
 
 void
-eprint(const char *errstr, ...) {
-       va_list ap;
+calcoffsets(void) {
+       int i, n;
 
 
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
+       if(lines > 0)
+               n = lines * bh;
+       else
+               n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
+
+       for(i = 0, next = curr; next; next = next->right)
+               if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
+                       break;
+       for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
+               if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n)
+                       break;
 }
 
 char *
 }
 
 char *
-estrdup(const char *str) {
-       void *res = strdup(str);
+cistrstr(const char *s, const char *sub) {
+       size_t len;
 
 
-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", strlen(str));
-       return res;
+       for(len = strlen(sub); *s; s++)
+               if(!strncasecmp(s, sub, len))
+                       return (char *)s;
+       return NULL;
 }
 
 }
 
-unsigned long
-getcolor(const char *colstr) {
-       Colormap cmap = DefaultColormap(dpy, screen);
-       XColor color;
-
-       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-               eprint("error, cannot allocate color '%s'\n", colstr);
-       return color.pixel;
+void
+drawmenu(void) {
+       int curpos;
+       Item *item;
+
+       dc->x = 0;
+       dc->y = 0;
+       dc->h = bh;
+       drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
+
+       if(prompt) {
+               dc->w = promptw;
+               drawtext(dc, prompt, selcol);
+               dc->x = dc->w;
+       }
+       dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
+       drawtext(dc, text, normcol);
+       if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+               drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
+
+       if(lines > 0) {
+               dc->w = mw - dc->x;
+               for(item = curr; item != next; item = item->right) {
+                       dc->y += dc->h;
+                       drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+               }
+       }
+       else if(matches) {
+               dc->x += inputw;
+               dc->w = textw(dc, "<");
+               if(curr->left)
+                       drawtext(dc, "<", normcol);
+               for(item = curr; item != next; item = item->right) {
+                       dc->x += dc->w;
+                       dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">"));
+                       drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+               }
+               dc->w = textw(dc, ">");
+               dc->x = mw - dc->w;
+               if(next)
+                       drawtext(dc, ">", normcol);
+       }
+       mapdc(dc, win, mw, mh);
 }
 
 }
 
-Bool
+void
 grabkeyboard(void) {
 grabkeyboard(void) {
-       unsigned int len;
+       int i;
 
 
-       for(len = 1000; len; len--) {
-               if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-                       == GrabSuccess)
-                       break;
+       for(i = 0; i < 1000; i++) {
+               if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
+                                GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
+                       return;
                usleep(1000);
        }
                usleep(1000);
        }
-       return len > 0;
+       eprintf("cannot grab keyboard\n");
 }
 
 void
 }
 
 void
-initfont(const char *fontstr) {
-       char *def, **missing;
-       int i, n;
-
-       if(!fontstr || fontstr[0] == '\0')
-               eprint("error, cannot load font: '%s'\n", fontstr);
-       missing = NULL;
-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);
-       dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-       if(missing)
-               XFreeStringList(missing);
-       if(dc.font.set) {
-               XFontSetExtents *font_extents;
-               XFontStruct **xfonts;
-               char **font_names;
-               dc.font.ascent = dc.font.descent = 0;
-               font_extents = XExtentsOfFontSet(dc.font.set);
-               n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-                       if(dc.font.ascent < (*xfonts)->ascent)
-                               dc.font.ascent = (*xfonts)->ascent;
-                       if(dc.font.descent < (*xfonts)->descent)
-                               dc.font.descent = (*xfonts)->descent;
-                       xfonts++;
-               }
-       }
-       else {
-               if(dc.font.xfont)
-                       XFreeFont(dpy, dc.font.xfont);
-               dc.font.xfont = NULL;
-               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-               && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
-                       eprint("error, cannot load font: '%s'\n", fontstr);
-               dc.font.ascent = dc.font.xfont->ascent;
-               dc.font.descent = dc.font.xfont->descent;
-       }
-       dc.font.height = dc.font.ascent + dc.font.descent;
+insert(const char *str, ssize_t n) {
+       if(strlen(text) + n > sizeof text - 1)
+               return;
+       memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
+       if(n > 0)
+               memcpy(&text[cursor], str, n);
+       cursor += n;
+       match();
 }
 
 void
 }
 
 void
-kpress(XKeyEvent * e) {
+keypress(XKeyEvent *ev) {
        char buf[32];
        char buf[32];
-       int i, num;
-       unsigned int len;
        KeySym ksym;
        KeySym ksym;
-
-       len = strlen(text);
-       buf[0] = 0;
-       num = XLookupString(e, buf, sizeof buf, &ksym, 0);
-       if(IsKeypadKey(ksym)) { 
-               if(ksym == XK_KP_Enter) {
-                       ksym = XK_Return;
-               } else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) {
-                       ksym = (ksym - XK_KP_0) + XK_0;
-               }
-       }
-       if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
-                       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
-                       || IsPrivateKeypadKey(ksym))
-               return;
-       /* first check if a control mask is omitted */
-       if(e->state & ControlMask) {
-               switch (ksym) {
-               default:        /* ignore other control sequences */
-                       return;
-               case XK_bracketleft:
-                       ksym = XK_Escape;
-                       break;
-               case XK_h:
-               case XK_H:
-                       ksym = XK_BackSpace;
+       int len;
+       Status status;
+
+       len = XmbLookupString(xic, ev, buf, sizeof(buf), &ksym, &status);
+       if(ev->state & ControlMask) {
+               KeySym lower, upper;
+
+               XConvertCase(ksym, &lower, &upper);
+               switch(lower) {
+               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_h: ksym = XK_BackSpace; break;
+               case XK_i: ksym = XK_Tab;       break;
+               case XK_j: ksym = XK_Return;    break;
+               case XK_m: ksym = XK_Return;    break;
+               case XK_n: ksym = XK_Up;        break;
+               case XK_p: ksym = XK_Down;      break;
+
+               case XK_k: /* delete right */
+                       text[cursor] = '\0';
+                       match();
                        break;
                        break;
-               case XK_i:
-               case XK_I:
-                       ksym = XK_Tab;
+               case XK_u: /* delete left */
+                       insert(NULL, 0 - cursor);
                        break;
                        break;
-               case XK_j:
-               case XK_J:
-                       ksym = XK_Return;
+               case XK_w: /* delete word */
+                       while(cursor > 0 && text[nextrune(-1)] == ' ')
+                               insert(NULL, nextrune(-1) - cursor);
+                       while(cursor > 0 && text[nextrune(-1)] != ' ')
+                               insert(NULL, nextrune(-1) - cursor);
                        break;
                        break;
-               case XK_u:
-               case XK_U:
-                       text[0] = 0;
-                       match(text);
-                       drawmenu();
+               case XK_y: /* paste selection */
+                       XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
                        return;
                        return;
-               case XK_w:
-               case XK_W:
-                       if(len) {
-                               i = len - 1;
-                               while(i >= 0 && text[i] == ' ')
-                                       text[i--] = 0;
-                               while(i >= 0 && text[i] != ' ')
-                                       text[i--] = 0;
-                               match(text);
-                               drawmenu();
-                       }
+               default:
                        return;
                }
        }
                        return;
                }
        }
-       if(CLEANMASK(e->state) & Mod1Mask) {
-               switch(ksym) {
-               default: return;
-               case XK_h:
-                       ksym = XK_Left;
-                       break;
-               case XK_l:
-                       ksym = XK_Right;
-                       break;
-               case XK_j:
-                       ksym = XK_Next;
-                       break;
-               case XK_k:
-                       ksym = XK_Prior;
-                       break;
-               case XK_g:
-                       ksym = XK_Home;
-                       break;
-               case XK_G:
-                       ksym = XK_End;
-                       break;
-               }
-       }
        switch(ksym) {
        default:
        switch(ksym) {
        default:
-               if(num && !iscntrl((int) buf[0])) {
-                       buf[num] = 0;
-                       if(len > 0)
-                               strncat(text, buf, sizeof text);
-                       else
-                               strncpy(text, buf, sizeof text);
-                       match(text);
-               }
+               if(!iscntrl(*buf))
+                       insert(buf, len);
                break;
                break;
+       case XK_Delete:
+               if(text[cursor] == '\0')
+                       return;
+               cursor = nextrune(+1);
+               /* fallthrough */
        case XK_BackSpace:
        case XK_BackSpace:
-               if(len) {
-                       text[--len] = 0;
-                       match(text);
-               }
+               if(cursor == 0)
+                       return;
+               insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:
                break;
        case XK_End:
-               if(!item)
-                       return;
-               while(next) {
-                       sel = curr = next;
+               if(text[cursor] != '\0') {
+                       cursor = strlen(text);
+                       break;
+               }
+               if(next) {
+                       curr = matchend;
+                       calcoffsets();
+                       curr = prev;
                        calcoffsets();
                        calcoffsets();
+                       while(next && (curr = curr->right))
+                               calcoffsets();
                }
                }
-               while(sel && sel->right)
-                       sel = sel->right;
+               sel = matchend;
                break;
        case XK_Escape:
                break;
        case XK_Escape:
-               ret = 1;
-               running = False;
-               break;
+               exit(EXIT_FAILURE);
        case XK_Home:
        case XK_Home:
-               if(!item)
-                       return;
-               sel = curr = item;
+               if(sel == matches) {
+                       cursor = 0;
+                       break;
+               }
+               sel = curr = matches;
                calcoffsets();
                break;
        case XK_Left:
                calcoffsets();
                break;
        case XK_Left:
-               if(!(sel && sel->left))
-                       return;
-               sel=sel->left;
-               if(sel->right == curr) {
+               if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
+                       cursor = nextrune(-1);
+                       break;
+               }
+               /* fallthrough */
+       case XK_Up:
+               if(sel && sel->left && (sel = sel->left)->right == curr) {
                        curr = prev;
                        calcoffsets();
                }
                        curr = prev;
                        calcoffsets();
                }
@@ -450,20 +338,17 @@ kpress(XKeyEvent * e) {
                calcoffsets();
                break;
        case XK_Return:
                calcoffsets();
                break;
        case XK_Return:
-               if((e->state & ShiftMask) && text)
-                       fprintf(stdout, "%s", text);
-               else if(sel)
-                       fprintf(stdout, "%s", sel->text);
-               else if(text)
-                       fprintf(stdout, "%s", text);
-               fflush(stdout);
-               running = False;
-               break;
+       case XK_KP_Enter:
+               puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+               exit(EXIT_SUCCESS);
        case XK_Right:
        case XK_Right:
-               if(!(sel && sel->right))
-                       return;
-               sel=sel->right;
-               if(sel == next) {
+               if(text[cursor] != '\0') {
+                       cursor = nextrune(+1);
+                       break;
+               }
+               /* fallthrough */
+       case XK_Down:
+               if(sel && sel->right && (sel = sel->right) == next) {
                        curr = next;
                        calcoffsets();
                }
                        curr = next;
                        calcoffsets();
                }
@@ -472,240 +357,211 @@ kpress(XKeyEvent * e) {
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof text);
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof text);
-               match(text);
+               cursor = strlen(text);
+               match();
                break;
        }
        drawmenu();
 }
 
 void
                break;
        }
        drawmenu();
 }
 
 void
-match(char *pattern) {
-       unsigned int plen;
-       Item *i, *j;
-
-       if(!pattern)
-               return;
-       plen = strlen(pattern);
-       item = j = NULL;
-       nitem = 0;
-       for(i = allitems; i; i=i->next)
-               if(!plen || !strncmp(pattern, i->text, plen)) {
-                       if(!j)
-                               item = i;
-                       else
-                               j->right = i;
-                       i->left = j;
-                       i->right = NULL;
-                       j = i;
-                       nitem++;
+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
+                       appenditem(item, &lsubstr, &substrend);
+       }
+       if(lprefix) {
+               if(matches) {
+                       matchend->right = lprefix;
+                       lprefix->left = matchend;
                }
                }
-       for(i = allitems; i; i=i->next)
-               if(plen && strncmp(pattern, i->text, plen)
-                               && strstr(i->text, pattern)) {
-                       if(!j)                               
-                               item = i;                              
-                       else                                     
-                               j->right = i;                          
-                       i->left = j;      
-                       i->right = NULL;                         
-                       j = i;                                      
-                       nitem++;                                       
-               }                                              
-       for(i = allitems; i; i=i->next)                            
-               if(plen && strncmp(pattern, i->text, plen)             
-                               && !strstr(i->text, pattern)          
-                               && strido(i->text,pattern)) { 
-                       if(!j)
-                               item = i;
-                       else
-                               j->right = i;
-                       i->left = j;
-                       i->right = NULL;
-                       j = i;
-                       nitem++;
+               else
+                       matches = lprefix;
+               matchend = prefixend;
+       }
+       if(lsubstr) {
+               if(matches) {
+                       matchend->right = lsubstr;
+                       lsubstr->left = matchend;
                }
                }
-       curr = prev = next = sel = item;
+               else
+                       matches = lsubstr;
+               matchend = substrend;
+       }
+       curr = sel = matches;
        calcoffsets();
 }
 
        calcoffsets();
 }
 
+size_t
+nextrune(int inc) {
+       ssize_t n;
+
+       for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
+       return n;
+}
+
+void
+paste(void) {
+       char *p, *q;
+       int di;
+       unsigned long dl;
+       Atom da;
+
+       XGetWindowProperty(dc->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);
+       drawmenu();
+}
+
 void
 readstdin(void) {
 void
 readstdin(void) {
-       char *p, buf[1024];
-       unsigned int len = 0, max = 0;
-       Item *i, *new;
-
-       i = 0;
-       while(fgets(buf, sizeof buf, stdin)) {
-               len = strlen(buf);
-               if (buf[len - 1] == '\n')
-                       buf[len - 1] = 0;
-               p = estrdup(buf);
-               if(max < len) {
-                       maxname = p;
-                       max = len;
-               }
-               new = emalloc(sizeof(Item));
-               new->next = new->left = new->right = NULL;
-               new->text = p;
-               if(!i)
-                       allitems = new;
-               else 
-                       i->next = new;
-               i = new;
+       char buf[sizeof text], *p, *maxstr = NULL;
+       size_t i, max = 0, size = 0;
+
+       for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
+               if(i+1 >= size / sizeof *items)
+                       if(!(items = realloc(items, (size += BUFSIZ))))
+                               eprintf("cannot realloc %u bytes:", size);
+               if((p = strchr(buf, '\n')))
+                       *p = '\0';
+               if(!(items[i].text = strdup(buf)))
+                       eprintf("cannot strdup %u bytes:", strlen(buf)+1);
+               if(strlen(items[i].text) > max)
+                       max = strlen(maxstr = items[i].text);
        }
        }
+       if(items)
+               items[i].text = NULL;
+       inputw = maxstr ? textw(dc, maxstr) : 0;
+       lines = MIN(lines, i);
 }
 
 void
 run(void) {
        XEvent ev;
 
 }
 
 void
 run(void) {
        XEvent ev;
 
-       /* main event loop */
-       while(running && !XNextEvent(dpy, &ev))
-               switch (ev.type) {
-               default:        /* ignore all crap */
+       while(!XNextEvent(dc->dpy, &ev)) {
+               if(XFilterEvent(&ev, win))
+                       continue;
+               switch(ev.type) {
+               case Expose:
+                       if(ev.xexpose.count == 0)
+                               mapdc(dc, win, mw, mh);
                        break;
                case KeyPress:
                        break;
                case KeyPress:
-                       kpress(&ev.xkey);
+                       keypress(&ev.xkey);
                        break;
                        break;
-               case Expose:
-                       if(ev.xexpose.count == 0)
-                               drawmenu();
+               case SelectionNotify:
+                       if(ev.xselection.property == utf8)
+                               paste();
+                       break;
+               case VisibilityNotify:
+                       if(ev.xvisibility.state != VisibilityUnobscured)
+                               XRaiseWindow(dc->dpy, win);
                        break;
                }
                        break;
                }
-}
-
-void
-setup(Bool bottom) {
-       unsigned int i, j;
-       XModifierKeymap *modmap;
-       XSetWindowAttributes wa;
-
-       /* init modifier map */
-       modmap = XGetModifierMapping(dpy);
-       for(i = 0; i < 8; i++)
-               for(j = 0; j < modmap->max_keypermod; j++) {
-                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
-                       == XKeysymToKeycode(dpy, XK_Num_Lock))
-                               numlockmask = (1 << i);
-               }
-       XFreeModifiermap(modmap);
-
-       /* style */
-       dc.norm[ColBG] = getcolor(normbg);
-       dc.norm[ColFG] = getcolor(normfg);
-       dc.sel[ColBG] = getcolor(selbg);
-       dc.sel[ColFG] = getcolor(selfg);
-       initfont(font);
-
-       /* menu window */
-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-       mw = DisplayWidth(dpy, screen);
-       mh = dc.font.height + 2;
-       win = XCreateWindow(dpy, root, 0,
-                       bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-
-       /* pixmap */
-       dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
-       dc.gc = XCreateGC(dpy, root, 0, 0);
-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-       if(!dc.font.set)
-               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-       if(maxname)
-               cmdw = textw(maxname);
-       if(cmdw > mw / 3)
-               cmdw = mw / 3;
-       if(prompt)
-               promptw = textw(prompt);
-       if(promptw > mw / 5)
-               promptw = mw / 5;
-       text[0] = 0;
-       match(text);
-       XMapRaised(dpy, win);
-}
-
-int
-strido(const char *text, const char *pattern) {
-       for(; *text && *pattern; text++)
-               if (*text == *pattern)
-                       pattern++;
-       return !*pattern;
-}                                  
-
-unsigned int
-textnw(const char *text, unsigned int len) {
-       XRectangle r;
-
-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
        }
        }
-       return XTextWidth(dc.font.xfont, text, len);
 }
 
 }
 
-unsigned int
-textw(const char *text) {
-       return textnw(text, strlen(text)) + dc.font.height;
-}
-
-int
-main(int argc, char *argv[]) {
-       Bool bottom = False;
-       unsigned int i;
-
-       /* command line args */
-       for(i = 1; i < argc; i++)
-               if(!strcmp(argv[i], "-b")) {
-                       bottom = True;
-               }
-               else if(!strcmp(argv[i], "-fn")) {
-                       if(++i < argc) font = argv[i];
-               }
-               else if(!strcmp(argv[i], "-nb")) {
-                       if(++i < argc) normbg = argv[i];
-               }
-               else if(!strcmp(argv[i], "-nf")) {
-                       if(++i < argc) normfg = argv[i];
-               }
-               else if(!strcmp(argv[i], "-p")) {
-                       if(++i < argc) prompt = argv[i];
-               }
-               else if(!strcmp(argv[i], "-sb")) {
-                       if(++i < argc) selbg = argv[i];
-               }
-               else if(!strcmp(argv[i], "-sf")) {
-                       if(++i < argc) selfg = argv[i];
-               }
-               else if(!strcmp(argv[i], "-v"))
-                       eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
+void
+setup(void) {
+       int x, y, screen = DefaultScreen(dc->dpy);
+       Window root = RootWindow(dc->dpy, screen);
+       XSetWindowAttributes swa;
+       XIM xim;
+#ifdef XINERAMA
+       int n;
+       XineramaScreenInfo *info;
+#endif
+
+       normcol[ColBG] = getcolor(dc, normbgcolor);
+       normcol[ColFG] = getcolor(dc, normfgcolor);
+       selcol[ColBG]  = getcolor(dc, selbgcolor);
+       selcol[ColFG]  = getcolor(dc, selfgcolor);
+
+       utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+
+       /* menu geometry */
+       bh = dc->font.height + 2;
+       lines = MAX(lines, 0);
+       mh = (lines + 1) * bh;
+#ifdef XINERAMA
+       if((info = XineramaQueryScreens(dc->dpy, &n))) {
+               int i, di;
+               unsigned int du;
+               Window w, dw;
+               XWindowAttributes wa;
+
+               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
                else
-                       eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-                       "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
-       setlocale(LC_CTYPE, "");
-       dpy = XOpenDisplay(0);
-       if(!dpy)
-               eprint("dmenu: cannot open display\n");
-       screen = DefaultScreen(dpy);
-       root = RootWindow(dpy, screen);
-
-       if(isatty(STDIN_FILENO)) {
-               readstdin();
-               running = grabkeyboard();
+                       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;
+               x = info[i].x_org;
+               y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
+               mw = info[i].width;
+               XFree(info);
        }
        }
-       else { /* prevent keypress loss */
-               running = grabkeyboard();
-               readstdin();
+       else
+#endif
+       {
+               x = 0;
+               y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
+               mw = DisplayWidth(dc->dpy, screen);
        }
        }
+       promptw = prompt ? textw(dc, prompt) : 0;
+       inputw = MIN(inputw, mw/3);
+       match();
 
 
-       setup(bottom);
+       /* menu window */
+       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, &swa);
+
+        /* input methods */
+       xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
+       xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+                                       XNClientWindow, win, XNFocusWindow, win, NULL);
+
+       XMapRaised(dc->dpy, win);
+       resizedc(dc, mw, mh);
        drawmenu();
        drawmenu();
-       XSync(dpy, False);
-       run();
-       cleanup();
-       XCloseDisplay(dpy);
-       return ret;
+}
+
+void
+usage(void) {
+       fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n"
+             "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+       exit(EXIT_FAILURE);
 }
 }