signed ints, ignore negative -l value

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 12902ac..a5a4cdd 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,24 +1,20 @@
 /* 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 <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

-#include <X11/keysym.h>
-#include <X11/Xatom.h>

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

+#include <X11/Xatom.h>

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

-#include "config.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 {
 
 typedef struct Item Item;
 struct Item {


@@ -28,46 +24,47 @@ struct Item {
 };
 
 static void appenditem(Item *item, Item **list, Item **last);
 };
 
 static void appenditem(Item *item, Item **list, Item **last);

-static void calcoffsetsh(void);
-static void calcoffsetsv(void);
-static char *cistrstr(const char *s, const char *sub);
+static void calcoffsets(void);

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

-static void drawmenuh(void);
-static void drawmenuv(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 void paste(Atom atom);
+static size_t nextrune(int incr);
+static void paste(void);

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

-static char *prompt;
-static char text[4096];
-static int screen;
+static char text[BUFSIZ];
+static int bh, mw, mh;
+static int inputw = 0;
+static int promptw;
+static int lines = 0;

 static size_t cursor = 0;
 static size_t cursor = 0;

-static unsigned int inputw = 0;
-static unsigned int lines = 0;
-static unsigned int mw, mh;
-static unsigned int promptw = 0;
+static const char *font = NULL;
+static const char *prompt = NULL;
+static const char *normbgcolor = "#cccccc";
+static const char *normfgcolor = "#000000";
+static const char *selbgcolor  = "#0066ff";
+static const char *selfgcolor  = "#ffffff";

 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static Atom utf8;
 static Bool topbar = True;
 static 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 DC *dc;
+static Item *items = NULL;
+static Item *matches, *sel;
+static Item *prev, *curr, *next;

 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;
-static void (*calcoffsets)(void) = calcoffsetsh;

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

-       if(!(*last))
+       if(!*last)

                *list = item;
        else
                (*last)->right = item;
                *list = item;
        else
                (*last)->right = item;


@@ -77,120 +74,75 @@ appenditem(Item *item, Item **list, Item **last) {
 }
 
 void
 }
 
 void

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

 
 

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

                        break;
 }
 
 void
                        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;
-}
+drawmenu(void) {
+       int curpos;
+       Item *item;

 
 

-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;
-}
+       dc->x = 0;
+       dc->y = 0;
+       dc->h = bh;
+       drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));

 
 

-void
-drawmenu(void) {
-       dc.x = 0;
-       dc.y = 0;
-       dc.w = mw;
-       dc.h = mh;
-       drawbox(&dc, normcol);
-       dc.h = dc.font.height + 2;
-       dc.y = topbar ? 0 : mh - dc.h;
-       /* print prompt? */

        if(prompt) {
        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 input area */
-       if(matches && lines == 0 && textw(&dc, text) <= inputw)
-               dc.w = inputw;
-       drawtext(&dc, text, normcol);
-       drawline(&dc, textnw(&dc, text, cursor) + dc.h/2 - 2, 2, 1, dc.h-4, normcol);
-       if(lines > 0)
-               drawmenuv();
-       else if(curr && (dc.w == inputw || curr->next))
-               drawmenuh();
-       commitdraw(&dc, win);
-}
-
-void
-drawmenuh(void) {
-       Item *item;
-
-       dc.x += inputw;
-       dc.w = textw(&dc, "<");
-       if(curr->left)
-               drawtext(&dc, "<", normcol);
-       dc.x += dc.w;
-       for(item = curr; item != next; item = item->right) {
-               dc.w = MIN(textw(&dc, item->text), mw / 3);
-               if(item == sel)
-                       drawbox(&dc, selcol);
-               drawtext(&dc, item->text, (item == sel) ? selcol : normcol);
-               dc.x += dc.w;
+       dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
+       drawtext(dc, text, normcol);
+       if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+               drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
+
+       if(lines > 0) {
+               dc->w = mw - dc->x;
+               for(item = curr; item != next; item = item->right) {
+                       dc->y += dc->h;
+                       drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+               }

        }
        }

-       dc.w = textw(&dc, ">");
-       dc.x = mw - dc.w;
-       if(next)
-               drawtext(&dc, ">", normcol);
+       else if(matches) {
+               dc->x += inputw;
+               dc->w = textw(dc, "<");
+               if(curr->left)
+                       drawtext(dc, "<", normcol);
+               for(item = curr; item != next; item = item->right) {
+                       dc->x += dc->w;
+                       dc->w = MIN(textw(dc, item->text), mw/3);
+                       drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+               }
+               dc->w = textw(dc, ">");
+               dc->x = mw - dc->w;
+               if(next)
+                       drawtext(dc, ">", normcol);
+       }
+       commitdraw(dc, win, mw, mh);

 }
 
 }
 

-void
-drawmenuv(void) {
-       Item *item;
-       XWindowAttributes wa;
-
-       dc.y = topbar ? dc.h : 0;
-       dc.w = mw - dc.x;
-       for(item = curr; item != next; item = item->right) {
-               if(item == sel)
-                       drawbox(&dc, selcol);
-               drawtext(&dc, item->text, (item == sel) ? selcol : normcol);
-               dc.y += dc.h;
-       }
-       if(!XGetWindowAttributes(dc.dpy, win, &wa))
-               eprintf("cannot get window attributes\n");
-       if(wa.height != mh)
-               XMoveResizeWindow(dc.dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
+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


@@ -198,7 +150,7 @@ grabkeyboard(void) {
        int i;
 
        for(i = 0; i < 1000; i++) {
        int i;
 
        for(i = 0; i < 1000; i++) {

-               if(!XGrabKeyboard(dc.dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+               if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))

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


@@ -207,7 +159,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;


@@ -215,15 +169,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;


@@ -236,6 +189,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;


@@ -249,11 +205,11 @@ 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 */
                        text[cursor] = '\0';
                        ksym = XK_Return;
                        break;
                case XK_k:  /* delete right */
                        text[cursor] = '\0';

+                       match();

                        break;
                case XK_n:
                        ksym = XK_Down;
                        break;
                case XK_n:
                        ksym = XK_Down;


@@ -262,39 +218,31 @@ 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, -(--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;
                }
        }
        switch(ksym) {
        default:
                        return;
                }
        }
        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(isprint(*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) {
                break;
        case XK_End:
                if(cursor < len) {


@@ -320,16 +268,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();
                }


@@ -348,21 +293,18 @@ keypress(XKeyEvent *e) {
                break;
        case XK_Return:
        case XK_KP_Enter:
                break;
        case XK_Return:
        case XK_KP_Enter:

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

                fflush(stdout);
                exit(EXIT_SUCCESS);
        case XK_Right:
                if(cursor < len) {
                fflush(stdout);
                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();
                }


@@ -380,18 +322,19 @@ keypress(XKeyEvent *e) {
 
 void
 match(void) {
 
 void
 match(void) {

-       unsigned int 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;
        Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
        len = strlen(text);
        matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;

-       for(item = allitems; item; item = item->next)
+       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))
                        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;
                itemend = exactend;
        if(lexact) {
                matches = lexact;
                itemend = exactend;


@@ -417,16 +360,24 @@ match(void) {
        calcoffsets();
 }
 
        calcoffsets();
 }
 

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

 void
 void

-paste(Atom atom)
-{
+paste(void) {

        char *p, *q;
        int di;
        unsigned long dl;
        Atom da;
 
        char *p, *q;
        int di;
        unsigned long dl;
        Atom da;
 

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


@@ -434,25 +385,18 @@ paste(Atom atom)
 
 void
 readstdin(void) {
 
 void
 readstdin(void) {

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

        }
 }
 
        }
 }
 


@@ -460,7 +404,7 @@ void
 run(void) {
        XEvent ev;
 
 run(void) {
        XEvent ev;
 

-       while(!XNextEvent(dc.dpy, &ev))
+       while(!XNextEvent(dc->dpy, &ev))

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


@@ -470,39 +414,45 @@ run(void) {
                        keypress(&ev.xkey);
                        break;
                case SelectionNotify:
                        keypress(&ev.xkey);
                        break;
                case SelectionNotify:

-                       if(ev.xselection.property != None)
-                               paste(ev.xselection.property);
+                       if(ev.xselection.property == utf8)
+                               paste();

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

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

                        break;
                }
 }
 
 void
 setup(void) {
                        break;
                }
 }
 
 void
 setup(void) {

-       int x, y;
+       int x, y, screen;
+       XSetWindowAttributes wa;

 #ifdef XINERAMA
 #ifdef XINERAMA

-       int i, n;
+       int n;

        XineramaScreenInfo *info;
 #endif
        XineramaScreenInfo *info;
 #endif

-       XSetWindowAttributes wa;

 
 

-       normcol[ColBG] = getcolor(&dc, normbgcolor);
-       normcol[ColFG] = getcolor(&dc, normfgcolor);
-       selcol[ColBG] = getcolor(&dc, selbgcolor);
-       selcol[ColFG] = getcolor(&dc, selfgcolor);
+       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);
+       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
 #ifdef XINERAMA

-       if((info = XineramaQueryScreens(dc.dpy, &n))) {
-               int di;
+       if((info = XineramaQueryScreens(dc->dpy, &n))) {
+               int i, di;

                unsigned int du;
                Window dw;
 
                unsigned int du;
                Window dw;
 

-               XQueryPointer(dc.dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
+               XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);

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


@@ -515,31 +465,31 @@ setup(void) {
 #endif
        {
                x = 0;
 #endif
        {
                x = 0;

-               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;
        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);
+       win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
+                           DefaultDepth(dc->dpy, screen), CopyFromParent,
+                           DefaultVisual(dc->dpy, screen),
+                           CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);

 
 

-       match();

        grabkeyboard();
        grabkeyboard();

-       setupdraw(&dc, win);
-       inputw = MIN(inputw, mw / 3);
-       utf8 = XInternAtom(dc.dpy, "UTF8_STRING", False);
-       XMapRaised(dc.dpy, win);
+       setcanvas(dc, mw, mh);
+       inputw = MIN(inputw, mw/3);
+       promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
+       XMapRaised(dc->dpy, win);
+       text[0] = '\0';
+       match();

 }
 
 void
 usage(void) {
 }
 
 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);
+       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);
 }
 
        exit(EXIT_FAILURE);
 }
 


@@ -549,28 +499,22 @@ main(int argc, char *argv[]) {
 
        progname = "dmenu";
        for(i = 1; i < argc; i++)
 
        progname = "dmenu";
        for(i = 1; i < argc; i++)

-               /* 1-arg flags */
+               /* 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;
                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")) {
+               else if(!strcmp(argv[i], "-i"))

                        fstrncmp = strncasecmp;
                        fstrncmp = strncasecmp;

-                       fstrstr = cistrstr;
-               }

                else if(i == argc-1)
                        usage();
                else if(i == argc-1)
                        usage();

-               /* 2-arg flags */
-               else if(!strcmp(argv[i], "-l")) {
-                       if((lines = atoi(argv[++i])) > 0)
-                               calcoffsets = calcoffsetsv;
-               }
-               else if(!strcmp(argv[i], "-p")) {
+               /* double flags */
+               else if(!strcmp(argv[i], "-l"))
+                       lines = atoi(argv[++i]);
+               else if(!strcmp(argv[i], "-p"))

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

-                       promptw = MIN(textw(&dc, prompt), mw/5);
-               }

                else if(!strcmp(argv[i], "-fn"))
                        font = argv[++i];
                else if(!strcmp(argv[i], "-nb"))
                else if(!strcmp(argv[i], "-fn"))
                        font = argv[++i];
                else if(!strcmp(argv[i], "-nb"))


@@ -584,14 +528,8 @@ main(int argc, char *argv[]) {
                else
                        usage();
 
                else
                        usage();
 

-       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-               fputs("dmenu: warning: no locale support\n", stderr);
-       if(!(dc.dpy = XOpenDisplay(NULL)))
-               eprintf("cannot open display\n");
-       screen = DefaultScreen(dc.dpy);
-       root = RootWindow(dc.dpy, screen);
-       initfont(&dc, font);
-
+       dc = initdraw();
+       initfont(dc, font);

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