comment xdg fallback behaviour

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 6ed025d..019fa3e 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -3,6 +3,7 @@
 #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 <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>


@@ -12,109 +13,120 @@
 #endif
 #include "draw.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))
+#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 matching items */
+       Item *left, *right;

 };
 
 static void appenditem(Item *item, Item **list, Item **last);
 static void calcoffsets(void);
 };
 
 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 drawmenu(void);

-static char *fstrstr(const char *s, const char *sub);

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

-static void insert(const char *s, ssize_t n);
+static void insert(const char *str, ssize_t n);

 static void keypress(XKeyEvent *ev);
 static void match(void);
 static void keypress(XKeyEvent *ev);
 static void match(void);

-static size_t nextrune(int incr);
+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 void paste(void);
 static void readstdin(void);
 static void run(void);
 static void setup(void);
 static void usage(void);
 

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

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

-static int inputw = 0;
-static int lines = 0;
-static int monitor = -1;
-static int promptw;
+static int inputw, promptw;

 static size_t cursor = 0;
 static const char *font = NULL;
 static const char *prompt = NULL;
 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 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 long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];

-static Atom utf8;
+static Atom clip, utf8;

 static Bool topbar = True;
 static DC *dc;
 static Item *items = NULL;
 static Bool topbar = True;
 static DC *dc;
 static Item *items = NULL;

-static Item *matches, *sel;
-static Item *prev, *curr, *next;
-static Window root, win;
+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 int (*fstrncmp)(const char *, const char *, size_t) = strncmp;

+static char *(*fstrstr)(const char *, const char *) = strstr;

 
 int
 main(int argc, char *argv[]) {
 
 int
 main(int argc, char *argv[]) {

+       Bool fast = False;

        int i;
 
        int i;
 

-       progname = "dmenu";

        for(i = 1; i < argc; i++)
        for(i = 1; i < argc; i++)

-               /* single flags */
-               if(!strcmp(argv[i], "-v")) {
-                       fputs("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details\n", stdout);
+               /* 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);
                }
                        exit(EXIT_SUCCESS);
                }

-               else if(!strcmp(argv[i], "-b"))
+               else if(!strcmp(argv[i], "-b"))   /* appears at the bottom of the screen */

                        topbar = False;
                        topbar = False;

-               else if(!strcmp(argv[i], "-i"))
+               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;
                        fstrncmp = strncasecmp;

-               else if(i == argc-1)
+                       fstrstr = cistrstr;
+               }
+               else if(i+1 == argc)

                        usage();
                        usage();

-               /* double flags */
-               else if(!strcmp(argv[i], "-l"))
+               /* these options take one argument */
+               else if(!strcmp(argv[i], "-l"))   /* number of lines in vertical list */

                        lines = atoi(argv[++i]);
                        lines = atoi(argv[++i]);

-               else if(!strcmp(argv[i], "-m"))
-                       monitor = atoi(argv[++i]);
-               else if(!strcmp(argv[i], "-p"))
+               else if(!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */

                        prompt = argv[++i];
                        prompt = argv[++i];

-               else if(!strcmp(argv[i], "-fn"))
+               else if(!strcmp(argv[i], "-fn"))  /* font or font set */

                        font = argv[++i];
                        font = argv[++i];

-               else if(!strcmp(argv[i], "-nb"))
+               else if(!strcmp(argv[i], "-nb"))  /* normal background color */

                        normbgcolor = argv[++i];
                        normbgcolor = argv[++i];

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

                        normfgcolor = argv[++i];
                        normfgcolor = argv[++i];

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

                        selbgcolor = argv[++i];
                        selbgcolor = argv[++i];

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

                        selfgcolor = argv[++i];
                else
                        usage();
 
        dc = initdc();
        initfont(dc, font);
                        selfgcolor = argv[++i];
                else
                        usage();
 
        dc = initdc();
        initfont(dc, font);

-       readstdin();
+
+       if(fast) {
+               grabkeyboard();
+               readstdin();
+       }
+       else {
+               readstdin();
+               grabkeyboard();
+       }

        setup();
        run();
 
        setup();
        run();
 

-       return EXIT_FAILURE;  /* should not reach */
+       return 1; /* unreachable */

 }
 
 void
 appenditem(Item *item, Item **list, Item **last) {
 }
 
 void
 appenditem(Item *item, Item **list, Item **last) {

-       if(!*last)
-               *list = item;
-       else
+       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;


@@ -122,13 +134,13 @@ appenditem(Item *item, Item **list, Item **last) {
 
 void
 calcoffsets(void) {
 
 void
 calcoffsets(void) {

-       unsigned int i, n;
+       int i, n;

 
        if(lines > 0)
                n = lines * bh;
        else
                n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
 
        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;
        for(i = 0, next = curr; next; next = next->right)
                if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
                        break;


@@ -137,6 +149,16 @@ calcoffsets(void) {
                        break;
 }
 
                        break;
 }
 

+char *
+cistrstr(const char *s, const char *sub) {
+       size_t len;
+
+       for(len = strlen(sub); *s; s++)
+               if(!strncasecmp(s, sub, len))
+                       return (char *)s;
+       return NULL;
+}
+

 void
 drawmenu(void) {
        int curpos;
 void
 drawmenu(void) {
        int curpos;


@@ -152,12 +174,14 @@ drawmenu(void) {
                drawtext(dc, prompt, selcol);
                dc->x = dc->w;
        }
                drawtext(dc, prompt, selcol);
                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) {
        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;
                dc->w = mw - dc->x;
                for(item = curr; item != next; item = item->right) {
                        dc->y += dc->h;


@@ -165,6 +189,7 @@ drawmenu(void) {
                }
        }
        else if(matches) {
                }
        }
        else if(matches) {

+               /* draw horizontal list */

                dc->x += inputw;
                dc->w = textw(dc, "<");
                if(curr->left)
                dc->x += inputw;
                dc->w = textw(dc, "<");
                if(curr->left)


@@ -182,22 +207,14 @@ drawmenu(void) {
        mapdc(dc, win, mw, mh);
 }
 
        mapdc(dc, win, mw, mh);
 }
 

-char *
-fstrstr(const char *s, const char *sub) {
-       size_t len;
-
-       for(len = strlen(sub); *s; s++)
-               if(!fstrncmp(s, sub, len))
-                       return (char *)s;
-       return NULL;
-}
-

 void
 grabkeyboard(void) {
        int i;
 
 void
 grabkeyboard(void) {
        int i;
 

+       /* try to grab keyboard, we may have to wait for another process to ungrab */

        for(i = 0; i < 1000; i++) {
        for(i = 0; i < 1000; i++) {

-               if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+               if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
+                                GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)

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


@@ -205,12 +222,13 @@ grabkeyboard(void) {
 }
 
 void
 }
 
 void

-insert(const char *s, ssize_t n) {
+insert(const char *str, ssize_t n) {

        if(strlen(text) + n > sizeof text - 1)
                return;
        if(strlen(text) + n > sizeof text - 1)
                return;

-       memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 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)
        if(n > 0)

-               memcpy(text + cursor, s, n);
+               memcpy(&text[cursor], str, n);

        cursor += n;
        match();
 }
        cursor += n;
        match();
 }


@@ -218,90 +236,82 @@ insert(const char *s, ssize_t n) {
 void
 keypress(XKeyEvent *ev) {
        char buf[32];
 void
 keypress(XKeyEvent *ev) {
        char buf[32];

-       size_t len;
-       KeySym ksym;
+       int len;
+       KeySym ksym = NoSymbol;
+       Status status;

 
 

-       len = strlen(text);
-       XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+       len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+       if(status == XBufferOverflow)
+               return;

        if(ev->state & ControlMask) {
        if(ev->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_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_k:  /* delete right */
+               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;
                        text[cursor] = '\0';
                        match();
                        break;

-               case XK_n:
-                       ksym = XK_Down;
-                       break;
-               case XK_p:
-                       ksym = XK_Up;
-                       break;
-               case XK_u:  /* delete left */
+               case XK_u: /* delete left */

                        insert(NULL, 0 - cursor);
                        break;
                        insert(NULL, 0 - cursor);
                        break;

-               case XK_w:  /* delete word */
+               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;
                        while(cursor > 0 && text[nextrune(-1)] == ' ')
                                insert(NULL, nextrune(-1) - cursor);
                        while(cursor > 0 && text[nextrune(-1)] != ' ')
                                insert(NULL, nextrune(-1) - cursor);
                        break;

-               case XK_y:  /* paste selection */
-                       XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+               case XK_y: /* paste selection */
+                       XConvertSelection(dc->dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
+                                         utf8, utf8, win, CurrentTime);
+                       return;
+               default:

                        return;
                }
        }
        switch(ksym) {
        default:
                if(!iscntrl(*buf))
                        return;
                }
        }
        switch(ksym) {
        default:
                if(!iscntrl(*buf))

-                       insert(buf, strlen(buf));
+                       insert(buf, len);

                break;
        case XK_Delete:
                break;
        case XK_Delete:

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

                        return;
                cursor = nextrune(+1);
                        return;
                cursor = nextrune(+1);

+               /* fallthrough */

        case XK_BackSpace:
        case XK_BackSpace:

-               if(cursor > 0)
-                       insert(NULL, nextrune(-1) - cursor);
+               if(cursor == 0)
+                       return;
+               insert(NULL, nextrune(-1) - cursor);

                break;
        case XK_End:
                break;
        case XK_End:

-               if(cursor < len) {
-                       cursor = 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();
                        calcoffsets();

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

                }
                }

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

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


@@ -318,8 +328,9 @@ keypress(XKeyEvent *ev) {
                        cursor = nextrune(-1);
                        break;
                }
                        cursor = nextrune(-1);
                        break;
                }

-               else if(lines > 0)
+               if(lines > 0)

                        return;
                        return;

+               /* fallthrough */

        case XK_Up:
                if(sel && sel->left && (sel = sel->left)->right == curr) {
                        curr = prev;
        case XK_Up:
                if(sel && sel->left && (sel = sel->left)->right == curr) {
                        curr = prev;


@@ -340,16 +351,16 @@ keypress(XKeyEvent *ev) {
                break;
        case XK_Return:
        case XK_KP_Enter:
                break;
        case XK_Return:
        case XK_KP_Enter:

-               fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
-               fflush(stdout);
+               puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);

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

-               if(cursor < len) {
+               if(text[cursor] != '\0') {

                        cursor = nextrune(+1);
                        break;
                }
                        cursor = nextrune(+1);
                        break;
                }

-               else if(lines > 0)
+               if(lines > 0)

                        return;
                        return;

+               /* fallthrough */

        case XK_Down:
                if(sel && sel->right && (sel = sel->right) == next) {
                        curr = next;
        case XK_Down:
                if(sel && sel->right && (sel = sel->right) == next) {
                        curr = next;


@@ -369,50 +380,64 @@ keypress(XKeyEvent *ev) {
 
 void
 match(void) {
 
 void
 match(void) {

+       static char **tokv = NULL;
+       static int tokn = 0;
+
+       char buf[sizeof text], *s;
+       int i, tokc = 0;

        size_t len;
        size_t len;

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

-               else if(fstrstr(item->text, text))
+               else

                        appenditem(item, &lsubstr, &substrend);
                        appenditem(item, &lsubstr, &substrend);

-
-       if(lexact) {
-               matches = lexact;
-               itemend = exactend;

        }
        if(lprefix) {
        }
        if(lprefix) {

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

                }
                else
                        matches = lprefix;
                }
                else
                        matches = lprefix;

-               itemend = prefixend;
+               matchend = prefixend;

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

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

                }
                else
                        matches = lsubstr;
                }
                else
                        matches = lsubstr;

+               matchend = substrend;

        }
        }

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

        calcoffsets();
 }
 
 size_t
        calcoffsets();
 }
 
 size_t

-nextrune(int incr) {
-       size_t n, len;
+nextrune(int inc) {
+       ssize_t n;

 
 

-       len = strlen(text);
-       for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+       /* 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;
 }
 
        return n;
 }
 


@@ -423,39 +448,48 @@ paste(void) {
        unsigned long dl;
        Atom da;
 
        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);
        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 : strlen(p));
+       insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));

        XFree(p);
        drawmenu();
 }
 
 void
 readstdin(void) {
        XFree(p);
        drawmenu();
 }
 
 void
 readstdin(void) {

-       char buf[sizeof text], *p;
-       Item *item, **end;
-
-       for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
+       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((p = strchr(buf, '\n')))
                        *p = '\0';

-               if(!(item = malloc(sizeof *item)))
-                       eprintf("cannot malloc %u bytes\n", sizeof *item);
-               if(!(item->text = strdup(buf)))
-                       eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
-               item->next = item->left = item->right = NULL;
-               inputw = MAX(inputw, textw(dc, item->text));
+               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;
 

-       while(!XNextEvent(dc->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;
                case KeyPress:
                        keypress(&ev.xkey);


@@ -469,41 +503,60 @@ run(void) {
                                XRaiseWindow(dc->dpy, win);
                        break;
                }
                                XRaiseWindow(dc->dpy, win);
                        break;
                }

+       }

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

-       int x, y, screen;
-       XSetWindowAttributes wa;
+       int x, y, screen = DefaultScreen(dc->dpy);
+       Window root = RootWindow(dc->dpy, screen);
+       XSetWindowAttributes swa;
+       XIM xim;

 #ifdef XINERAMA
        int n;
        XineramaScreenInfo *info;
 #endif
 
 #ifdef XINERAMA
        int n;
        XineramaScreenInfo *info;
 #endif
 

-       screen = DefaultScreen(dc->dpy);
-       root = RootWindow(dc->dpy, screen);
-       utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
-

        normcol[ColBG] = getcolor(dc, normbgcolor);
        normcol[ColFG] = getcolor(dc, normfgcolor);
        normcol[ColBG] = getcolor(dc, normbgcolor);
        normcol[ColFG] = getcolor(dc, normfgcolor);

-       selcol[ColBG] = getcolor(dc, selbgcolor);
-       selcol[ColFG] = getcolor(dc, selfgcolor);
+       selcol[ColBG]  = getcolor(dc, selbgcolor);
+       selcol[ColFG]  = getcolor(dc, selfgcolor);

 
 

-       /* menu geometry */
+       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))) {
        bh = dc->font.height + 2;
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA
        if((info = XineramaQueryScreens(dc->dpy, &n))) {

-               int i, di;
+               int a, j, di, i = 0, area = 0;

                unsigned int du;
                unsigned int du;

-               Window dw;
+               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;

 
 

-               XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
-               for(i = 0; i < n; i++)
-                       if((monitor == info[i].screen_number)
-                       || (monitor < 0 && 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;
                x = info[i].x_org;
                y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
                mw = info[i].width;


@@ -516,27 +569,32 @@ setup(void) {
                y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
                mw = DisplayWidth(dc->dpy, screen);
        }
                y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
                mw = DisplayWidth(dc->dpy, screen);
        }

-       /* menu window */
-       wa.override_redirect = True;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+       promptw = prompt ? textw(dc, prompt) : 0;
+       inputw = MIN(inputw, mw/3);
+       match();
+
+       /* create menu window */
+       swa.override_redirect = True;
+       swa.background_pixel = normcol[ColBG];
+       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),
        win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
                            DefaultDepth(dc->dpy, screen), CopyFromParent,
                            DefaultVisual(dc->dpy, screen),

-                           CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+                           CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
+
+       /* open input methods */
+       xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
+       xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+                       XNClientWindow, win, XNFocusWindow, win, NULL);

 
 

-       grabkeyboard();
-       resizedc(dc, mw, mh);
-       inputw = MIN(inputw, mw/3);
-       promptw = prompt ? textw(dc, prompt) : 0;

        XMapRaised(dc->dpy, win);
        XMapRaised(dc->dpy, win);

-       text[0] = '\0';
-       match();
+       resizedc(dc, mw, mh);
+       drawmenu();

 }
 
 void
 usage(void) {
 }
 
 void
 usage(void) {

-       fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+       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);
 }
              "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
        exit(EXIT_FAILURE);
 }