/* See LICENSE file for copyright and license details. */
#include <ctype.h>
-#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <X11/keysym.h>
#include <X11/Xlib.h>
+#include <X11/Xatom.h>
#include <X11/Xutil.h>
-#include "dmenu.h"
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+#include <dc.h>
+
+#define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
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 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 appenditem(Item *item, Item **list, Item **last);
+static void calcoffsets(void);
+static void drawmenu(void);
+static char *fstrstr(const char *s, const char *sub);
+static void grabkeyboard(void);
+static void insert(const char *s, ssize_t n);
+static void keypress(XKeyEvent *ev);
static void match(void);
+static size_t nextrune(int incr);
+static void paste(void);
static void readstdin(void);
+static void run(void);
+static void setup(void);
+static void usage(void);
+
+static char text[BUFSIZ];
+static int bh, mw, mh;
+static int inputw = 0;
+static int lines = 0;
+static int promptw;
+static size_t cursor = 0;
+static const char *font = NULL;
+static const char *prompt = NULL;
+static const char *normbgcolor = "#cccccc";
+static const char *normfgcolor = "#000000";
+static const char *selbgcolor = "#0066ff";
+static const char *selfgcolor = "#ffffff";
+static unsigned long normcol[ColLast];
+static unsigned long selcol[ColLast];
+static Atom utf8;
+static Bool topbar = True;
+static DC *dc;
+static Item *items = NULL;
+static Item *matches, *sel;
+static Item *prev, *curr, *next;
+static Window root, win;
-/* variables */
-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;
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, x;
+calcoffsets(void) {
+ unsigned int i, n;
- 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)
+ if(lines > 0)
+ n = lines * bh;
+ else
+ n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
+
+ for(i = 0, next = curr; next; next = next->right)
+ if((i += (lines > 0) ? bh : MIN(dc_textw(dc, next->text), n)) > n)
break;
- for(x = w, prev = curr; prev && prev->left; prev = prev->left)
- if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
+ for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
+ if((i += (lines > 0) ? bh : MIN(dc_textw(dc, prev->left->text), n)) > n)
break;
}
void
-calcoffsetsv(void) {
- unsigned int i;
-
- next = prev = curr;
- for(i = 0; i < lines && next; i++)
- next = next->right;
- mh = (dc.font.height + 2) * (i + 1);
- for(i = 0; i < lines && prev && prev->left; i++)
- prev = prev->left;
-}
+drawmenu(void) {
+ int curpos;
+ Item *item;
-char *
-cistrstr(const char *s, const char *sub) {
- int c, csub;
- unsigned int len;
-
- if(!sub)
- return (char *)s;
- if((c = tolower(*sub++)) != '\0') {
- len = strlen(sub);
- do {
- do {
- if((csub = *s++) == '\0')
- return NULL;
- }
- while(tolower(csub) != c);
- }
- while(strncasecmp(s, sub, len) != 0);
- s--;
+ dc->x = 0;
+ dc->y = 0;
+ dc->h = bh;
+ dc_drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
+
+ if(prompt) {
+ dc->w = promptw;
+ dc_drawtext(dc, prompt, selcol);
+ dc->x = dc->w;
}
- return (char *)s;
-}
+ dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
+ dc_drawtext(dc, text, normcol);
+ if((curpos = dc_textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+ dc_drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
-void
-cleanup(void) {
- Item *itm;
-
- while(allitems) {
- itm = allitems->next;
- free(allitems->text);
- free(allitems);
- allitems = itm;
+ if(lines > 0) {
+ dc->w = mw - dc->x;
+ for(item = curr; item != next; item = item->right) {
+ dc->y += dc->h;
+ dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+ }
}
- cleanupdraw(&dc);
- XDestroyWindow(dpy, win);
- XUngrabKeyboard(dpy, CurrentTime);
- XCloseDisplay(dpy);
+ else if(matches) {
+ dc->x += inputw;
+ dc->w = dc_textw(dc, "<");
+ if(curr->left)
+ dc_drawtext(dc, "<", normcol);
+ for(item = curr; item != next; item = item->right) {
+ dc->x += dc->w;
+ dc->w = MIN(dc_textw(dc, item->text), mw - dc->x - dc_textw(dc, ">"));
+ dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+ }
+ dc->w = dc_textw(dc, ">");
+ dc->x = mw - dc->w;
+ if(next)
+ dc_drawtext(dc, ">", normcol);
+ }
+ dc_map(dc, win, mw, mh);
}
-void
-dinput(void) {
- cleanup();
- argp[0] = "dinput";
- argp[1] = text;
- execvp("dinput", argp);
- eprint("cannot exec dinput\n");
-}
+char *
+fstrstr(const char *s, const char *sub) {
+ size_t len;
-void
-drawbar(void) {
- dc.x = 0;
- dc.y = 0;
- dc.w = mw;
- dc.h = mh;
- drawbox(&dc, normcol);
- dc.h = dc.font.height + 2;
- dc.y = topbar ? 0 : mh - dc.h;
- /* print prompt? */
- if(prompt) {
- 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, normcol);
- if(lines > 0)
- drawmenuv();
- else if(curr)
- drawmenuh();
- commitdraw(&dc, win);
+ for(len = strlen(sub); *s; s++)
+ if(!fstrncmp(s, sub, len))
+ return (char *)s;
+ return NULL;
}
void
-drawmenuh(void) {
- unsigned long *col;
- Item *i;
-
- 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);
- col = (sel == i) ? selcol : normcol;
- drawbox(&dc, col);
- drawtext(&dc, i->text, col);
- dc.x += dc.w;
+grabkeyboard(void) {
+ int i;
+
+ for(i = 0; i < 1000; i++) {
+ if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+ return;
+ usleep(1000);
}
- dc.w = textw(&dc, ">");
- dc.x = mw - dc.w;
- drawtext(&dc, next ? ">" : NULL, normcol);
+ eprintf("cannot grab keyboard\n");
}
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);
- dc.y += dc.h;
- }
- if(!XGetWindowAttributes(dpy, win, &wa))
- eprint("cannot get window attributes");
- XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
+insert(const char *s, ssize_t n) {
+ if(strlen(text) + n > sizeof text - 1)
+ return;
+ memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 0));
+ if(n > 0)
+ memcpy(text + cursor, s, n);
+ cursor += n;
+ match();
}
void
-kpress(XKeyEvent *e) {
- char buf[sizeof text];
- int num;
- unsigned int i, len;
+keypress(XKeyEvent *ev) {
+ char buf[32];
+ 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 */
- if(e->state & ControlMask) {
+ XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+ if(ev->state & ControlMask) {
switch(tolower(ksym)) {
default:
return;
case XK_c:
ksym = XK_Escape;
break;
+ case XK_d:
+ ksym = XK_Delete;
+ break;
case XK_e:
ksym = XK_End;
break;
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();
+ case XK_u: /* delete left */
+ insert(NULL, 0 - cursor);
break;
- case XK_w:
- if(len == 0)
- return;
- i = len;
- while(i-- > 0 && text[i] == ' ');
- while(i-- > 0 && text[i] != ' ');
- text[++i] = '\0';
- match();
+ case XK_w: /* delete word */
+ while(cursor > 0 && text[nextrune(-1)] == ' ')
+ insert(NULL, nextrune(-1) - cursor);
+ while(cursor > 0 && text[nextrune(-1)] != ' ')
+ insert(NULL, nextrune(-1) - cursor);
break;
}
}
switch(ksym) {
default:
- num = MIN(num, sizeof text);
- if(num && !iscntrl((int) buf[0])) {
- memcpy(text + len, buf, num + 1);
- len += num;
- match();
- }
+ if(!iscntrl(*buf))
+ insert(buf, strlen(buf));
break;
- case XK_BackSpace:
- if(len == 0)
+ case XK_Delete:
+ if(cursor == len)
return;
- for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[len - i]); i++);
- len -= i;
- text[len] = '\0';
- match();
+ cursor = nextrune(+1);
+ case XK_BackSpace:
+ if(cursor > 0)
+ insert(NULL, nextrune(-1) - cursor);
break;
case XK_End:
+ if(cursor < len) {
+ cursor = len;
+ break;
+ }
while(next) {
sel = curr = next;
calcoffsets();
case XK_Escape:
exit(EXIT_FAILURE);
case XK_Home:
- sel = curr = item;
+ if(sel == matches) {
+ cursor = 0;
+ break;
+ }
+ sel = curr = matches;
calcoffsets();
break;
+ case XK_Insert: /* paste selection */
+ if(ev->state & ShiftMask)
+ XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+ return;
case XK_Left:
- case XK_Up:
- if(!sel || !sel->left)
+ if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
+ cursor = nextrune(-1);
+ break;
+ }
+ else if(lines > 0)
return;
- sel = sel->left;
- if(sel->right == curr) {
+ case XK_Up:
+ if(sel && sel->left && (sel = sel->left)->right == curr) {
curr = prev;
calcoffsets();
}
calcoffsets();
break;
case XK_Return:
- if(e->state & ShiftMask)
- dinput();
- fprintf(stdout, "%s", sel ? sel->text : text);
+ case XK_KP_Enter:
+ fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
fflush(stdout);
exit(EXIT_SUCCESS);
case XK_Right:
- case XK_Down:
- if(!sel || !sel->right)
+ if(cursor < len) {
+ cursor = nextrune(+1);
+ break;
+ }
+ else if(lines > 0)
return;
- sel = sel->right;
- if(sel == next) {
+ case XK_Down:
+ if(sel && sel->right && (sel = sel->right) == next) {
curr = next;
calcoffsets();
}
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;
}
- drawbar();
+ drawmenu();
}
void
match(void) {
- unsigned int len;
- Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+ size_t len;
+ Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
len = strlen(text);
- item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
- for(i = allitems; i; i = i->next)
- 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);
+ matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
+ for(item = items; item; item = item->next)
+ if(!fstrncmp(text, item->text, len + 1))
+ appenditem(item, &lexact, &exactend);
+ else if(!fstrncmp(text, item->text, len))
+ appenditem(item, &lprefix, &prefixend);
+ else if(fstrstr(item->text, text))
+ appenditem(item, &lsubstr, &substrend);
+
if(lexact) {
- item = lexact;
+ matches = lexact;
itemend = exactend;
}
if(lprefix) {
lprefix->left = itemend;
}
else
- item = lprefix;
+ matches = lprefix;
itemend = prefixend;
}
if(lsubstr) {
lsubstr->left = itemend;
}
else
- item = lsubstr;
+ matches = lsubstr;
}
- curr = prev = next = sel = item;
+ curr = prev = next = sel = matches;
calcoffsets();
}
+size_t
+nextrune(int incr) {
+ size_t n, len;
+
+ len = strlen(text);
+ for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+ return n;
+}
+
+void
+paste(void) {
+ char *p, *q;
+ int di;
+ unsigned long dl;
+ Atom da;
+
+ XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
+ utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
+ insert(p, (q = strchr(p, '\n')) ? q-p : strlen(p));
+ XFree(p);
+ drawmenu();
+}
+
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;
- 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)
- allitems = new;
- else
- i->next = new;
- i = new;
+ char buf[sizeof text], *p;
+ Item *item, **end;
+
+ for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
+ if((p = strchr(buf, '\n')))
+ *p = '\0';
+ if(!(item = malloc(sizeof *item)))
+ eprintf("cannot malloc %u bytes\n", sizeof *item);
+ if(!(item->text = strdup(buf)))
+ eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
+ item->next = item->left = item->right = NULL;
+ inputw = MAX(inputw, dc_textw(dc, item->text));
+ }
+}
+
+void
+run(void) {
+ XEvent ev;
+
+ 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(dc->dpy, win);
+ break;
+ }
+}
+
+void
+setup(void) {
+ int x, y, screen;
+ XSetWindowAttributes wa;
+#ifdef XINERAMA
+ int n;
+ XineramaScreenInfo *info;
+#endif
+
+ screen = DefaultScreen(dc->dpy);
+ root = RootWindow(dc->dpy, screen);
+ utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+
+ normcol[ColBG] = dc_color(dc, normbgcolor);
+ normcol[ColFG] = dc_color(dc, normfgcolor);
+ selcol[ColBG] = dc_color(dc, selbgcolor);
+ selcol[ColFG] = dc_color(dc, selfgcolor);
+
+ /* menu geometry */
+ bh = dc->font.height + 2;
+ lines = MAX(lines, 0);
+ mh = (lines + 1) * bh;
+#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 = info[i].y_org + (topbar ? 0 : info[i].height - mh);
+ mw = info[i].width;
+ XFree(info);
+ }
+ else
+#endif
+ {
+ x = 0;
+ y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
+ mw = DisplayWidth(dc->dpy, screen);
}
+ /* menu 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);
+
+ grabkeyboard();
+ dc_resize(dc, mw, mh);
+ inputw = MIN(inputw, mw/3);
+ promptw = prompt ? dc_textw(dc, prompt) : 0;
+ XMapRaised(dc->dpy, win);
+ text[0] = '\0';
+ 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;
+ int i;
- /* command line args */
progname = "dmenu";
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], "-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] [-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)))
- eprint("cannot open display\n");
- if(atexit(&cleanup) != 0)
- eprint("cannot register cleanup\n");
- 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);
+ else if(!strcmp(argv[i], "-i"))
+ fstrncmp = strncasecmp;
+ 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"))
+ font = 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();
+ dc = dc_init();
+ dc_font(dc, font);
readstdin();
- grabkeyboard();
- setup(lines);
- if(maxname)
- cmdw = MIN(textw(&dc, maxname), mw / 3);
- match();
+ setup();
run();
- return 0;
+
+ return EXIT_FAILURE; /* should not reach */
}