cleaned up

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index c353c60..227648c 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,13 +1,10 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>

-#include <locale.h>
-#include <stdarg.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <strings.h>

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

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

 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #ifdef XINERAMA


@@ -15,244 +12,175 @@
 #endif
 #include <draw.h>
 
 #endif
 #include <draw.h>
 

-/* macros */
-#define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))
-#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 IS_UTF8_1ST_CHAR(c)     ((((c) & 0xc0) == 0xc0) || !((c) & 0x80))
+#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 items matching current search pattern */
+       Item *next;          /* traverses all items */
+       Item *left, *right;  /* traverses matching items */

 };
 
 };
 

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

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

-static void cleanup(void);
-static void dinput(void);

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

-static void drawmenuh(void);
-static void drawmenuv(void);
-static Bool grabkeyboard(void);
-static void kpress(XKeyEvent *e);
-static void match(char *pattern);
+static void grabkeyboard(void);
+static void insert(const char *s, ssize_t n);
+static void keypress(XKeyEvent *e);
+static void match(void);
+static void paste(void);

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

+static void usage(void);

 
 

-#include "config.h"
-
-/* variables */
-static char **argp = NULL;
-static char *maxname = NULL;
-static char *prompt = NULL;

 static char text[4096];
 static char text[4096];

-static int cmdw = 0;
-static int promptw = 0;
-static int ret = 0;
-static int screen;
+static size_t cursor = 0;
+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 lines = 0;

-static unsigned int numlockmask = 0;

 static unsigned int mw, mh;
 static unsigned int mw, mh;

+static unsigned int promptw;

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

-static Bool running = True;
+static Atom utf8;

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

-static DC dc;
-static Display *dpy;
-static Item *allitems = NULL;  /* first of all items */
-static Item *item = NULL;      /* first of pattern matching items */
-static Item *sel = NULL;
-static Item *next = NULL;
-static Item *prev = NULL;
-static Item *curr = NULL;
-static Window win, parent;
+static DC *dc;
+static Item *allitems, *matches;
+static Item *curr, *prev, *next, *sel;
+static Window root, win;
+

 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;

-static void (*calcoffsets)(void) = calcoffsetsh;

 
 void
 
 void

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

        else
        else

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

 }
 
 void
 }
 
 void

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

 
 

-       w = promptw + cmdw + (2 * spaceitem);
-       for(next = curr; next; next = next->right)
-               if((w += MIN(textw(&dc, next->text), mw / 3)) > mw)
+       h = dc->font.height+2;
+       if(lines > 0)
+               n = lines * h;
+       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)

                        break;
                        break;

-       w = promptw + cmdw + (2 * spaceitem);
-       for(prev = curr; prev && prev->left; prev = prev->left)
-               if((w += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
+       for(i = 0; prev && prev->left; prev = prev->left)
+               if((i += (lines > 0) ? h : MIN(textw(dc, prev->left->text), mw/3)) > n)

                        break;
 }
 
                        break;
 }
 

-void
-calcoffsetsv(void) {
-       unsigned int i;
-
-       next = prev = curr;
-       for(i = 0; i < lines && next; i++)
-               next = next->right;
-       mh = (dc.font.height + 2) * (i + 1);
-       for(i = 0; i < lines && prev && prev->left; i++)
-               prev = prev->left;
-}
-

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

-       int c, csub;
-       unsigned int len;
+       size_t 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;
+       for(len = strlen(sub); *s; s++)
+               if(!strncasecmp(s, sub, len))
+                       return (char *)s;
+       return NULL;

 }
 
 void
 }
 
 void

-cleanup(void) {
-       Item *itm;
-
-       while(allitems) {
-               itm = allitems->next;
-               free(allitems->text);
-               free(allitems);
-               allitems = itm;
-       }
-       cleanupdraw(&dc);
-       XDestroyWindow(dpy, win);
-       XUngrabKeyboard(dpy, CurrentTime);
-}
+drawmenu(void) {
+       Item *item;

 
 

-void
-dinput(void) {
-       cleanup();
-       argp[0] = "dinput";
-       argp[1] = text;
-       execvp("dinput", argp);
-       eprint("cannot exec dinput\n");
-}
+       dc->x = 0;
+       dc->y = 0;
+       drawrect(dc, 0, 0, mw, mh, BG(dc, normcol));

 
 

-void
-drawmenu(void) {
-       dc.x = 0;
-       dc.y = 0;
-       dc.w = mw;
-       dc.h = mh;
-       drawtext(&dc, NULL, normcol, False);
-       dc.h = dc.font.height + 2;
-       dc.y = topbar ? 0 : mh - dc.h;
+       dc->h = dc->font.height + 2;
+       dc->y = topbar ? 0 : mh - dc->h;

        /* print prompt? */
        if(prompt) {
        /* print prompt? */
        if(prompt) {

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

        }
        }

-       dc.w = mw - dc.x;
-       /* print command */
-       if(cmdw && item && lines == 0)
-               dc.w = cmdw;
-       drawtext(&dc, *text ? text : NULL, normcol, False);
-       if(lines > 0)
-               drawmenuv();
-       else
-               drawmenuh();
-       XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
-       XFlush(dpy);
-}
-
-void
-drawmenuh(void) {
-       Item *i;
-
-       dc.x += cmdw;
-       dc.w = spaceitem;
-       drawtext(&dc, curr && curr->left ? "<" : NULL, normcol, False);
-       dc.x += dc.w;
-       for(i = curr; i != next; i = i->right) {
-               dc.w = MIN(textw(&dc, i->text), mw / 3);
-               drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
-               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);
+       drawrect(dc, textnw(dc, text, cursor) + dc->h/2 - 2, 2, 1, dc->h - 4, FG(dc, normcol));
+
+       if(lines > 0) {
+               dc->y = topbar ? dc->h : 0;
+               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.w = spaceitem;
-       dc.x = mw - dc.w;
-       drawtext(&dc, next ? ">" : NULL, normcol, False);
-}
-
-void
-drawmenuv(void) {
-       Item *i;
-       XWindowAttributes wa;
-
-       dc.y = topbar ? dc.h : 0;
-       dc.w = mw - dc.x;
-       for(i = curr; i != next; i = i->right) {
-               drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);
-               dc.y += dc.h;
+       else if(curr && (dc->w == inputw || curr->next)) {
+               dc->x += inputw;
+               dc->w = textw(dc, "<");
+               if(prev)
+                       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);

        }
        }

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

 }
 
 }
 

-Bool
+void

 grabkeyboard(void) {
 grabkeyboard(void) {

-       unsigned int len;
+       int i;

 
 

-       for(len = 1000; len; len--) {
-               if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-               == GrabSuccess)
-                       break;
+       for(i = 0; i < 1000; i++) {
+               if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+                       return;

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

-       return len > 0;
+       eprintf("cannot grab keyboard\n");

 }
 
 void
 }
 
 void

-kpress(XKeyEvent *e) {
+insert(const char *s, ssize_t n) {
+       memmove(text + cursor + n, text + cursor, sizeof text - cursor - n);
+       if(n > 0)
+               memcpy(text + cursor, s, n);
+       cursor += n;
+       match();
+}
+
+void
+keypress(XKeyEvent *e) {

        char buf[sizeof text];
        char buf[sizeof text];

-       int num;
-       unsigned int i, len;
+       int n;
+       size_t len;

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

-       num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
-       if(ksym == XK_KP_Enter)
-               ksym = XK_Return;
-       else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
-               ksym = (ksym - XK_KP_0) + XK_0;
-       else if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
-       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
-       || IsPrivateKeypadKey(ksym))
-               return;
-       /* first check if a control mask is omitted */
+       XLookupString(e, buf, sizeof buf, &ksym, NULL);

        if(e->state & ControlMask) {
                switch(tolower(ksym)) {
                default:
        if(e->state & ControlMask) {
                switch(tolower(ksym)) {
                default:


@@ -282,45 +210,56 @@ kpress(XKeyEvent *e) {
                case XK_m:
                        ksym = XK_Return;
                        break;
                case XK_m:
                        ksym = XK_Return;
                        break;

+               case XK_k:  /* delete right */
+                       text[cursor] = '\0';
+                       match();
+                       break;

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

-               case XK_u:
-                       text[0] = '\0';
-                       match(text);
+               case XK_u:  /* delete left */
+                       insert(NULL, -cursor);

                        break;
                        break;

-               case XK_w:
-                       if(len == 0)
+               case XK_w:  /* delete word */
+                       if(cursor == 0)

                                return;
                                return;

-                       i = len;
-                       while(i-- > 0 && text[i] == ' ');
-                       while(i-- > 0 && text[i] != ' ');
-                       text[++i] = '\0';
-                       match(text);
+                       n = 0;
+                       while(cursor - n++ > 0 && text[cursor - n] == ' ');
+                       while(cursor - n++ > 0 && text[cursor - n] != ' ');
+                       insert(NULL, 1-n);

                        break;
                        break;

+               case XK_y:  /* paste selection */
+                       XConvertSelection(dc->dpy, XA_PRIMARY, utf8, None, win, CurrentTime);
+                       /* causes SelectionNotify event */
+                       return;

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

-               num = MIN(num, sizeof text);
-               if(num && !iscntrl((int) buf[0])) {
-                       memcpy(text + len, buf, num + 1);
-                       len += num;
-                       match(text);
-               }
+               if(!iscntrl((int)*buf))
+                       insert(buf, MIN(strlen(buf), sizeof text - cursor));

                break;
        case XK_BackSpace:
                break;
        case XK_BackSpace:

-               if(len == 0)
+               if(cursor == 0)

                        return;
                        return;

-               for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[len - i]); i++);
-               len -= i;
-               text[len] = '\0';
-               match(text);
+               for(n = 1; cursor - n > 0 && !UTF8_CODEPOINT(text[cursor - n]); n++);
+               insert(NULL, -n);
+               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);

                break;
        case XK_End:
                break;
        case XK_End:

+               if(cursor < len) {
+                       cursor = len;
+                       break;
+               }

                while(next) {
                        sel = curr = next;
                        calcoffsets();
                while(next) {
                        sel = curr = next;
                        calcoffsets();


@@ -329,14 +268,22 @@ kpress(XKeyEvent *e) {
                        sel = sel->right;
                break;
        case XK_Escape:
                        sel = sel->right;
                break;
        case XK_Escape:

-               ret = 1;
-               running = False;
-               return;
+               exit(EXIT_FAILURE);

        case XK_Home:
        case XK_Home:

-               sel = curr = item;
+               if(sel == matches) {
+                       cursor = 0;
+                       break;
+               }
+               sel = curr = matches;

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

+               if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
+                       while(cursor-- > 0 && !UTF8_CODEPOINT(text[cursor]));
+                       break;
+               }
+               else if(lines > 0)
+                       return;

        case XK_Up:
                if(!sel || !sel->left)
                        return;
        case XK_Up:
                if(!sel || !sel->left)
                        return;


@@ -359,13 +306,17 @@ kpress(XKeyEvent *e) {
                calcoffsets();
                break;
        case XK_Return:
                calcoffsets();
                break;
        case XK_Return:

-               if(e->state & ShiftMask)
-                       dinput();
-               fprintf(stdout, "%s", sel ? sel->text : text);
+       case XK_KP_Enter:
+               fputs((sel && !(e->state & ShiftMask)) ? sel->text : text, stdout);

                fflush(stdout);
                fflush(stdout);

-               running = False;
-               return;
+               exit(EXIT_SUCCESS);

        case XK_Right:
        case XK_Right:

+               if(cursor < len) {
+                       while(cursor++ < len && !UTF8_CODEPOINT(text[cursor]));
+                       break;
+               }
+               else if(lines > 0)
+                       return;

        case XK_Down:
                if(!sel || !sel->right)
                        return;
        case XK_Down:
                if(!sel || !sel->right)
                        return;


@@ -376,32 +327,32 @@ kpress(XKeyEvent *e) {
                }
                break;
        case XK_Tab:
                }
                break;
        case XK_Tab:

-               if(sel)
-                       strncpy(text, sel->text, sizeof text);
-               dinput();
+               if(!sel)
+                       return;
+               strncpy(text, sel->text, sizeof text);
+               cursor = strlen(text);
+               match();

                break;
        }
        drawmenu();
 }
 
 void
                break;
        }
        drawmenu();
 }
 
 void

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

-               item = lexact;
+               matches = lexact;

                itemend = exactend;
        }
        if(lprefix) {
                itemend = exactend;
        }
        if(lprefix) {


@@ -410,7 +361,7 @@ match(char *pattern) {
                        lprefix->left = itemend;
                }
                else
                        lprefix->left = itemend;
                }
                else

-                       item = lprefix;
+                       matches = lprefix;

                itemend = prefixend;
        }
        if(lsubstr) {
                itemend = prefixend;
        }
        if(lsubstr) {


@@ -419,36 +370,45 @@ match(char *pattern) {
                        lsubstr->left = itemend;
                }
                else
                        lsubstr->left = itemend;
                }
                else

-                       item = lsubstr;
+                       matches = lsubstr;

        }
        }

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

        calcoffsets();
 }
 
        calcoffsets();
 }
 

+void
+paste(void) {
+       char *p, *q;
+       int di;
+       unsigned long dl;
+       Atom da;
+
+       XGetWindowProperty(dc->dpy, win, utf8, 0, sizeof text - cursor, True,
+                          utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
+       insert(p, (q = strchr(p, '\n')) ? q-p : strlen(p));
+       XFree(p);
+       drawmenu();
+}
+

 void
 readstdin(void) {
 void
 readstdin(void) {

-       char *p, buf[sizeof text];
-       unsigned int len = 0, max = 0;
-       Item *i, *new;
-
-       i = NULL;
-       while(fgets(buf, sizeof buf, stdin)) {
-               len = strlen(buf);
-               if(buf[len-1] == '\n')
-                       buf[--len] = '\0';
-               if(!(p = strdup(buf)))
-                       eprint("cannot strdup %u bytes\n", len);
-               if((max = MAX(max, len)) == len)
-                       maxname = p;
+       char buf[sizeof text], *p;
+       Item *item, *new;
+
+       allitems = NULL;
+       for(item = NULL; fgets(buf, sizeof buf, stdin); item = new) {
+               if((p = strchr(buf, '\n')))
+                       *p = '\0';

                if(!(new = malloc(sizeof *new)))
                if(!(new = malloc(sizeof *new)))

-                       eprint("cannot malloc %u bytes\n", 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;
                new->next = new->left = new->right = NULL;

-               new->text = p;
-               if(!i)
+               if(item)
+                       item->next = new;
+               else

                        allitems = new;
                        allitems = new;

-               else 
-                       i->next = new;
-               i = new;

        }
 }
 
        }
 }
 


@@ -456,167 +416,135 @@ void
 run(void) {
        XEvent ev;
 
 run(void) {
        XEvent ev;
 

-       /* main event loop */
-       while(running && !XNextEvent(dpy, &ev))
+       while(!XNextEvent(dc->dpy, &ev))

                switch(ev.type) {
                switch(ev.type) {

-               case KeyPress:
-                       kpress(&ev.xkey);
-                       break;

                case Expose:
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;
                case Expose:
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;

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

                case VisibilityNotify:
                case VisibilityNotify:

-                       if (ev.xvisibility.state != VisibilityUnobscured)
-                               XRaiseWindow(dpy, win);
+                       if(ev.xvisibility.state != VisibilityUnobscured)
+                               XRaiseWindow(dc->dpy, win);

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

-       int i, j, x, y;
-#if XINERAMA
+       int x, y, screen;
+       XSetWindowAttributes wa;
+#ifdef XINERAMA

        int n;
        int n;

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

 #endif
 #endif

-       XModifierKeymap *modmap;
-       XSetWindowAttributes wa;
-       XWindowAttributes pwa;
-
-       /* init modifier map */
-       modmap = XGetModifierMapping(dpy);
-       for(i = 0; i < 8; i++)
-               for(j = 0; j < modmap->max_keypermod; j++) {
-                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
-                       == XKeysymToKeycode(dpy, XK_Num_Lock))
-                               numlockmask = (1 << i);
-               }
-       XFreeModifiermap(modmap);

 
 

-       dc.dpy = dpy;
-       normcol[ColBG] = getcolor(&dc, normbgcolor);
-       normcol[ColFG] = getcolor(&dc, normfgcolor);
-       selcol[ColBG] = getcolor(&dc, selbgcolor);
-       selcol[ColFG] = getcolor(&dc, selfgcolor);
-       initfont(&dc, font);
+       screen = DefaultScreen(dc->dpy);
+       root = RootWindow(dc->dpy, screen);
+       utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);

 
 

-       /* menu window */
-       wa.override_redirect = True;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+       normcol[ColBG] = getcolor(dc, normbgcolor);
+       normcol[ColFG] = getcolor(dc, normfgcolor);
+       selcol[ColBG] = getcolor(dc, selbgcolor);
+       selcol[ColFG] = getcolor(dc, selfgcolor);

 
 

-       /* menu window geometry */
-       mh = (dc.font.height + 2) * (lines + 1);
-#if XINERAMA
-       if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
-               i = 0;
-               if(n > 1) {
-                       int di;
-                       unsigned int dui;
-                       Window dummy;
-                       if(XQueryPointer(dpy, parent, &dummy, &dummy, &x, &y, &di, &di, &dui))
-                               for(i = 0; i < n; i++)
-                                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
-                                               break;
-               }
+       /* input window geometry */
+       mh = (dc->font.height + 2) * (lines + 1);
+#ifdef XINERAMA
+       if((info = XineramaQueryScreens(dc->dpy, &n))) {
+               int i, di;
+               unsigned int 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))
+                               break;

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

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

                mw = info[i].width;
                XFree(info);
        }
        else
 #endif
        {
                mw = info[i].width;
                XFree(info);
        }
        else
 #endif
        {

-               if(!XGetWindowAttributes(dpy, parent, &pwa))
-                       eprint("cannot get window attributes");

                x = 0;
                x = 0;

-               y = topbar ? 0 : pwa.height - mh;
-               mw = pwa.width;
+               y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
+               mw = DisplayWidth(dc->dpy, screen);

        }
        }

-
-       win = XCreateWindow(dpy, parent, x, y, mw, mh, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen),
+       /* input 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,
+                       DefaultDepth(dc->dpy, screen), CopyFromParent,
+                       DefaultVisual(dc->dpy, screen),

                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 

-       setupdraw(&dc, win);
-       if(maxname)
-               cmdw = MIN(textw(&dc, maxname), mw / 3);
-       if(prompt)
-               promptw = MIN(textw(&dc, prompt), mw / 5);
+       grabkeyboard();
+       setcanvas(dc, win, mw, mh);
+       inputw = MIN(inputw, mw/3);
+       promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0;
+       XMapRaised(dc->dpy, win);

        text[0] = '\0';
        text[0] = '\0';

-       match(text);
-       XMapRaised(dpy, win);
+       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
 main(int argc, char *argv[]) {

-       unsigned int i;
+       int i;
+
+       progname = "dmenu";
+       dc = initdraw();

 
 

-       /* command line args */
-       progname = argv[0];

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

-               if(!strcmp(argv[i], "-i")) {
-                       fstrncmp = strncasecmp;
-                       fstrstr = cistrstr;
+               /* 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], "-b"))
                        topbar = False;

-               else if(!strcmp(argv[i], "-e")) {
-                       if(++i < argc) parent = atoi(argv[i]);
-               }
-               else if(!strcmp(argv[i], "-l")) {
-                       if(++i < argc) lines = atoi(argv[i]);
-                       if(lines > 0)
-                               calcoffsets = calcoffsetsv;
-               }
-               else if(!strcmp(argv[i], "-fn")) {
-                       if(++i < argc) font = argv[i];
-               }
-               else if(!strcmp(argv[i], "-nb")) {
-                       if(++i < argc) normbgcolor = argv[i];
-               }
-               else if(!strcmp(argv[i], "-nf")) {
-                       if(++i < argc) normfgcolor = argv[i];
-               }
-               else if(!strcmp(argv[i], "-p")) {
-                       if(++i < argc) prompt = argv[i];
-               }
-               else if(!strcmp(argv[i], "-sb")) {
-                       if(++i < argc) selbgcolor = argv[i];
-               }
-               else if(!strcmp(argv[i], "-sf")) {
-                       if(++i < argc) selfgcolor = argv[i];
-               }
-               else if(!strcmp(argv[i], "-v")) {
-                       printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
-                       exit(EXIT_SUCCESS);
-               }
-               else {
-                       fputs("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
-                              "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n", stderr);
-                       exit(EXIT_FAILURE);
+               else if(!strcmp(argv[i], "-i")) {
+                       fstrncmp = strncasecmp;
+                       fstrstr = cistrstr;

                }
                }

-       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-               fprintf(stderr, "dmenu: warning: no locale support\n");
-       if(!(dpy = XOpenDisplay(NULL)))
-               eprint("cannot open display\n");
-       screen = DefaultScreen(dpy);
-       if(!parent)
-               parent = RootWindow(dpy, screen);
-       if(!(argp = malloc(sizeof *argp * (argc+2))))
-               eprint("cannot malloc %u bytes\n", sizeof *argp * (argc+2));
-       memcpy(argp + 2, argv + 1, sizeof *argp * argc);
+               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();
 
        readstdin();

-       running = grabkeyboard();
-

        setup();
        setup();

-       drawmenu();
-       XSync(dpy, False);

        run();
        run();

-       cleanup();
-       XCloseDisplay(dpy);
-       return ret;
+
+       return EXIT_FAILURE;  /* should not reach */

 }
 }