simplify stest

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 1fdf7f5..99db24e 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,382 +1,338 @@
 /* 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <strings.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <X11/keysym.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 "draw.h"

 
 

-#define INRECT(x,y,rx,ry,rw,rh) ((rx) < (x) && (x) < (rx)+(rw) && (ry) < (y) && (y) < (ry)+(rh))
-#define MIN(a,b)                ((a) < (b) ? (a) : (b))
-#define MAX(a,b)                ((a) > (b) ? (a) : (b))
-#define IS_UTF8_1ST_CHAR(c)     (((c) & 0xc0) == 0xc0 || ((c) & 0x80) == 0x00)
+#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 MIN(a,b)              ((a) < (b) ? (a) : (b))
+#define MAX(a,b)              ((a) > (b) ? (a) : (b))

 
 typedef struct Item Item;
 struct Item {
        char *text;
 
 typedef struct Item Item;
 struct Item {
        char *text;

-       Item *next;         /* traverses all items */
-       Item *left, *right; /* traverses items matching current search pattern */
+       Item *left, *right;

 };
 
 };
 

-static void appenditem(Item *i, Item **list, Item **last);
-static void calcoffsetsh(void);
-static void calcoffsetsv(void);
+static void appenditem(Item *item, Item **list, Item **last);
+static void calcoffsets(void);

 static char *cistrstr(const char *s, const char *sub);
 static char *cistrstr(const char *s, const char *sub);

-static void cleanup(void);
-static void drawitem(const char *s, unsigned long col[ColLast]);

 static void drawmenu(void);
 static void drawmenu(void);

-static void drawmenuh(void);
-static void drawmenuv(void);

 static void grabkeyboard(void);
 static void grabkeyboard(void);

-static void keypress(XKeyEvent *e);
+static void insert(const char *str, ssize_t n);
+static void keypress(XKeyEvent *ev);

 static void match(void);
 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 readstdin(void);
 static void run(void);
 static void setup(void);

-
-static char **argp = NULL;
-static char *maxname = NULL;
-static char *prompt;
-static char text[4096];
-static int promptw;
-static int screen;
-static size_t cur = 0;
-static unsigned int cmdw = 0;
+static void usage(void);
+
+static char text[BUFSIZ] = "";
+static int bh, mw, mh;
+static int inputw, promptw;
+static size_t cursor = 0;
+static const char *font = NULL;
+static const char *prompt = NULL;
+static const char *normbgcolor = "#222222";
+static const char *normfgcolor = "#bbbbbb";
+static const char *selbgcolor  = "#005577";
+static const char *selfgcolor  = "#eeeeee";

 static unsigned int lines = 0;
 static unsigned int lines = 0;

-static unsigned int numlockmask;
-static unsigned int mw, mh;

 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];

+static Atom clip, utf8;

 static Bool topbar = True;
 static Bool topbar = True;

-static DC dc;
-static Display *dpy;
-static Item *allitems = NULL;  /* first of all items */
-static Item *item = NULL;      /* first of pattern matching items */
-static Item *sel = NULL;
-static Item *next = NULL;
-static Item *prev = NULL;
-static Item *curr = NULL;
-static Window win, root;
+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;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;

-static void (*calcoffsets)(void) = calcoffsetsh;
+
+int
+main(int argc, char *argv[]) {
+       Bool fast = False;
+       int i;
+
+       for(i = 1; i < argc; i++)
+               /* these options take no arguments */
+               if(!strcmp(argv[i], "-v")) {      /* prints version information */
+                       puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
+                       exit(EXIT_SUCCESS);
+               }
+               else if(!strcmp(argv[i], "-b"))   /* appears at the bottom of the screen */
+                       topbar = False;
+               else if(!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
+                       fast = True;
+               else if(!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
+                       fstrncmp = strncasecmp;
+                       fstrstr = cistrstr;
+               }
+               else if(i+1 == argc)
+                       usage();
+               /* 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], "-p"))   /* adds prompt to left of input field */
+                       prompt = argv[++i];
+               else if(!strcmp(argv[i], "-fn"))  /* font or font set */
+                       font = argv[++i];
+               else if(!strcmp(argv[i], "-nb"))  /* normal background color */
+                       normbgcolor = argv[++i];
+               else if(!strcmp(argv[i], "-nf"))  /* normal foreground color */
+                       normfgcolor = argv[++i];
+               else if(!strcmp(argv[i], "-sb"))  /* selected background color */
+                       selbgcolor = argv[++i];
+               else if(!strcmp(argv[i], "-sf"))  /* selected foreground color */
+                       selfgcolor = argv[++i];
+               else
+                       usage();
+
+       dc = initdc();
+       initfont(dc, font);
+
+       if(fast) {
+               grabkeyboard();
+               readstdin();
+       }
+       else {
+               readstdin();
+               grabkeyboard();
+       }
+       setup();
+       run();
+
+       return EXIT_FAILURE; /* unreachable */
+}

 
 void
 
 void

-appenditem(Item *i, Item **list, Item **last) {
-       if(!(*last))
-               *list = i;
+appenditem(Item *item, Item **list, Item **last) {
+       if(*last)
+               (*last)->right = item;

        else
        else

-               (*last)->right = i;
-       i->left = *last;
-       i->right = NULL;
-       *last = i;
+               *list = item;
+
+       item->left = *last;
+       item->right = NULL;
+       *last = item;

 }
 
 void
 }
 
 void

-calcoffsetsh(void) {
-       unsigned int w, x;
+calcoffsets(void) {
+       int i, n;

 
 

-       w = promptw + cmdw + 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(dc, "<") + textw(dc, ">"));
+       /* 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(dc, 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 : MIN(textw(dc, 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;
-}
-

 char *
 cistrstr(const char *s, const char *sub) {
 char *
 cistrstr(const char *s, const char *sub) {

-       int c, csub;
-       unsigned int len;
-
-       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--;
-       }
-       return (char *)s;
-}
-
-void
-cleanup(void) {
-       Item *itm;
-
-       while(allitems) {
-               itm = allitems->next;
-               free(allitems->text);
-               free(allitems);
-               allitems = itm;
-       }
-       cleanupdraw(&dc);
-       XDestroyWindow(dpy, win);
-       XUngrabKeyboard(dpy, CurrentTime);
-       XCloseDisplay(dpy);
-}
+       size_t len;

 
 

-void
-drawitem(const char *s, unsigned long col[ColLast]) {
-       const char *p;
-       unsigned int w = textnw(&dc, text, strlen(text));
-
-       drawbox(&dc, col);
-       drawtext(&dc, s, col);
-       for(p = fstrstr(s, text); *text && (p = fstrstr(p, text)); p++)
-               drawline(&dc, textnw(&dc, s, p-s) + dc.h/2 - 1, dc.h-2, w, 1, col);
+       for(len = strlen(sub); *s; s++)
+               if(!strncasecmp(s, sub, len))
+                       return (char *)s;
+       return NULL;

 }
 
 void
 drawmenu(void) {
 }
 
 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? */
+       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) {
        if(prompt) {

-               dc.w = promptw;
-               drawbox(&dc, selcol);
-               drawtext(&dc, prompt, selcol);
-               dc.x += dc.w;
+               dc->w = promptw;
+               drawtext(dc, prompt, selcol);
+               dc->x = dc->w;

        }
        }

-       dc.w = mw - dc.x;
-       /* print command */
-       if(cmdw && item && lines == 0)
-               dc.w = cmdw;
-       drawtext(&dc, text, normcol);
-       drawline(&dc, textnw(&dc, text, cur) + dc.h/2 - 2, 2, 1, dc.h-4, normcol);
-       if(lines > 0)
-               drawmenuv();
-       else if(curr)
-               drawmenuh();
-       commitdraw(&dc, win);
-}
-
-void
-drawmenuh(void) {
-       Item *i;
-
-       dc.x += cmdw;
-       dc.w = textw(&dc, "<");
-       drawtext(&dc, curr->left ? "<" : NULL, normcol);
-       dc.x += dc.w;
-       for(i = curr; i != next; i = i->right) {
-               dc.w = MIN(textw(&dc, i->text), mw / 3);
-               drawitem(i->text, (sel == i) ? selcol : normcol);
-               dc.x += dc.w;
+       /* draw input field */
+       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) {
+               /* draw vertical list */
+               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);
+               }

        }
        }

-       dc.w = textw(&dc, ">");
-       dc.x = mw - dc.w;
-       drawtext(&dc, next ? ">" : NULL, normcol);
-}
-
-void
-drawmenuv(void) {
-       Item *i;
-       XWindowAttributes wa;
-
-       dc.y = topbar ? dc.h : 0;
-       dc.w = mw - dc.x;
-       for(i = curr; i != next; i = i->right) {
-               drawitem(i->text, (sel == i) ? selcol : normcol);
-               dc.y += dc.h;
+       else if(matches) {
+               /* draw horizontal list */
+               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);

        }
        }

-       if(!XGetWindowAttributes(dpy, win, &wa))
-               eprint("cannot get window attributes");
-       XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
+       mapdc(dc, win, mw, mh);

 }
 
 void
 grabkeyboard(void) {
 }
 
 void
 grabkeyboard(void) {

-       unsigned int n;
+       int i;

 
 

-       for(n = 0; n < 1000; n++) {
-               if(!XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+       /* try to grab keyboard, we may have to wait for another process to ungrab */
+       for(i = 0; i < 1000; i++) {
+               if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
+                                GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)

                        return;
                usleep(1000);
        }
                        return;
                usleep(1000);
        }

-       exit(EXIT_FAILURE);
+       eprintf("cannot grab keyboard\n");

 }
 
 void
 }
 
 void

-keypress(XKeyEvent *e) {
-       char buf[sizeof text];
-       int num;
-       unsigned int i, len;
-       KeySym ksym;
-
-       len = strlen(text);
-       num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
-       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;
-       else if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
-       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
-       || IsPrivateKeypadKey(ksym))
+insert(const char *str, ssize_t n) {
+       if(strlen(text) + n > sizeof text - 1)

                return;
                return;

-       /* first check if a control mask is omitted */
-       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:
-                       text[cur] = '\0';
-                       break;
-               case XK_n:
-                       ksym = XK_Down;
-                       break;
-               case XK_p:
-                       ksym = XK_Up;
-                       break;
-               case XK_u:
-                       memmove(text, text + cur, sizeof text - cur + 1);
-                       cur = 0;
+       /* 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();
+}
+
+void
+keypress(XKeyEvent *ev) {
+       char buf[32];
+       int len;
+       KeySym ksym = NoSymbol;
+       Status status;
+
+       len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+       if(status == XBufferOverflow)
+               return;
+       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_Down;      break;
+               case XK_p: ksym = XK_Up;        break;
+
+               case XK_k: /* delete right */
+                       text[cursor] = '\0';

                        match();
                        break;
                        match();
                        break;

-               case XK_w:
-                       if(cur == 0)
-                               return;
-                       i = cur;
-                       while(i-- > 0 && text[i] == ' ');
-                       while(i-- > 0 && text[i] != ' ');
-                       memmove(text + i + 1, text + cur, sizeof text - cur + 1);
-                       cur = i + 1;
-                       match();
+               case XK_u: /* delete left */
+                       insert(NULL, 0 - cursor);

                        break;
                        break;

-               case XK_y:
-                       {
-                               FILE *fp;
-                               char *s;
-                               if(!(fp = fopen("sselp", "r")))
-                                       eprint("cannot popen sselp\n");
-                               s = fgets(buf, sizeof buf, fp);
-                               fclose(fp);
-                               if(!s)
-                                       return;
-                       }
-                       num = strlen(buf);
-                       if(num && buf[num-1] == '\n')
-                               buf[--num] = '\0';
+               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_y: /* paste selection */
+                       XConvertSelection(dc->dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
+                                         utf8, utf8, win, CurrentTime);
+                       return;
+               default:
+                       return;

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

-               num = MIN(num, sizeof text);
-               if(num && !iscntrl((int) buf[0])) {
-                       memmove(text + cur + num, text + cur, sizeof text - cur - num);
-                       memcpy(text + cur, buf, num);
-                       cur += num;
-                       match();
-               }
-               break;
-       case XK_BackSpace:
-               if(cur == 0)
-                       return;
-               for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[cur - i]); i++);
-               memmove(text + cur - i, text + cur, sizeof text - cur + i);
-               cur -= i;
-               match();
+               if(!iscntrl(*buf))
+                       insert(buf, len);

                break;
        case XK_Delete:
                break;
        case XK_Delete:

-               if(cur == len)
+               if(text[cursor] == '\0')

                        return;
                        return;

-               for(i = 1; cur + i < len && !IS_UTF8_1ST_CHAR(text[cur + i]); i++);
-               memmove(text + cur, text + cur + i, sizeof text - cur);
-               match();
+               cursor = nextrune(+1);
+               /* fallthrough */
+       case XK_BackSpace:
+               if(cursor == 0)
+                       return;
+               insert(NULL, nextrune(-1) - cursor);

                break;
        case XK_End:
                break;
        case XK_End:

-               if(cur < len) {
-                       cur = len;
+               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();
+                       curr = prev;

                        calcoffsets();
                        calcoffsets();

+                       while(next && (curr = curr->right))
+                               calcoffsets();

                }
                }

-               while(sel && sel->right)
-                       sel = sel->right;
+               sel = matchend;

                break;
        case XK_Escape:
                exit(EXIT_FAILURE);
        case XK_Home:
                break;
        case XK_Escape:
                exit(EXIT_FAILURE);
        case XK_Home:

-               if(sel == item) {
-                       cur = 0;
+               if(sel == matches) {
+                       cursor = 0;

                        break;
                }
                        break;
                }

-               sel = curr = item;
+               sel = curr = matches;

                calcoffsets();
                break;
        case XK_Left:
                calcoffsets();
                break;
        case XK_Left:

-               if(cur > 0 && (!sel || !sel->left || lines > 0)) {
-                       while(cur-- > 0 && !IS_UTF8_1ST_CHAR(text[cur]));
+               if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
+                       cursor = nextrune(-1);

                        break;
                }
                if(lines > 0)
                        return;
                        break;
                }
                if(lines > 0)
                        return;

+               /* fallthrough */

        case XK_Up:
        case XK_Up:

-               if(!sel || !sel->left)
-                       return;
-               sel = sel->left;
-               if(sel->right == curr) {
+               if(sel && sel->left && (sel = sel->left)->right == curr) {

                        curr = prev;
                        calcoffsets();
                }
                        curr = prev;
                        calcoffsets();
                }


@@ -394,21 +350,19 @@ keypress(XKeyEvent *e) {
                calcoffsets();
                break;
        case XK_Return:
                calcoffsets();
                break;
        case XK_Return:

-               fprintf(stdout, "%s", ((e->state & ShiftMask) || sel) ? sel->text : text);
-               fflush(stdout);
+       case XK_KP_Enter:
+               puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);

                exit(EXIT_SUCCESS);
        case XK_Right:
                exit(EXIT_SUCCESS);
        case XK_Right:

-               if(cur < len) {
-                       while(cur++ < len && !IS_UTF8_1ST_CHAR(text[cur]));
+               if(text[cursor] != '\0') {
+                       cursor = nextrune(+1);

                        break;
                }
                if(lines > 0)
                        return;
                        break;
                }
                if(lines > 0)
                        return;

+               /* fallthrough */

        case XK_Down:
        case XK_Down:

-               if(!sel || !sel->right)
-                       return;
-               sel = sel->right;
-               if(sel == next) {
+               if(sel && sel->right && (sel = sel->right) == next) {

                        curr = next;
                        calcoffsets();
                }
                        curr = next;
                        calcoffsets();
                }


@@ -417,7 +371,7 @@ keypress(XKeyEvent *e) {
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof text);
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof text);

-               cur = strlen(text);
+               cursor = strlen(text);

                match();
                break;
        }
                match();
                break;
        }


@@ -426,140 +380,185 @@ keypress(XKeyEvent *e) {
 
 void
 match(void) {
 
 void
 match(void) {

-       unsigned int len;
-       Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
-
-       len = strlen(text);
-       item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-       for(i = allitems; i; i = i->next)
-               if(!fstrncmp(text, i->text, len + 1))
-                       appenditem(i, &lexact, &exactend);
-               else if(!fstrncmp(text, i->text, len))
-                       appenditem(i, &lprefix, &prefixend);
-               else if(fstrstr(i->text, text))
-                       appenditem(i, &lsubstr, &substrend);
-       if(lexact) {
-               item = lexact;
-               itemend = exactend;
+       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)))
+                       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) /* 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(lprefix) {

-               if(itemend) {
-                       itemend->right = lprefix;
-                       lprefix->left = itemend;
+               if(matches) {
+                       matchend->right = lprefix;
+                       lprefix->left = matchend;

                }
                else
                }
                else

-                       item = lprefix;
-               itemend = prefixend;
+                       matches = lprefix;
+               matchend = prefixend;

        }
        if(lsubstr) {
        }
        if(lsubstr) {

-               if(itemend) {
-                       itemend->right = lsubstr;
-                       lsubstr->left = itemend;
+               if(matches) {
+                       matchend->right = lsubstr;
+                       lsubstr->left = matchend;

                }
                else
                }
                else

-                       item = lsubstr;
+                       matches = lsubstr;
+               matchend = substrend;

        }
        }

-       curr = prev = next = sel = item;
+       curr = sel = matches;

        calcoffsets();
 }
 
        calcoffsets();
 }
 

+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;
+}
+
+void
+paste(void) {
+       char *p, *q;
+       int di;
+       unsigned long dl;
+       Atom da;
+
+       /* we have been given the current selection, now insert it into input */
+       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[sizeof text];
-       unsigned int len = 0, max = 0;
-       Item *i, *new;
-
-       i = NULL;
-       while(fgets(buf, sizeof buf, stdin)) {
-               len = strlen(buf);
-               if(buf[len-1] == '\n')
-                       buf[--len] = '\0';
-               if(!(p = strdup(buf)))
-                       eprint("cannot strdup %u bytes\n", len);
-               if((max = MAX(max, len)) == len)
-                       maxname = p;
-               if(!(new = malloc(sizeof *new)))
-                       eprint("cannot malloc %u bytes\n", sizeof *new);
-               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;
+
+       /* 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))))
+                               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;
 

-       XSync(dpy, False);
-       while(!XNextEvent(dpy, &ev))
+       while(!XNextEvent(dc->dpy, &ev)) {
+               if(XFilterEvent(&ev, win))
+                       continue;

                switch(ev.type) {
                case Expose:
                        if(ev.xexpose.count == 0)
                switch(ev.type) {
                case Expose:
                        if(ev.xexpose.count == 0)

-                               drawmenu();
+                               mapdc(dc, win, mw, mh);

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

+               case SelectionNotify:
+                       if(ev.xselection.property == utf8)
+                               paste();
+                       break;

                case VisibilityNotify:
                        if(ev.xvisibility.state != VisibilityUnobscured)
                case VisibilityNotify:
                        if(ev.xvisibility.state != VisibilityUnobscured)

-                               XRaiseWindow(dpy, win);
+                               XRaiseWindow(dc->dpy, win);

                        break;
                }
                        break;
                }

-       exit(EXIT_FAILURE);
+       }

 }
 
 void
 setup(void) {
 }
 
 void
 setup(void) {

-       int i, j, x, y;
-#if XINERAMA
+       int x, y, screen = DefaultScreen(dc->dpy);
+       Window root = RootWindow(dc->dpy, screen);
+       XSetWindowAttributes swa;
+       XIM xim;
+#ifdef XINERAMA

        int n;
        int n;

-       XineramaScreenInfo *info = NULL;
+       XineramaScreenInfo *info;

 #endif
 #endif

-       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);
-
-       dc.dpy = dpy;
-       normcol[ColBG] = getcolor(&dc, normbgcolor);
-       normcol[ColFG] = getcolor(&dc, normfgcolor);
-       selcol[ColBG] = getcolor(&dc, selbgcolor);
-       selcol[ColFG] = getcolor(&dc, selfgcolor);
-       initfont(&dc, font);
-
-       /* input window */
-       wa.override_redirect = True;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
-
-       /* input window geometry */
-       mh = (dc.font.height + 2) * (lines + 1);
-#if XINERAMA
-       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
-               i = 0;
-               if(n > 1) {
-                       int di;
-                       unsigned int dui;
-                       Window dummy;
-                       if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
-                               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;
+
+       normcol[ColBG] = getcolor(dc, normbgcolor);
+       normcol[ColFG] = getcolor(dc, normfgcolor);
+       selcol[ColBG]  = getcolor(dc, selbgcolor);
+       selcol[ColFG]  = getcolor(dc, selfgcolor);
+
+       clip = XInternAtom(dc->dpy, "CLIPBOARD",   False);
+       utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+
+       /* calculate menu geometry */
+       bh = dc->font.height + 2;
+       lines = MAX(lines, 0);
+       mh = (lines + 1) * bh;
+#ifdef XINERAMA
+       if((info = XineramaQueryScreens(dc->dpy, &n))) {
+               int a, j, di, i = 0, area = 0;
+               unsigned int du;
+               Window w, pw, dw, *dws;
+               XWindowAttributes wa;
+
+               XGetInputFocus(dc->dpy, &w, &di);
+               if(w != root && w != PointerRoot && w != None) {
+                       /* find top-level window containing current input focus */
+                       do {
+                               if(XQueryTree(dc->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(dc->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(!area && XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+                       for(i = 0; i < n; i++)
+                               if(INTERSECT(x, y, 1, 1, info[i]))
+                                       break;
+

                x = info[i].x_org;
                x = info[i].x_org;

-               y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh;
+               y = info[i].y_org + (topbar ? 0 : info[i].height - mh);

                mw = info[i].width;
                XFree(info);
        }
                mw = info[i].width;
                XFree(info);
        }


@@ -567,84 +566,35 @@ setup(void) {
 #endif
        {
                x = 0;
 #endif
        {
                x = 0;

-               y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
-               mw = DisplayWidth(dpy, screen);
+               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();

 
 

-       win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-
-       setupdraw(&dc, win);
-       if(prompt)
-               promptw = MIN(textw(&dc, prompt), mw / 5);
-       XMapRaised(dpy, win);
+       /* create 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);
+
+       /* open 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();

 }
 
 }
 

-int
-main(int argc, char *argv[]) {
-       unsigned int i;
-
-       /* command line args */
-       progname = "dmenu";
-       for(i = 1; i < argc; i++)
-               if(!strcmp(argv[i], "-i")) {
-                       fstrncmp = strncasecmp;
-                       fstrstr = cistrstr;
-               }
-               else if(!strcmp(argv[i], "-b"))
-                       topbar = False;
-               else if(!strcmp(argv[i], "-l")) {
-                       if(++i < argc) lines = atoi(argv[i]);
-                       if(lines > 0)
-                               calcoffsets = calcoffsetsv;
-               }
-               else if(!strcmp(argv[i], "-fn")) {
-                       if(++i < argc) font = argv[i];
-               }
-               else if(!strcmp(argv[i], "-nb")) {
-                       if(++i < argc) normbgcolor = argv[i];
-               }
-               else if(!strcmp(argv[i], "-nf")) {
-                       if(++i < argc) normfgcolor = argv[i];
-               }
-               else if(!strcmp(argv[i], "-p")) {
-                       if(++i < argc) prompt = argv[i];
-               }
-               else if(!strcmp(argv[i], "-sb")) {
-                       if(++i < argc) selbgcolor = argv[i];
-               }
-               else if(!strcmp(argv[i], "-sf")) {
-                       if(++i < argc) selfgcolor = argv[i];
-               }
-               else if(!strcmp(argv[i], "-v")) {
-                       printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
-                       exit(EXIT_SUCCESS);
-               }
-               else {
-                       fputs("usage: dmenu [-i] [-b] [-l <lines>] [-fn <font>] [-nb <color>]\n"
-                             "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n", stderr);
-                       exit(EXIT_FAILURE);
-               }
-       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-               fprintf(stderr, "dmenu: warning: no locale support\n");
-       if(!(dpy = XOpenDisplay(NULL)))
-               eprint("cannot open display\n");
-       if(atexit(&cleanup) != 0)
-               eprint("cannot register cleanup\n");
-       screen = DefaultScreen(dpy);
-       root = RootWindow(dpy, screen);
-       if(!(argp = malloc(sizeof *argp * (argc+2))))
-               eprint("cannot malloc %u bytes\n", sizeof *argp * (argc+2));
-       memcpy(argp + 2, argv + 1, sizeof *argp * argc);
-
-       readstdin();
-       grabkeyboard();
-       setup();
-       if(maxname)
-               cmdw = MIN(textw(&dc, maxname), mw / 3);
-       match();
-       run();
-       return 0;
+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);

 }
 }