Xinqi Bao's Git

projects / dmenu.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
added dmenu.h, common.c
[dmenu.git] / dmenu.c
diff --git a/dmenu.c b/dmenu.c
index 5f81d25..6fc414c 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,133 +1,105 @@
 /* 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 <stdlib.h>
 #include <stdio.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <string.h>
 #include <unistd.h>
+#include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/keysym.h>
-
-/* macros */
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
-
-/* enums */
-enum { ColFG, ColBG, ColLast };
-
-/* typedefs */
-typedef struct {
-       int x, y, w, h;
-       unsigned long norm[ColLast];
-       unsigned long sel[ColLast];
-       Drawable drawable;
-       GC gc;
-       struct {
-               XFontStruct *xfont;
-               XFontSet set;
-               int ascent;
-               int descent;
-               int height;
-       } font;
-} DC; /* draw context */
+#include "dmenu.h"
 
 typedef struct Item Item;
 struct Item {
 
 typedef struct Item Item;
 struct Item {
-       Item *next;             /* traverses all items */
-       Item *left, *right;     /* traverses items matching current search pattern */
        char *text;
        char *text;
+       Item *next;         /* traverses all items */
+       Item *left, *right; /* traverses items matching current search pattern */
 };
 
 /* forward declarations */
 };
 
 /* forward declarations */
-Item *appenditem(Item *i, Item *last);
-void calcoffsets(void);
-void cleanup(void);
-void drawmenu(void);
-void drawtext(const char *text, unsigned long col[ColLast]);
-void *emalloc(unsigned int size);
-void eprint(const char *errstr, ...);
-char *estrdup(const char *str);
-unsigned long getcolor(const char *colstr);
-Bool grabkeyboard(void);
-void initfont(const char *fontstr);
-void kpress(XKeyEvent * e);
-void match(char *pattern);
-void readstdin(void);
-void run(void);
-void setup(int x, int y, int w);
-char *cistrstr(const char *s, const char *sub);
-unsigned int textnw(const char *text, unsigned int len);
-unsigned int textw(const char *text);
-
-#include "config.h"
+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 dinput(void);
+static void drawmenuh(void);
+static void drawmenuv(void);
+static void match(void);
+static void readstdin(void);
 
 /* variables */
 
 /* variables */
-char *font = FONT;
-char *maxname = NULL;
-char *normbg = NORMBGCOLOR;
-char *normfg = NORMFGCOLOR;
-char *prompt = NULL;
-char *selbg = SELBGCOLOR;
-char *selfg = SELFGCOLOR;
-char text[4096];
-int screen;
-int ret = 0;
-unsigned int cmdw = 0;
-unsigned int mw, mh;
-unsigned int promptw = 0;
-unsigned int nitem = 0;
-unsigned int numlockmask = 0;
-Bool running = True;
-Display *dpy;
-DC dc = {0};
-Item *allitems = NULL; /* first of all items */
-Item *item = NULL;     /* first of pattern matching items */
-Item *sel = NULL;
-Item *next = NULL;
-Item *prev = NULL;
-Item *curr = NULL;
-Window root, win;
-int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
-char *(*fstrstr)(const char *, const char *) = strstr;
+static char **argp = NULL;
+static char *maxname = NULL;
+static unsigned int cmdw = 0;
+static unsigned int lines = 0;
+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 int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+static char *(*fstrstr)(const char *, const char *) = strstr;
+static void (*calcoffsets)(void) = calcoffsetsh;
 
 
-Item *
-appenditem(Item *i, Item *last) {
-       if(!last)
-               item = i;
+void
+appenditem(Item *i, Item **list, Item **last) {
+       if(!(*last))
+               *list = i;
        else
        else
-               last->right = i;
-       i->left = last;
+               (*last)->right = i;
+       i->left = *last;
        i->right = NULL;
        i->right = NULL;
-       last = i;
-       nitem++;
-       return last;
+       *last = i;
 }
 
 void
 }
 
 void
-calcoffsets(void) {
-       unsigned int tw, w;
+calcoffsetsh(void) {
+       unsigned int w, x;
 
 
-       if(!curr)
-               return;
-       w = promptw + cmdw + 2 * SPACE;
-       for(next = curr; next; next=next->right) {
-               tw = textw(next->text);
-               if(tw > mw / 3)
-                       tw = mw / 3;
-               w += tw;
-               if(w > mw)
+       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;
                        break;
-       }
-       w = promptw + cmdw + 2 * SPACE;
-       for(prev = curr; prev && prev->left; prev=prev->left) {
-               tw = textw(prev->left->text);
-               if(tw > mw / 3)
-                       tw = mw / 3;
-               w += tw;
-               if(w > mw)
+       for(x = w, prev = curr; prev && prev->left; prev = prev->left)
+               if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
                        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) {
+       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;
 }
 
 void
 }
 
 void
@@ -140,293 +112,168 @@ cleanup(void) {
                free(allitems);
                allitems = itm;
        }
                free(allitems);
                allitems = itm;
        }
-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);
-       else
-               XFreeFont(dpy, dc.font.xfont);
-       XFreePixmap(dpy, dc.drawable);
-       XFreeGC(dpy, dc.gc);
+       cleanupdraw(&dc);
        XDestroyWindow(dpy, win);
        XUngrabKeyboard(dpy, CurrentTime);
        XDestroyWindow(dpy, win);
        XUngrabKeyboard(dpy, CurrentTime);
+       XCloseDisplay(dpy);
 }
 
 void
 }
 
 void
-drawmenu(void) {
-       Item *i;
+dinput(void) {
+       cleanup();
+       argp[0] = "dinput";
+       argp[1] = text;
+       execvp("dinput", argp);
+       eprint("cannot exec dinput\n");
+}
 
 
+void
+drawbar(void) {
        dc.x = 0;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
        dc.x = 0;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
-       drawtext(NULL, dc.norm);
+       drawtext(&dc, NULL, normcol);
+       dc.h = dc.font.height + 2;
+       dc.y = topbar ? 0 : mh - dc.h;
        /* print prompt? */
        /* print prompt? */
-       if(promptw) {
+       if(prompt) {
                dc.w = promptw;
                dc.w = promptw;
-               drawtext(prompt, dc.sel);
+               drawtext(&dc, prompt, selcol);
+               dc.x += dc.w;
        }
        }
-       dc.x += promptw;
-       dc.w = mw - promptw;
+       dc.w = mw - dc.x;
        /* print command */
        /* print command */
-       if(cmdw && item)
+       if(cmdw && item && lines == 0)
                dc.w = cmdw;
                dc.w = cmdw;
-       drawtext(text[0] ? text : NULL, dc.norm);
-       dc.x += cmdw;
-       if(curr) {
-               dc.w = SPACE;
-               drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
-               dc.x += dc.w;
-               /* determine maximum items */
-               for(i = curr; i != next; i=i->right) {
-                       dc.w = textw(i->text);
-                       if(dc.w > mw / 3)
-                               dc.w = mw / 3;
-                       drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
-                       dc.x += dc.w;
-               }
-               dc.x = mw - SPACE;
-               dc.w = SPACE;
-               drawtext(next ? ">" : NULL, dc.norm);
-       }
-       XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
-       XFlush(dpy);
-}
-
-void
-drawtext(const char *text, unsigned long col[ColLast]) {
-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       XSetForeground(dpy, dc.gc, col[ColBG]);
-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       if(!text)
-               return;
-       w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
-       memcpy(buf, text, len);
-       buf[len] = 0;
-       h = dc.font.ascent + dc.font.descent;
-       y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
-       x = dc.x + (h / 2);
-       /* shorten text if necessary */
-       while(len && (w = textnw(buf, len)) > dc.w - h)
-               buf[--len] = 0;
-       if(len < olen) {
-               if(len > 1)
-                       buf[len - 1] = '.';
-               if(len > 2)
-                       buf[len - 2] = '.';
-               if(len > 3)
-                       buf[len - 3] = '.';
-       }
-       if(w > dc.w)
-               return; /* too long */
-       XSetForeground(dpy, dc.gc, col[ColFG]);
-       if(dc.font.set)
-               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-       else
-               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-}
-
-void *
-emalloc(unsigned int size) {
-       void *res = malloc(size);
-
-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", size);
-       return res;
+       drawtext(&dc, text, normcol);
+       if(lines > 0)
+               drawmenuv();
+       else if(curr)
+               drawmenuh();
+       commitdraw(&dc, win);
 }
 
 void
 }
 
 void
-eprint(const char *errstr, ...) {
-       va_list ap;
-
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
-}
-
-char *
-estrdup(const char *str) {
-       void *res = strdup(str);
-
-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", strlen(str));
-       return res;
-}
-
-unsigned long
-getcolor(const char *colstr) {
-       Colormap cmap = DefaultColormap(dpy, screen);
-       XColor color;
-
-       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-               eprint("error, cannot allocate color '%s'\n", colstr);
-       return color.pixel;
-}
-
-Bool
-grabkeyboard(void) {
-       unsigned int len;
+drawmenuh(void) {
+       Item *i;
 
 
-       for(len = 1000; len; len--) {
-               if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-                       == GrabSuccess)
-                       break;
-               usleep(1000);
+       dc.x += cmdw;
+       dc.w = textw(&dc, "<");
+       drawtext(&dc, curr->left ? "<" : NULL, normcol);
+       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);
+               dc.x += dc.w;
        }
        }
-       return len > 0;
+       dc.w = textw(&dc, ">");
+       dc.x = mw - dc.w;
+       drawtext(&dc, next ? ">" : NULL, normcol);
 }
 
 void
 }
 
 void
-initfont(const char *fontstr) {
-       char *def, **missing;
-       int i, n;
+drawmenuv(void) {
+       Item *i;
+       XWindowAttributes wa;
 
 
-       if(!fontstr || fontstr[0] == '\0')
-               eprint("error, cannot load font: '%s'\n", fontstr);
-       missing = NULL;
-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);
-       dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-       if(missing)
-               XFreeStringList(missing);
-       if(dc.font.set) {
-               XFontSetExtents *font_extents;
-               XFontStruct **xfonts;
-               char **font_names;
-               dc.font.ascent = dc.font.descent = 0;
-               font_extents = XExtentsOfFontSet(dc.font.set);
-               n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-                       if(dc.font.ascent < (*xfonts)->ascent)
-                               dc.font.ascent = (*xfonts)->ascent;
-                       if(dc.font.descent < (*xfonts)->descent)
-                               dc.font.descent = (*xfonts)->descent;
-                       xfonts++;
-               }
-       }
-       else {
-               if(dc.font.xfont)
-                       XFreeFont(dpy, dc.font.xfont);
-               dc.font.xfont = NULL;
-               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-               && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
-                       eprint("error, cannot load font: '%s'\n", fontstr);
-               dc.font.ascent = dc.font.xfont->ascent;
-               dc.font.descent = dc.font.xfont->descent;
+       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);
+               dc.y += dc.h;
        }
        }
-       dc.font.height = dc.font.ascent + dc.font.descent;
+       if(!XGetWindowAttributes(dpy, win, &wa))
+               eprint("cannot get window attributes");
+       XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
 }
 
 void
 }
 
 void
-kpress(XKeyEvent * e) {
-       char buf[32];
-       int i, num;
-       unsigned int len;
+kpress(XKeyEvent *e) {
+       char buf[sizeof text];
+       int num;
+       unsigned int i, len;
        KeySym ksym;
 
        len = strlen(text);
        KeySym ksym;
 
        len = strlen(text);
-       buf[0] = 0;
-       num = XLookupString(e, buf, sizeof buf, &ksym, 0);
-       if(IsKeypadKey(ksym)) { 
-               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;
-               }
-       }
-       if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
-                       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
-                       || IsPrivateKeypadKey(ksym))
+       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 */
        if(e->state & ControlMask) {
                return;
        /* first check if a control mask is omitted */
        if(e->state & ControlMask) {
-               switch (ksym) {
-               default:        /* ignore other control sequences */
+               switch(tolower(ksym)) {
+               default:
                        return;
                        return;
-               case XK_bracketleft:
+               case XK_a:
+                       ksym = XK_Home;
+                       break;
+               case XK_b:
+                       ksym = XK_Left;
+                       break;
+               case XK_c:
                        ksym = XK_Escape;
                        break;
                        ksym = XK_Escape;
                        break;
+               case XK_e:
+                       ksym = XK_End;
+                       break;
+               case XK_f:
+                       ksym = XK_Right;
+                       break;
                case XK_h:
                case XK_h:
-               case XK_H:
                        ksym = XK_BackSpace;
                        break;
                case XK_i:
                        ksym = XK_BackSpace;
                        break;
                case XK_i:
-               case XK_I:
                        ksym = XK_Tab;
                        break;
                case XK_j:
                        ksym = XK_Tab;
                        break;
                case XK_j:
-               case XK_J:
+               case XK_m:
                        ksym = XK_Return;
                        break;
                        ksym = XK_Return;
                        break;
-               case XK_u:
-               case XK_U:
-                       text[0] = 0;
-                       match(text);
-                       drawmenu();
-                       return;
-               case XK_w:
-               case XK_W:
-                       if(len) {
-                               i = len - 1;
-                               while(i >= 0 && text[i] == ' ')
-                                       text[i--] = 0;
-                               while(i >= 0 && text[i] != ' ')
-                                       text[i--] = 0;
-                               match(text);
-                               drawmenu();
-                       }
-                       return;
-               }
-       }
-       if(CLEANMASK(e->state) & Mod1Mask) {
-               switch(ksym) {
-               default: return;
-               case XK_h:
-                       ksym = XK_Left;
-                       break;
-               case XK_l:
-                       ksym = XK_Right;
-                       break;
-               case XK_j:
-                       ksym = XK_Next;
+               case XK_n:
+                       ksym = XK_Down;
                        break;
                        break;
-               case XK_k:
-                       ksym = XK_Prior;
+               case XK_p:
+                       ksym = XK_Up;
                        break;
                        break;
-               case XK_g:
-                       ksym = XK_Home;
+               case XK_u:
+                       text[0] = '\0';
+                       match();
                        break;
                        break;
-               case XK_G:
-                       ksym = XK_End;
+               case XK_w:
+                       if(len == 0)
+                               return;
+                       i = len;
+                       while(i-- > 0 && text[i] == ' ');
+                       while(i-- > 0 && text[i] != ' ');
+                       text[++i] = '\0';
+                       match();
                        break;
                }
        }
        switch(ksym) {
        default:
                        break;
                }
        }
        switch(ksym) {
        default:
+               num = MIN(num, sizeof text);
                if(num && !iscntrl((int) buf[0])) {
                if(num && !iscntrl((int) buf[0])) {
-                       buf[num] = 0;
-                       if(len > 0)
-                               strncat(text, buf, sizeof text);
-                       else
-                               strncpy(text, buf, sizeof text);
-                       match(text);
+                       memcpy(text + len, buf, num + 1);
+                       len += num;
+                       match();
                }
                break;
        case XK_BackSpace:
                }
                break;
        case XK_BackSpace:
-               if(len) {
-                       text[--len] = 0;
-                       match(text);
-               }
+               if(len == 0)
+                       return;
+               for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[len - i]); i++);
+               len -= i;
+               text[len] = '\0';
+               match();
                break;
        case XK_End:
                break;
        case XK_End:
-               if(!item)
-                       return;
                while(next) {
                        sel = curr = next;
                        calcoffsets();
                while(next) {
                        sel = curr = next;
                        calcoffsets();
@@ -435,19 +282,16 @@ kpress(XKeyEvent * e) {
                        sel = sel->right;
                break;
        case XK_Escape:
                        sel = sel->right;
                break;
        case XK_Escape:
-               ret = 1;
-               running = False;
-               break;
+               exit(EXIT_FAILURE);
        case XK_Home:
        case XK_Home:
-               if(!item)
-                       return;
                sel = curr = item;
                calcoffsets();
                break;
        case XK_Left:
                sel = curr = item;
                calcoffsets();
                break;
        case XK_Left:
-               if(!(sel && sel->left))
+       case XK_Up:
+               if(!sel || !sel->left)
                        return;
                        return;
-               sel=sel->left;
+               sel = sel->left;
                if(sel->right == curr) {
                        curr = prev;
                        calcoffsets();
                if(sel->right == curr) {
                        curr = prev;
                        calcoffsets();
@@ -466,69 +310,86 @@ kpress(XKeyEvent * e) {
                calcoffsets();
                break;
        case XK_Return:
                calcoffsets();
                break;
        case XK_Return:
-               if((e->state & ShiftMask) && text)
-                       fprintf(stdout, "%s", text);
-               else if(sel)
-                       fprintf(stdout, "%s", sel->text);
-               else if(text)
-                       fprintf(stdout, "%s", text);
+               if(e->state & ShiftMask)
+                       dinput();
+               fprintf(stdout, "%s", sel ? sel->text : text);
                fflush(stdout);
                fflush(stdout);
-               running = False;
-               break;
+               exit(EXIT_SUCCESS);
        case XK_Right:
        case XK_Right:
-               if(!(sel && sel->right))
+       case XK_Down:
+               if(!sel || !sel->right)
                        return;
                        return;
-               sel=sel->right;
+               sel = sel->right;
                if(sel == next) {
                        curr = next;
                        calcoffsets();
                }
                break;
        case XK_Tab:
                if(sel == next) {
                        curr = next;
                        calcoffsets();
                }
                break;
        case XK_Tab:
-               if(!sel)
-                       return;
-               strncpy(text, sel->text, sizeof text);
-               match(text);
+               if(sel)
+                       strncpy(text, sel->text, sizeof text);
+               dinput();
                break;
        }
                break;
        }
-       drawmenu();
+       drawbar();
 }
 
 void
 }
 
 void
-match(char *pattern) {
-       unsigned int plen;
-       Item *i, *j;
+match(void) {
+       unsigned int len;
+       Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
 
-       if(!pattern)
-               return;
-       plen = strlen(pattern);
-       item = j = NULL;
-       nitem = 0;
+       len = strlen(text);
+       item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
        for(i = allitems; i; i = i->next)
        for(i = allitems; i; i = i->next)
-               if(!fstrncmp(pattern, i->text, plen)
-                               || fstrstr(i->text, pattern))
-                       j = appenditem(i, j);
+               if(!fstrncmp(text, i->text, len + 1))
+                       appenditem(i, &lexact, &exactend);
+               else if(!fstrncmp(text, i->text, len))
+                       appenditem(i, &lprefix, &prefixend);
+               else if(fstrstr(i->text, text))
+                       appenditem(i, &lsubstr, &substrend);
+       if(lexact) {
+               item = lexact;
+               itemend = exactend;
+       }
+       if(lprefix) {
+               if(itemend) {
+                       itemend->right = lprefix;
+                       lprefix->left = itemend;
+               }
+               else
+                       item = lprefix;
+               itemend = prefixend;
+       }
+       if(lsubstr) {
+               if(itemend) {
+                       itemend->right = lsubstr;
+                       lsubstr->left = itemend;
+               }
+               else
+                       item = lsubstr;
+       }
        curr = prev = next = sel = item;
        calcoffsets();
 }
 
 void
 readstdin(void) {
        curr = prev = next = sel = item;
        calcoffsets();
 }
 
 void
 readstdin(void) {
-       char *p, buf[1024];
+       char *p, buf[sizeof text];
        unsigned int len = 0, max = 0;
        Item *i, *new;
 
        unsigned int len = 0, max = 0;
        Item *i, *new;
 
-       i = 0;
+       i = NULL;
        while(fgets(buf, sizeof buf, stdin)) {
                len = strlen(buf);
        while(fgets(buf, sizeof buf, stdin)) {
                len = strlen(buf);
-               if (buf[len - 1] == '\n')
-                       buf[len - 1] = 0;
-               p = estrdup(buf);
-               if(max < len) {
+               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;
                        maxname = p;
-                       max = len;
-               }
-               new = emalloc(sizeof(Item));
+               if(!(new = malloc(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)
@@ -539,182 +400,69 @@ readstdin(void) {
        }
 }
 
        }
 }
 
-void
-run(void) {
-       XEvent ev;
-
-       /* main event loop */
-       while(running && !XNextEvent(dpy, &ev))
-               switch (ev.type) {
-               default:        /* ignore all crap */
-                       break;
-               case KeyPress:
-                       kpress(&ev.xkey);
-                       break;
-               case Expose:
-                       if(ev.xexpose.count == 0)
-                               drawmenu();
-                       break;
-               }
-}
-
-void
-setup(int x, int y, int w) {
-       unsigned int i, j;
-       XModifierKeymap *modmap;
-       XSetWindowAttributes wa;
-
-       /* 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);
-
-       /* style */
-       dc.norm[ColBG] = getcolor(normbg);
-       dc.norm[ColFG] = getcolor(normfg);
-       dc.sel[ColBG] = getcolor(selbg);
-       dc.sel[ColFG] = getcolor(selfg);
-       initfont(font);
-
-       /* menu window */
-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-       mw = w ? w : DisplayWidth(dpy, screen);
-       mh = dc.font.height + 2;
-       win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-
-       /* pixmap */
-       dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
-       dc.gc = XCreateGC(dpy, root, 0, 0);
-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-       if(!dc.font.set)
-               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-       if(maxname)
-               cmdw = textw(maxname);
-       if(cmdw > mw / 3)
-               cmdw = mw / 3;
-       if(prompt)
-               promptw = textw(prompt);
-       if(promptw > mw / 5)
-               promptw = mw / 5;
-       text[0] = 0;
-       match(text);
-       XMapRaised(dpy, win);
-}
-
-char *
-cistrstr(const char *s, const char *sub) {
-       int c, csub;
-       unsigned int len;
-
-       if(!sub)
-               return (char *)s;
-       if((c = *sub++) != 0) {
-               c = tolower(c);
-               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;
-}
-
-unsigned int
-textnw(const char *text, unsigned int len) {
-       XRectangle r;
-
-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
-       }
-       return XTextWidth(dc.font.xfont, text, len);
-}
-
-unsigned int
-textw(const char *text) {
-       return textnw(text, strlen(text)) + dc.font.height;
-}
-
 int
 main(int argc, char *argv[]) {
 int
 main(int argc, char *argv[]) {
-       int x = 0, y = 0, w = 0;
        unsigned int i;
 
        /* command line args */
        unsigned int i;
 
        /* command line args */
+       progname = "dmenu";
        for(i = 1; i < argc; i++)
                if(!strcmp(argv[i], "-i")) {
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;
                }
        for(i = 1; i < argc; i++)
                if(!strcmp(argv[i], "-i")) {
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;
                }
+               else if(!strcmp(argv[i], "-b"))
+                       topbar = False;
+               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")) {
                else if(!strcmp(argv[i], "-fn")) {
                        if(++i < argc) font = argv[i];
                }
                else if(!strcmp(argv[i], "-nb")) {
-                       if(++i < argc) normbg = argv[i];
+                       if(++i < argc) normbgcolor = argv[i];
                }
                else if(!strcmp(argv[i], "-nf")) {
                }
                else if(!strcmp(argv[i], "-nf")) {
-                       if(++i < argc) normfg = argv[i];
+                       if(++i < argc) normfgcolor = argv[i];
                }
                else if(!strcmp(argv[i], "-p")) {
                        if(++i < argc) prompt = argv[i];
                }
                else if(!strcmp(argv[i], "-sb")) {
                }
                else if(!strcmp(argv[i], "-p")) {
                        if(++i < argc) prompt = argv[i];
                }
                else if(!strcmp(argv[i], "-sb")) {
-                       if(++i < argc) selbg = argv[i];
+                       if(++i < argc) selbgcolor = argv[i];
                }
                else if(!strcmp(argv[i], "-sf")) {
                }
                else if(!strcmp(argv[i], "-sf")) {
-                       if(++i < argc) selfg = argv[i];
-               }
-               else if(!strcmp(argv[i], "-x")) {
-                       if(++i < argc) x = atoi(argv[i]);
+                       if(++i < argc) selfgcolor = argv[i];
                }
                }
-               else if(!strcmp(argv[i], "-y")) {
-                       if(++i < argc) y = atoi(argv[i]);
+               else if(!strcmp(argv[i], "-v")) {
+                       printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
+                       exit(EXIT_SUCCESS);
                }
                }
-               else if(!strcmp(argv[i], "-w")) {
-                       if(++i < argc) w = atoi(argv[i]);
+               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);
                }
                }
-               else if(!strcmp(argv[i], "-v"))
-                       eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
-               else
-                       eprint("usage: dmenu [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-                              "             [-p <prompt>] [-sb <color>] [-sf <color>]\n"
-                              "             [-x <x>] [-y <y>] [-w <w>] [-v]\n");
-       setlocale(LC_CTYPE, "");
-       dpy = XOpenDisplay(0);
-       if(!dpy)
-               eprint("dmenu: cannot open display\n");
+       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fprintf(stderr, "dmenu: warning: no locale support\n");
+       if(!(dpy = XOpenDisplay(NULL)))
+               eprint("cannot open display\n");
+       if(atexit(&cleanup) != 0)
+               eprint("cannot register cleanup\n");
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        screen = DefaultScreen(dpy);
        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);
 
 
-       if(isatty(STDIN_FILENO)) {
-               readstdin();
-               running = grabkeyboard();
-       }
-       else { /* prevent keypress loss */
-               running = grabkeyboard();
-               readstdin();
-       }
-
-       setup(x, y, w);
-       drawmenu();
-       XSync(dpy, False);
+       readstdin();
+       grabkeyboard();
+       setup(lines);
+       if(maxname)
+               cmdw = MIN(textw(&dc, maxname), mw / 3);
+       match();
        run();
        run();
-       cleanup();
-       XCloseDisplay(dpy);
-       return ret;
+       return 0;
 }
 }