merged dmenu & dinput (clunky interface)

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 0d89474..1fdf7f5 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,11 +1,9 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.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 <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>


@@ -13,13 +11,13 @@
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif

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

 
 typedef struct Item Item;
 struct Item {
 
 typedef struct Item Item;
 struct Item {


@@ -28,45 +26,48 @@ struct Item {
        Item *left, *right; /* traverses items matching current search pattern */
 };
 
        Item *left, *right; /* traverses items matching current search pattern */
 };
 

-/* forward declarations */

 static void appenditem(Item *i, Item **list, Item **last);
 static void calcoffsetsh(void);
 static void calcoffsetsv(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);
 static void appenditem(Item *i, Item **list, Item **last);
 static void calcoffsetsh(void);
 static void calcoffsetsv(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);

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

 static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);
 static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);

-static void eprint(const char *errstr, ...);
-static Bool grabkeyboard(void);
-static void kpress(XKeyEvent * e);
-static void match(char *pattern);
+static void grabkeyboard(void);
+static void keypress(XKeyEvent *e);
+static void match(void);

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

-static void setup(Bool topbar);
-
-#include "config.h"
-#include "draw.h"
+static void setup(void);

 
 

-/* variables */
+static char **argp = NULL;

 static char *maxname = NULL;
 static char *maxname = NULL;

-static char *prompt = NULL;
+static char *prompt;

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

-static int cmdw = 0;
-static int promptw = 0;
-static int ret = 0;
-static unsigned int numlockmask = 0;
-static Bool running = True;
+static int promptw;
+static int screen;
+static size_t cur = 0;
+static unsigned int cmdw = 0;
+static unsigned int lines = 0;
+static unsigned int numlockmask;
+static unsigned int mw, mh;
+static unsigned long normcol[ColLast];
+static unsigned long selcol[ColLast];
+static 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 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;
+static Window win, root;
+

 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 unsigned int lines = 0;

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


@@ -82,30 +83,27 @@ appenditem(Item *i, Item **list, Item **last) {
 
 void
 calcoffsetsh(void) {
 
 void
 calcoffsetsh(void) {

-       unsigned int w;
+       unsigned int w, x;

 
 

-       if(!curr)
-               return;
-       w = promptw + cmdw + 2 * spaceitem;
-       for(next = curr; next && w < mw; next=next->right)
-               w += MIN(textw(next->text), mw / 3);
-       w = promptw + cmdw + 2 * spaceitem;
-       for(prev = curr; prev && prev->left && w < mw; prev=prev->left)
-               w += MIN(textw(prev->left->text), mw / 3);
+       w = promptw + cmdw + textw(&dc, "<") + textw(&dc, ">");
+       for(x = w, next = curr; next; next = next->right)
+               if((x += MIN(textw(&dc, next->text), mw / 3)) > mw)
+                       break;
+       for(x = w, prev = curr; prev && prev->left; prev = prev->left)
+               if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
+                       break;

 }
 
 void
 calcoffsetsv(void) {
 }
 
 void
 calcoffsetsv(void) {

-       unsigned int h;
+       unsigned int i;

 
 

-       if(!curr)
-               return;
-       h = (dc.font.height + 2) * lines;
-       for(next = curr; next && h > 0; next = next->right)
-               h -= dc.font.height + 2;
-       h = (dc.font.height + 2) * lines;
-       for(prev = curr; prev && prev->left && h > 0; prev = prev->left)
-               h -= dc.font.height + 2;
+       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 *
 }
 
 char *


@@ -132,9 +130,29 @@ cistrstr(const char *s, const char *sub) {
 
 void
 cleanup(void) {
 
 void
 cleanup(void) {

-       drawcleanup();
+       Item *itm;
+
+       while(allitems) {
+               itm = allitems->next;
+               free(allitems->text);
+               free(allitems);
+               allitems = itm;
+       }
+       cleanupdraw(&dc);

        XDestroyWindow(dpy, win);
        XUngrabKeyboard(dpy, CurrentTime);
        XDestroyWindow(dpy, win);
        XUngrabKeyboard(dpy, CurrentTime);

+       XCloseDisplay(dpy);
+}
+
+void
+drawitem(const char *s, unsigned long col[ColLast]) {
+       const char *p;
+       unsigned int w = textnw(&dc, text, strlen(text));
+
+       drawbox(&dc, col);
+       drawtext(&dc, s, col);
+       for(p = fstrstr(s, text); *text && (p = fstrstr(p, text)); p++)
+               drawline(&dc, textnw(&dc, s, p-s) + dc.h/2 - 1, dc.h-2, w, 1, col);

 }
 
 void
 }
 
 void


@@ -143,26 +161,27 @@ drawmenu(void) {
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;

-       drawtext(NULL, dc.norm);
+       drawbox(&dc, normcol);
+       dc.h = dc.font.height + 2;
+       dc.y = topbar ? 0 : mh - dc.h;

        /* print prompt? */
        if(prompt) {
                dc.w = promptw;
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;

-               drawtext(prompt, dc.sel);
+               drawbox(&dc, selcol);
+               drawtext(&dc, prompt, selcol);

                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
        /* print command */
        if(cmdw && item && lines == 0)
                dc.w = cmdw;
                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
        /* print command */
        if(cmdw && item && lines == 0)
                dc.w = cmdw;

-       drawtext(*text ? text : NULL, dc.norm);
-       if(curr) {
-               if(lines > 0)
-                       drawmenuv();
-               else
-                       drawmenuh();
-       }
-       XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
-       XFlush(dpy);
+       drawtext(&dc, text, normcol);
+       drawline(&dc, textnw(&dc, text, cur) + dc.h/2 - 2, 2, 1, dc.h-4, normcol);
+       if(lines > 0)
+               drawmenuv();
+       else if(curr)
+               drawmenuh();
+       commitdraw(&dc, win);

 }
 
 void
 }
 
 void


@@ -170,49 +189,49 @@ drawmenuh(void) {
        Item *i;
 
        dc.x += cmdw;
        Item *i;
 
        dc.x += cmdw;

-       dc.w = spaceitem;
-       drawtext(curr->left ? "<" : NULL, dc.norm);
+       dc.w = textw(&dc, "<");
+       drawtext(&dc, curr->left ? "<" : NULL, normcol);

        dc.x += dc.w;
        dc.x += dc.w;

-       for(i = curr; i != next; i=i->right) {
-               dc.w = MIN(textw(i->text), mw / 3);
-               drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+       for(i = curr; i != next; i = i->right) {
+               dc.w = MIN(textw(&dc, i->text), mw / 3);
+               drawitem(i->text, (sel == i) ? selcol : normcol);

                dc.x += dc.w;
        }
                dc.x += dc.w;
        }

-       dc.w = spaceitem;
+       dc.w = textw(&dc, ">");

        dc.x = mw - dc.w;
        dc.x = mw - dc.w;

-       drawtext(next ? ">" : NULL, dc.norm);
+       drawtext(&dc, next ? ">" : NULL, normcol);

 }
 
 void
 drawmenuv(void) {
        Item *i;
 }
 
 void
 drawmenuv(void) {
        Item *i;

+       XWindowAttributes wa;

 
 

+       dc.y = topbar ? dc.h : 0;

        dc.w = mw - dc.x;
        dc.w = mw - dc.x;

-       dc.h = dc.font.height + 2;
-       dc.y = dc.h;
-       for(i = curr; i != next; i=i->right) {
-               drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+       for(i = curr; i != next; i = i->right) {
+               drawitem(i->text, (sel == i) ? selcol : normcol);

                dc.y += dc.h;
        }
                dc.y += dc.h;
        }

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

 }
 
 }
 

-Bool
+void

 grabkeyboard(void) {
 grabkeyboard(void) {

-       unsigned int len;
+       unsigned int n;

 
 

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

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

-       return len > 0;
+       exit(EXIT_FAILURE);

 }
 
 void
 }
 
 void

-kpress(XKeyEvent * e) {
+keypress(XKeyEvent *e) {

        char buf[sizeof text];
        int num;
        unsigned int i, len;
        char buf[sizeof text];
        int num;
        unsigned int i, len;


@@ -255,8 +274,12 @@ kpress(XKeyEvent * e) {
                        ksym = XK_Tab;
                        break;
                case XK_j:
                        ksym = XK_Tab;
                        break;
                case XK_j:

+               case XK_m:

                        ksym = XK_Return;
                        break;
                        ksym = XK_Return;
                        break;

+               case XK_k:
+                       text[cur] = '\0';
+                       break;

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


@@ -264,21 +287,34 @@ kpress(XKeyEvent * e) {
                        ksym = XK_Up;
                        break;
                case XK_u:
                        ksym = XK_Up;
                        break;
                case XK_u:

-                       text[0] = '\0';
-                       match(text);
+                       memmove(text, text + cur, sizeof text - cur + 1);
+                       cur = 0;
+                       match();

                        break;
                case XK_w:
                        break;
                case XK_w:

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

                                return;
                                return;

-                       i = len;
+                       i = cur;

                        while(i-- > 0 && text[i] == ' ');
                        while(i-- > 0 && text[i] != ' ');
                        while(i-- > 0 && text[i] == ' ');
                        while(i-- > 0 && text[i] != ' ');

-                       text[++i] = '\0';
-                       match(text);
+                       memmove(text + i + 1, text + cur, sizeof text - cur + 1);
+                       cur = i + 1;
+                       match();

                        break;
                        break;

-               case XK_x:
-                       execlp("dinput", "dinput", text, NULL); /* todo: argv */
-                       eprint("dmenu: cannot exec dinput:");
+               case XK_y:
+                       {
+                               FILE *fp;
+                               char *s;
+                               if(!(fp = fopen("sselp", "r")))
+                                       eprint("cannot popen sselp\n");
+                               s = fgets(buf, sizeof buf, fp);
+                               fclose(fp);
+                               if(!s)
+                                       return;
+                       }
+                       num = strlen(buf);
+                       if(num && buf[num-1] == '\n')
+                               buf[--num] = '\0';

                        break;
                }
        }
                        break;
                }
        }


@@ -286,20 +322,32 @@ kpress(XKeyEvent * e) {
        default:
                num = MIN(num, sizeof text);
                if(num && !iscntrl((int) buf[0])) {
        default:
                num = MIN(num, sizeof text);
                if(num && !iscntrl((int) buf[0])) {

-                       memcpy(text + len, buf, num + 1);
-                       len += num;
-                       match(text);
+                       memmove(text + cur + num, text + cur, sizeof text - cur - num);
+                       memcpy(text + cur, buf, num);
+                       cur += num;
+                       match();

                }
                break;
        case XK_BackSpace:
                }
                break;
        case XK_BackSpace:

-               if(len == 0)
+               if(cur == 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(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[cur - i]); i++);
+               memmove(text + cur - i, text + cur, sizeof text - cur + i);
+               cur -= i;
+               match();
+               break;
+       case XK_Delete:
+               if(cur == len)
+                       return;
+               for(i = 1; cur + i < len && !IS_UTF8_1ST_CHAR(text[cur + i]); i++);
+               memmove(text + cur, text + cur + i, sizeof text - cur);
+               match();

                break;
        case XK_End:
                break;
        case XK_End:

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

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


@@ -308,14 +356,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:

+               if(sel == item) {
+                       cur = 0;
+                       break;
+               }

                sel = curr = item;
                calcoffsets();
                break;
        case XK_Left:
                sel = curr = item;
                calcoffsets();
                break;
        case XK_Left:

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

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


@@ -338,14 +394,16 @@ kpress(XKeyEvent * e) {
                calcoffsets();
                break;
        case XK_Return:
                calcoffsets();
                break;
        case XK_Return:

-               if((e->state & ShiftMask) || !sel)
-                       fprintf(stdout, "%s", text);
-               else
-                       fprintf(stdout, "%s", sel->text);
+               fprintf(stdout, "%s", ((e->state & ShiftMask) || sel) ? sel->text : text);

                fflush(stdout);
                fflush(stdout);

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

        case XK_Right:
        case XK_Right:

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

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


@@ -359,27 +417,26 @@ kpress(XKeyEvent * e) {
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof text);
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof text);

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

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

-match(char *pattern) {
-       unsigned int plen;
+match(void) {
+       unsigned int len;

        Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
        Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 

-       if(!pattern)
-               return;
-       plen = strlen(pattern);
+       len = strlen(text);

        item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
        for(i = allitems; i; i = i->next)
        item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
        for(i = allitems; i; i = i->next)

-               if(!fstrncmp(pattern, i->text, plen + 1))
+               if(!fstrncmp(text, i->text, len + 1))

                        appenditem(i, &lexact, &exactend);
                        appenditem(i, &lexact, &exactend);

-               else if(!fstrncmp(pattern, i->text, plen))
+               else if(!fstrncmp(text, i->text, len))

                        appenditem(i, &lprefix, &prefixend);
                        appenditem(i, &lprefix, &prefixend);

-               else if(fstrstr(i->text, pattern))
+               else if(fstrstr(i->text, text))

                        appenditem(i, &lsubstr, &substrend);
        if(lexact) {
                item = lexact;
                        appenditem(i, &lsubstr, &substrend);
        if(lexact) {
                item = lexact;


@@ -418,11 +475,11 @@ readstdin(void) {
                if(buf[len-1] == '\n')
                        buf[--len] = '\0';
                if(!(p = strdup(buf)))
                if(buf[len-1] == '\n')
                        buf[--len] = '\0';
                if(!(p = strdup(buf)))

-                       eprint("dmenu: cannot strdup %u bytes\n", len);
+                       eprint("cannot strdup %u bytes\n", len);

                if((max = MAX(max, len)) == len)
                        maxname = p;
                if(!(new = malloc(sizeof *new)))
                if((max = MAX(max, len)) == len)
                        maxname = p;
                if(!(new = malloc(sizeof *new)))

-                       eprint("dmenu: cannot malloc %u bytes\n", sizeof *new);
+                       eprint("cannot malloc %u bytes\n", sizeof *new);

                new->next = new->left = new->right = NULL;
                new->text = p;
                if(!i)
                new->next = new->left = new->right = NULL;
                new->text = p;
                if(!i)


@@ -437,25 +494,26 @@ void
 run(void) {
        XEvent ev;
 
 run(void) {
        XEvent ev;
 

-       /* main event loop */
-       while(running && !XNextEvent(dpy, &ev))
-               switch (ev.type) {
-               case KeyPress:
-                       kpress(&ev.xkey);
-                       break;
+       XSync(dpy, False);
+       while(!XNextEvent(dpy, &ev))
+               switch(ev.type) {

                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 VisibilityNotify:
                case VisibilityNotify:

-                       if (ev.xvisibility.state != VisibilityUnobscured)
+                       if(ev.xvisibility.state != VisibilityUnobscured)

                                XRaiseWindow(dpy, win);
                        break;
                }
                                XRaiseWindow(dpy, win);
                        break;
                }

+       exit(EXIT_FAILURE);

 }
 
 void
 }
 
 void

-setup(Bool topbar) {
+setup(void) {

        int i, j, x, y;
 #if XINERAMA
        int n;
        int i, j, x, y;
 #if XINERAMA
        int n;


@@ -463,7 +521,6 @@ setup(Bool topbar) {
 #endif
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
 #endif
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;

-       XWindowAttributes pwa;

 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
 
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);


@@ -475,23 +532,28 @@ setup(Bool topbar) {
                }
        XFreeModifiermap(modmap);
 
                }
        XFreeModifiermap(modmap);
 

-       initfont(font);
+       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);

 
 

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

        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;

-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
+       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;

 
 

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

        mh = (dc.font.height + 2) * (lines + 1);
 #if XINERAMA
        mh = (dc.font.height + 2) * (lines + 1);
 #if XINERAMA

-       if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {

                i = 0;
                if(n > 1) {
                        int di;
                        unsigned int dui;
                        Window dummy;
                i = 0;
                if(n > 1) {
                        int di;
                        unsigned int dui;
                        Window dummy;

-                       if(XQueryPointer(dpy, parent, &dummy, &dummy, &x, &y, &di, &di, &dui))
+                       if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))

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


@@ -504,33 +566,28 @@ setup(Bool topbar) {
        else
 #endif
        {
        else
 #endif
        {

-               XGetWindowAttributes(dpy, parent, &pwa);

                x = 0;
                x = 0;

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

        }
 
        }
 

-       win = XCreateWindow(dpy, parent, x, y, mw, mh, 0,
+       win = XCreateWindow(dpy, root, x, y, mw, mh, 0,

                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 

-       drawsetup();
-       if(maxname)
-               cmdw = MIN(textw(maxname), mw / 3);
+       setupdraw(&dc, win);

        if(prompt)
        if(prompt)

-               promptw = MIN(textw(prompt), mw / 5);
-       text[0] = '\0';
-       match(text);
+               promptw = MIN(textw(&dc, prompt), mw / 5);

        XMapRaised(dpy, win);
 }
 
 int
 main(int argc, char *argv[]) {
        unsigned int i;
        XMapRaised(dpy, win);
 }
 
 int
 main(int argc, char *argv[]) {
        unsigned int i;

-       Bool topbar = True;

 
        /* command line args */
 
        /* command line args */

+       progname = "dmenu";

        for(i = 1; i < argc; i++)
                if(!strcmp(argv[i], "-i")) {
                        fstrncmp = strncasecmp;
        for(i = 1; i < argc; i++)
                if(!strcmp(argv[i], "-i")) {
                        fstrncmp = strncasecmp;


@@ -538,9 +595,6 @@ main(int argc, char *argv[]) {
                }
                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)
                else if(!strcmp(argv[i], "-l")) {
                        if(++i < argc) lines = atoi(argv[i]);
                        if(lines > 0)


@@ -564,27 +618,33 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-sf")) {
                        if(++i < argc) selfgcolor = argv[i];
                }
                else if(!strcmp(argv[i], "-sf")) {
                        if(++i < argc) selfgcolor = argv[i];
                }

-               else if(!strcmp(argv[i], "-v"))
-                       eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
-               else
-                       eprint("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
-                              "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+               else if(!strcmp(argv[i], "-v")) {
+                       printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
+                       exit(EXIT_SUCCESS);
+               }
+               else {
+                       fputs("usage: dmenu [-i] [-b] [-l <lines>] [-fn <font>] [-nb <color>]\n"
+                             "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n", stderr);
+                       exit(EXIT_FAILURE);
+               }

        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "dmenu: warning: no locale support\n");
        if(!(dpy = XOpenDisplay(NULL)))
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fprintf(stderr, "dmenu: warning: no locale support\n");
        if(!(dpy = XOpenDisplay(NULL)))

-               eprint("dmenu: cannot open display\n");
+               eprint("cannot open display\n");
+       if(atexit(&cleanup) != 0)
+               eprint("cannot register cleanup\n");

        screen = DefaultScreen(dpy);
        screen = DefaultScreen(dpy);

-       if(!parent)
-               parent = RootWindow(dpy, screen);
+       root = RootWindow(dpy, screen);
+       if(!(argp = malloc(sizeof *argp * (argc+2))))
+               eprint("cannot malloc %u bytes\n", sizeof *argp * (argc+2));
+       memcpy(argp + 2, argv + 1, sizeof *argp * argc);

 
        readstdin();
 
        readstdin();

-       running = grabkeyboard();
-
-       setup(topbar);
-       drawmenu();
-       XSync(dpy, False);
+       grabkeyboard();
+       setup();
+       if(maxname)
+               cmdw = MIN(textw(&dc, maxname), mw / 3);
+       match();

        run();
        run();

-       cleanup();
-       XCloseDisplay(dpy);
-       return ret;
+       return 0;

 }
 }