increment version

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index b82ff59..40b220c 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -4,62 +4,122 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

-#include <X11/Xatom.h>

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

+#include <X11/Xatom.h>

 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif

-#include <draw.h>
+#include "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 INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
 #define MIN(a,b)                ((a) < (b) ? (a) : (b))
 #define MAX(a,b)                ((a) > (b) ? (a) : (b))

-#define UTF8_CODEPOINT(c)       (((c) & 0xc0) != 0x80)

 
 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 insert(const char *s, ssize_t n);
 static void grabkeyboard(void);
 static void insert(const char *s, ssize_t n);

-static void keypress(XKeyEvent *e);
+static void keypress(XKeyEvent *ev);

 static void match(void);
 static void match(void);

+static size_t nextrune(int incr);

 static void paste(void);
 static void readstdin(void);
 static void run(void);
 static void setup(void);
 static void paste(void);
 static void readstdin(void);
 static void run(void);
 static void setup(void);

-static void usage(void);

 
 

-static char text[4096];
+static char text[BUFSIZ] = "";
+static int bh, mw, mh;
+static int inputw = 0;
+static int lines = 0;
+static int monitor = -1;
+static int promptw;

 static size_t cursor = 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 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 int inputw = 0;
-static unsigned int lines = 0;
-static unsigned int mw, mh;
-static unsigned int promptw;

 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static Atom utf8;
 static Bool topbar = True;
 static DC *dc;
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static Atom utf8;
 static Bool topbar = True;
 static DC *dc;

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

 static Window root, win;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static Window root, win;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;

-static char *(*fstrstr)(const char *, const char *) = strstr;
+
+int
+main(int argc, char *argv[]) {
+       Bool fast = False;
+       int 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);
+                       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;
+               else if(i == argc-1)
+                       goto usage;
+               /* double flags */
+               else if(!strcmp(argv[i], "-l"))
+                       lines = atoi(argv[++i]);
+               else if(!strcmp(argv[i], "-m"))
+                       monitor = 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
+                       goto usage;
+
+       dc = initdc();
+       initfont(dc, font);
+
+       if(fast) {
+               setup();
+               readstdin();
+       }
+       else {
+               readstdin();
+               setup();
+       }
+       match();
+       run();
+       return EXIT_FAILURE;
+
+usage:
+       fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+             "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+       return EXIT_FAILURE;
+}

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


@@ -73,74 +133,57 @@ appenditem(Item *item, Item **list, Item **last) {
 }
 
 void
 }
 
 void

-calcoffsets(void)
-{
-       unsigned int h, i, n;
+calcoffsets(void) {
+       unsigned int i, n;

 
 

-       h = dc->font.height+2;

        if(lines > 0)
        if(lines > 0)

-               n = lines * h;
+               n = lines * bh;

        else
                n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
 
        else
                n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
 

-       prev = next = curr;
-       for(i = 0; next; next = next->right)
-               if((i += (lines > 0) ? h : MIN(textw(dc, next->text), mw/3)) > n)
+       for(i = 0, next = curr; next; next = next->right)
+               if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)

                        break;
                        break;

-       for(i = 0; prev && prev->left; prev = prev->left)
-               if((i += (lines > 0) ? h : MIN(textw(dc, prev->left->text), mw/3)) > n)
+       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;
 }
 

-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) {
 void
 drawmenu(void) {

+       int curpos;

        Item *item;
 
        dc->x = 0;
        dc->y = 0;
        Item *item;
 
        dc->x = 0;
        dc->y = 0;

-       drawrect(dc, 0, 0, mw, mh, BG(dc, normcol));
+       dc->h = bh;
+       drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));

 
 

-       dc->h = dc->font.height + 2;
-       dc->y = topbar ? 0 : mh - dc->h;
-       /* print prompt? */

        if(prompt) {
                dc->w = promptw;
                drawtext(dc, prompt, selcol);
                dc->x = dc->w;
        }
        if(prompt) {
                dc->w = promptw;
                drawtext(dc, prompt, selcol);
                dc->x = dc->w;
        }

-       dc->w = mw - dc->x;
-       /* print input area */
-       if(matches && lines == 0 && textw(dc, text) <= inputw)
-               dc->w = inputw;
+       dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;

        drawtext(dc, text, normcol);
        drawtext(dc, text, normcol);

-       drawrect(dc, textnw(dc, text, cursor) + dc->h/2 - 2, 2, 1, dc->h - 4, FG(dc, 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) {
 
        if(lines > 0) {

-               dc->y = topbar ? dc->h : 0;

                dc->w = mw - dc->x;
                for(item = curr; item != next; item = item->right) {
                dc->w = mw - dc->x;
                for(item = curr; item != next; item = item->right) {

-                       drawtext(dc, item->text, (item == sel) ? selcol : normcol);

                        dc->y += dc->h;
                        dc->y += dc->h;

+                       drawtext(dc, item->text, (item == sel) ? selcol : normcol);

                }
        }
                }
        }

-       else if(curr && (dc->w == inputw || curr->next)) {
+       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->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/3);
+                       dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">"));

                        drawtext(dc, item->text, (item == sel) ? selcol : normcol);
                }
                dc->w = textw(dc, ">");
                        drawtext(dc, item->text, (item == sel) ? selcol : normcol);
                }
                dc->w = textw(dc, ">");


@@ -148,7 +191,17 @@ drawmenu(void) {
                if(next)
                        drawtext(dc, ">", normcol);
        }
                if(next)
                        drawtext(dc, ">", normcol);
        }

-       commitdraw(dc, win);
+       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
 }
 
 void


@@ -165,7 +218,9 @@ grabkeyboard(void) {
 
 void
 insert(const char *s, ssize_t n) {
 
 void
 insert(const char *s, ssize_t n) {

-       memmove(text + cursor + n, text + cursor, sizeof text - cursor - 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, s, n);
        cursor += n;
        if(n > 0)
                memcpy(text + cursor, s, n);
        cursor += n;


@@ -173,15 +228,14 @@ insert(const char *s, ssize_t n) {
 }
 
 void
 }
 
 void

-keypress(XKeyEvent *e) {
-       char buf[sizeof text];
-       int n;
+keypress(XKeyEvent *ev) {
+       char buf[32];

        size_t len;
        KeySym ksym;
 
        len = strlen(text);
        size_t len;
        KeySym ksym;
 
        len = strlen(text);

-       XLookupString(e, buf, sizeof buf, &ksym, NULL);
-       if(e->state & ControlMask) {
+       XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+       if(ev->state & ControlMask)

                switch(tolower(ksym)) {
                default:
                        return;
                switch(tolower(ksym)) {
                default:
                        return;


@@ -194,6 +248,9 @@ keypress(XKeyEvent *e) {
                case XK_c:
                        ksym = XK_Escape;
                        break;
                case XK_c:
                        ksym = XK_Escape;
                        break;

+               case XK_d:
+                       ksym = XK_Delete;
+                       break;

                case XK_e:
                        ksym = XK_End;
                        break;
                case XK_e:
                        ksym = XK_End;
                        break;


@@ -207,7 +264,6 @@ keypress(XKeyEvent *e) {
                        ksym = XK_Tab;
                        break;
                case XK_j:
                        ksym = XK_Tab;
                        break;
                case XK_j:

-               case XK_m:

                        ksym = XK_Return;
                        break;
                case XK_k:  /* delete right */
                        ksym = XK_Return;
                        break;
                case XK_k:  /* delete right */


@@ -221,51 +277,45 @@ keypress(XKeyEvent *e) {
                        ksym = XK_Up;
                        break;
                case XK_u:  /* delete left */
                        ksym = XK_Up;
                        break;
                case XK_u:  /* delete left */

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

                        break;
                case XK_w:  /* delete word */
                        break;
                case XK_w:  /* delete word */

-                       if(cursor == 0)
-                               return;
-                       n = 0;
-                       while(cursor - n++ > 0 && text[cursor - n] == ' ');
-                       while(cursor - n++ > 0 && text[cursor - n] != ' ');
-                       insert(NULL, 1-n);
+                       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 */
                        break;
                case XK_y:  /* paste selection */

-                       XConvertSelection(dc->dpy, XA_PRIMARY, utf8, None, win, CurrentTime);
-                       /* causes SelectionNotify event */
+                       XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);

                        return;
                }
                        return;
                }

-       }

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

-               if(!iscntrl((int)*buf))
-                       insert(buf, MIN(strlen(buf), sizeof text - cursor));
-               break;
-       case XK_BackSpace:
-               if(cursor == 0)
-                       return;
-               for(n = 1; cursor - n > 0 && !UTF8_CODEPOINT(text[cursor - n]); n++);
-               insert(NULL, -n);
+               if(!iscntrl(*buf))
+                       insert(buf, strlen(buf));

                break;
        case XK_Delete:
                if(cursor == len)
                        return;
                break;
        case XK_Delete:
                if(cursor == len)
                        return;

-               for(n = 1; cursor + n < len && !UTF8_CODEPOINT(text[cursor + n]); n++);
-               cursor += n;
-               insert(NULL, -n);
+               cursor = nextrune(+1);
+       case XK_BackSpace:
+               if(cursor > 0)
+                       insert(NULL, nextrune(-1) - cursor);

                break;
        case XK_End:
                if(cursor < len) {
                        cursor = len;
                        break;
                }
                break;
        case XK_End:
                if(cursor < len) {
                        cursor = len;
                        break;
                }

-               while(next) {
-                       sel = curr = next;
+               if(next) {
+                       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);


@@ -279,16 +329,13 @@ keypress(XKeyEvent *e) {
                break;
        case XK_Left:
                if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
                break;
        case XK_Left:
                if(cursor > 0 && (!sel || !sel->left || lines > 0)) {

-                       while(cursor-- > 0 && !UTF8_CODEPOINT(text[cursor]));
+                       cursor = nextrune(-1);

                        break;
                }
                else if(lines > 0)
                        return;
        case XK_Up:
                        break;
                }
                else if(lines > 0)
                        return;
        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();
                }


@@ -307,21 +354,17 @@ keypress(XKeyEvent *e) {
                break;
        case XK_Return:
        case XK_KP_Enter:
                break;
        case XK_Return:
        case XK_KP_Enter:

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

                exit(EXIT_SUCCESS);
        case XK_Right:
                if(cursor < len) {
                exit(EXIT_SUCCESS);
        case XK_Right:
                if(cursor < len) {

-                       while(cursor++ < len && !UTF8_CODEPOINT(text[cursor]));
+                       cursor = nextrune(+1);

                        break;
                }
                else if(lines > 0)
                        return;
        case XK_Down:
                        break;
                }
                else if(lines > 0)
                        return;
        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();
                }


@@ -339,43 +382,52 @@ keypress(XKeyEvent *e) {
 
 void
 match(void) {
 
 void
 match(void) {

-       unsigned int len;
-       Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+       size_t len = strlen(text);
+       Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;

 
 

-       len = strlen(text);
-       matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-       for(item = allitems; item; item = item->next)
+       matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL;
+       for(item = items; item && item->text; item++)

                if(!fstrncmp(text, item->text, len + 1))
                        appenditem(item, &lexact, &exactend);
                else if(!fstrncmp(text, item->text, len))
                        appenditem(item, &lprefix, &prefixend);
                else if(fstrstr(item->text, text))
                        appenditem(item, &lsubstr, &substrend);
                if(!fstrncmp(text, item->text, len + 1))
                        appenditem(item, &lexact, &exactend);
                else if(!fstrncmp(text, item->text, len))
                        appenditem(item, &lprefix, &prefixend);
                else if(fstrstr(item->text, text))
                        appenditem(item, &lsubstr, &substrend);

+

        if(lexact) {
                matches = lexact;
        if(lexact) {
                matches = lexact;

-               itemend = exactend;
+               matchend = exactend;

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

-               if(itemend) {
-                       itemend->right = lprefix;
-                       lprefix->left = itemend;
+               if(matchend) {
+                       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(matchend) {
+                       matchend->right = lsubstr;
+                       lsubstr->left = matchend;

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

+               matchend = substrend;

        }
        }

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

        calcoffsets();
 }
 
        calcoffsets();
 }
 

+size_t
+nextrune(int incr) {
+       size_t n, len = strlen(text);
+
+       for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+       return n;
+}
+

 void
 paste(void) {
        char *p, *q;
 void
 paste(void) {
        char *p, *q;


@@ -383,7 +435,7 @@ paste(void) {
        unsigned long dl;
        Atom da;
 
        unsigned long dl;
        Atom da;
 

-       XGetWindowProperty(dc->dpy, win, utf8, 0, sizeof text - cursor, True,
+       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));
        XFree(p);
                           utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
        insert(p, (q = strchr(p, '\n')) ? q-p : strlen(p));
        XFree(p);


@@ -393,22 +445,17 @@ paste(void) {
 void
 readstdin(void) {
        char buf[sizeof text], *p;
 void
 readstdin(void) {
        char buf[sizeof text], *p;

-       Item *item, *new;
+       size_t i, size = 0;

 
 

-       allitems = NULL;
-       for(item = NULL; fgets(buf, sizeof buf, stdin); item = new) {
+       for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) {
+               if(i+1 == size / sizeof *items || !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(!(new = malloc(sizeof *new)))
-                       eprintf("cannot malloc %u bytes\n", sizeof *new);
-               if(!(new->text = strdup(buf)))
-                       eprintf("cannot strdup %u bytes\n", strlen(buf));
-               inputw = MAX(inputw, textw(dc, new->text));
-               new->next = new->left = new->right = NULL;
-               if(item)
-                       item->next = new;
-               else
-                       allitems = new;
+               if(!(items[i].text = strdup(buf)))
+                       eprintf("cannot strdup %u bytes:", strlen(buf)+1);
+               inputw = MAX(inputw, textw(dc, items[i].text));

        }
 }
 
        }
 }
 


@@ -454,8 +501,10 @@ setup(void) {
        selcol[ColBG] = getcolor(dc, selbgcolor);
        selcol[ColFG] = getcolor(dc, selfgcolor);
 
        selcol[ColBG] = getcolor(dc, selbgcolor);
        selcol[ColFG] = getcolor(dc, selfgcolor);
 

-       /* input window geometry */
-       mh = (dc->font.height + 2) * (lines + 1);
+       /* 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;
 #ifdef XINERAMA
        if((info = XineramaQueryScreens(dc->dpy, &n))) {
                int i, di;


@@ -463,8 +512,9 @@ setup(void) {
                Window dw;
 
                XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
                Window dw;
 
                XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);

-               for(i = 0; i < n; i++)
-                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+               for(i = 0; i < n-1; 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);
                                break;
                x = info[i].x_org;
                y = info[i].y_org + (topbar ? 0 : info[i].height - mh);


@@ -478,73 +528,18 @@ 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);
        }

-       /* input window */
+       /* menu window */

        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,

-                       DefaultDepth(dc->dpy, screen), CopyFromParent,
-                       DefaultVisual(dc->dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+                           DefaultDepth(dc->dpy, screen), CopyFromParent,
+                           DefaultVisual(dc->dpy, screen),
+                           CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);

 
        grabkeyboard();
 
        grabkeyboard();

-       setcanvas(dc, win, mw, mh);
+       resizedc(dc, mw, mh);

        inputw = MIN(inputw, mw/3);
        inputw = MIN(inputw, mw/3);

-       promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
+       promptw = prompt ? textw(dc, prompt) : 0;

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

-       text[0] = '\0';
-       match();
-}
-
-void
-usage(void) {
-       fputs("usage: dmenu [-b] [-i] [-l lines] [-p prompt] [-fn font] [-nb color]\n"
-             "             [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
-       exit(EXIT_FAILURE);
-}
-
-int
-main(int argc, char *argv[]) {
-       int i;
-
-       progname = "dmenu";
-       dc = initdraw();
-
-       for(i = 1; i < argc; i++)
-               /* single flags */
-               if(!strcmp(argv[i], "-v")) {
-                       fputs("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n", stdout);
-                       exit(EXIT_SUCCESS);
-               }
-               else if(!strcmp(argv[i], "-b"))
-                       topbar = False;
-               else if(!strcmp(argv[i], "-i")) {
-                       fstrncmp = strncasecmp;
-                       fstrstr = cistrstr;
-               }
-               else if(i == argc-1)
-                       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"))
-                       initfont(dc, 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();
-
-       readstdin();
-       setup();
-       run();
-
-       return EXIT_FAILURE;  /* should not reach */

 }
 }