X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=7dfc2d3481077b1777da9cda319872d7d82f7268;hb=a7aee433ccfd2590e0785a7b93a89d8d0593a234;hp=0d894744864d6f419cd7d7835bcd3da03b841178;hpb=595e7976601fc77acf12015d3f5f6843e2cdd706;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 0d89474..7dfc2d3 100644 --- a/dmenu.c +++ b/dmenu.c @@ -1,234 +1,201 @@ /* See LICENSE file for copyright and license details. */ #include -#include -#include #include #include #include -#include #include -#include +#include #include #include #ifdef XINERAMA #include #endif +#include -/* 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; - 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 appenditem(Item *item, Item **list, Item **last); static void calcoffsetsh(void); static void calcoffsetsv(void); static char *cistrstr(const char *s, const char *sub); -static void cleanup(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 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(Bool topbar); +static void setup(void); +static void usage(void); -#include "config.h" -#include "draw.h" - -/* variables */ -static char *maxname = NULL; -static char *prompt = NULL; 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 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 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 mw, mh; +static unsigned long normcol[ColLast]; +static unsigned long selcol[ColLast]; +static Atom utf8; +static Bool topbar = True; +static DC *dc; +static Item *allitems, *matches; +static Item *curr, *prev, *next, *sel; +static Window root, win; + 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 -appenditem(Item *i, Item **list, Item **last) { - if(!(*last)) - *list = i; +appenditem(Item *item, Item **list, Item **last) { + if(!*last) + *list = item; else - (*last)->right = i; - i->left = *last; - i->right = NULL; - *last = i; + (*last)->right = item; + item->left = *last; + item->right = NULL; + *last = item; } void calcoffsetsh(void) { - unsigned int w; - - 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); + unsigned int w, x; + + w = (prompt ? textw(dc, prompt) : 0) + inputw + 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) { - unsigned int h; - - 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; + unsigned int i; + + next = prev = curr; + for(i = 0; i < lines && next; i++) + next = next->right; + 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; -} + size_t len; -void -cleanup(void) { - drawcleanup(); - XDestroyWindow(dpy, win); - XUngrabKeyboard(dpy, CurrentTime); + for(len = strlen(sub); *s; s++) + if(!strncasecmp(s, sub, len)) + return (char *)s; + return NULL; } void drawmenu(void) { - dc.x = 0; - dc.y = 0; - dc.w = mw; - dc.h = mh; - drawtext(NULL, dc.norm); + dc->x = 0; + dc->y = 0; + drawrect(dc, 0, 0, mw, mh, BG(dc, normcol)); + dc->h = dc->font.height + 2; + dc->y = topbar ? 0 : mh - dc->h; /* print prompt? */ if(prompt) { - dc.w = promptw; - drawtext(prompt, dc.sel); - 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(); + dc->w = textw(dc, prompt); + drawtext(dc, prompt, selcol); + dc->x = dc->w; } - XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); - XFlush(dpy); + 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) + drawmenuv(); + else if(curr && (dc->w == inputw || curr->next)) + drawmenuh(); + commitdraw(dc, win); } void drawmenuh(void) { - Item *i; - - dc.x += cmdw; - dc.w = spaceitem; - drawtext(curr->left ? "<" : NULL, dc.norm); - 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); - dc.x += dc.w; + Item *item; + + dc->x += inputw; + dc->w = textw(dc, "<"); + if(curr->left) + drawtext(dc, "<", normcol); + for(item = curr; item != next; item = item->right) { + dc->x += dc->w; + dc->w = MIN(textw(dc, item->text), mw / 3); + drawtext(dc, item->text, (item == sel) ? selcol : normcol); } - dc.w = spaceitem; - dc.x = mw - dc.w; - drawtext(next ? ">" : NULL, dc.norm); + dc->w = textw(dc, ">"); + dc->x = mw - dc->w; + if(next) + drawtext(dc, ">", normcol); } void drawmenuv(void) { - Item *i; - - 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); - dc.y += dc.h; + Item *item; + + 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.h = mh - dc.y; - drawtext(NULL, dc.norm); } -Bool +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); } - return len > 0; + eprintf("cannot grab keyboard\n"); } 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]; - int num; - unsigned int i, len; + int n; + size_t len; 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: @@ -255,51 +222,59 @@ kpress(XKeyEvent * e) { ksym = XK_Tab; break; case XK_j: + 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_u: - text[0] = '\0'; - match(text); + case XK_u: /* delete left */ + insert(NULL, -cursor); break; - case XK_w: - if(len == 0) + case XK_w: /* delete word */ + if(cursor == 0) return; - i = len; - while(i-- > 0 && text[i] == ' '); - while(i-- > 0 && text[i] != ' '); - text[++i] = '\0'; - match(text); - break; - case XK_x: - execlp("dinput", "dinput", text, NULL); /* todo: argv */ - eprint("dmenu: cannot exec dinput:"); + n = 0; + while(cursor - n++ > 0 && text[cursor - n] == ' '); + while(cursor - n++ > 0 && text[cursor - n] != ' '); + insert(NULL, 1-n); break; + case XK_y: /* paste selection */ + XConvertSelection(dc->dpy, XA_PRIMARY, utf8, None, win, CurrentTime); + /* causes SelectionNotify event */ + return; } } 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: - if(len == 0) + if(cursor == 0) 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: + if(cursor < len) { + cursor = len; + break; + } while(next) { sel = curr = next; calcoffsets(); @@ -308,14 +283,22 @@ kpress(XKeyEvent * e) { sel = sel->right; break; case XK_Escape: - ret = 1; - running = False; - return; + exit(EXIT_FAILURE); case XK_Home: - sel = curr = item; + if(sel == matches) { + cursor = 0; + break; + } + sel = curr = matches; 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; @@ -338,14 +321,17 @@ kpress(XKeyEvent * e) { calcoffsets(); break; case XK_Return: - if((e->state & ShiftMask) || !sel) - fprintf(stdout, "%s", text); - else - fprintf(stdout, "%s", sel->text); + case XK_KP_Enter: + fputs((sel && !(e->state & ShiftMask)) ? sel->text : text, stdout); fflush(stdout); - running = False; - return; + exit(EXIT_SUCCESS); 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; @@ -359,30 +345,29 @@ kpress(XKeyEvent * e) { if(!sel) return; strncpy(text, sel->text, sizeof text); - match(text); + cursor = strlen(text); + match(); 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) { - item = lexact; + matches = lexact; itemend = exactend; } if(lprefix) { @@ -391,7 +376,7 @@ match(char *pattern) { lprefix->left = itemend; } else - item = lprefix; + matches = lprefix; itemend = prefixend; } if(lsubstr) { @@ -400,36 +385,45 @@ match(char *pattern) { lsubstr->left = itemend; } else - item = lsubstr; + matches = lsubstr; } - curr = prev = next = sel = item; + curr = prev = next = sel = matches; 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) { - 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("dmenu: 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))) - eprint("dmenu: 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->text = p; - if(!i) + if(item) + item->next = new; + else allitems = new; - else - i->next = new; - i = new; } } @@ -437,154 +431,136 @@ void run(void) { XEvent ev; - /* main event loop */ - while(running && !XNextEvent(dpy, &ev)) - switch (ev.type) { - case KeyPress: - kpress(&ev.xkey); - break; + while(!XNextEvent(dc->dpy, &ev)) + switch(ev.type) { 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: - if (ev.xvisibility.state != VisibilityUnobscured) - XRaiseWindow(dpy, win); + if(ev.xvisibility.state != VisibilityUnobscured) + XRaiseWindow(dc->dpy, win); break; } } void -setup(Bool topbar) { - int i, j, x, y; -#if XINERAMA +setup(void) { + int x, y, screen; + XSetWindowAttributes wa; +#ifdef XINERAMA int n; - XineramaScreenInfo *info = NULL; + XineramaScreenInfo *info; #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); - initfont(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 | ButtonPressMask | KeyPressMask | VisibilityChangeMask; - - /* 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; - } + normcol[ColBG] = getcolor(dc, normbgcolor); + normcol[ColFG] = getcolor(dc, normfgcolor); + selcol[ColBG] = getcolor(dc, selbgcolor); + selcol[ColFG] = getcolor(dc, selfgcolor); + + /* input window geometry */ + mh = (dc->font.height + 2) * (lines + 1); +#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; - 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 { - XGetWindowAttributes(dpy, parent, &pwa); 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); - drawsetup(); - if(maxname) - cmdw = MIN(textw(maxname), mw / 3); - if(prompt) - promptw = MIN(textw(prompt), mw / 5); - text[0] = '\0'; - match(text); - XMapRaised(dpy, win); + grabkeyboard(); + setcanvas(dc, win, mw, mh); + inputw = MIN(inputw, mw/3); + XMapRaised(dc->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[]) { - unsigned int i; - Bool topbar = True; + int i; + + progname = "dmenu"; + dc = initdraw(); - /* command line args */ 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], "-e")) { - if(++i < argc) parent = atoi(argv[i]); + else if(!strcmp(argv[i], "-i")) { + fstrncmp = strncasecmp; + fstrstr = cistrstr; } + else if(i == argc-1) + usage(); + /* double flags */ else if(!strcmp(argv[i], "-l")) { - if(++i < argc) lines = atoi(argv[i]); - if(lines > 0) + if((lines = atoi(argv[++i])) > 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")) - eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n"); + 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 - eprint("usage: dmenu [-i] [-b] [-e ] [-l ] [-fn ] [-nb ]\n" - " [-nf ] [-p ] [-sb ] [-sf ] [-v]\n"); - if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fprintf(stderr, "dmenu: warning: no locale support\n"); - if(!(dpy = XOpenDisplay(NULL))) - eprint("dmenu: cannot open display\n"); - screen = DefaultScreen(dpy); - if(!parent) - parent = RootWindow(dpy, screen); + usage(); readstdin(); - running = grabkeyboard(); - - setup(topbar); - drawmenu(); - XSync(dpy, False); + setup(); run(); - cleanup(); - XCloseDisplay(dpy); - return ret; + + return EXIT_FAILURE; /* should not reach */ }