X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/29e8faed6cf4b296382439651cf04596d276f080..bae58f61cf03260d018796edf2bd3fd5e07450ed:/dmenu.c

diff --git a/dmenu.c b/dmenu.c
index c612dbe..fd98d54 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,340 +1,323 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
-#include <locale.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 <X11/Xatom.h>
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#include <draw.h>
+#include "draw.h"
 
-/* macros */
-#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))
 
 typedef struct Item Item;
 struct Item {
 	char *text;
-	Item *next;         /* traverses all items */
-	Item *left, *right; /* traverses items matching current search pattern */
+	Item *left, *right;
 };
 
-/* forward declarations */
-static void appenditem(Item *i, Item **list, Item **last);
-static void calcoffsetsh(void);
-static void calcoffsetsv(void);
+static void appenditem(Item *item, Item **list, Item **last);
+static void calcoffsets(void);
 static char *cistrstr(const char *s, const char *sub);
-static void cleanup(void);
-static void dinput(void);
 static void drawmenu(void);
-static void drawmenuh(void);
-static void drawmenuv(void);
 static void grabkeyboard(void);
-static void kpress(XKeyEvent *e);
-static void match(char *pattern);
+static void insert(const char *str, ssize_t n);
+static void keypress(XKeyEvent *ev);
+static void match(Bool sub);
+static size_t nextrune(int inc);
+static void paste(void);
 static void readstdin(void);
 static void run(void);
 static void setup(void);
-
-#include "config.h"
-
-/* variables */
-static char **argp = NULL;
-static char *maxname = NULL;
-static char *prompt = NULL;
-static char text[4096];
-static int cmdw = 0;
-static int promptw = 0;
-static int screen;
-static unsigned int lines = 0;
-static unsigned int numlockmask = 0;
-static unsigned int mw, mh;
+static void usage(void);
+
+static char text[BUFSIZ] = "";
+static int bh, mw, mh;
+static int inputw, promptw;
+static int lines = 0;
+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 Display *dpy;
-static Item *allitems = NULL;  /* first of all items */
-static Item *item = NULL;      /* first of pattern matching items */
-static Item *sel = NULL;
-static Item *next = NULL;
-static Item *prev = NULL;
-static Item *curr = NULL;
-static Window win, root;
+static DC *dc;
+static Item *items = NULL;
+static Item *matches, *matchend;
+static Item *prev, *curr, *next, *sel;
+static Window win;
+
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
-static void (*calcoffsets)(void) = calcoffsetsh;
+
+int
+main(int argc, char *argv[]) {
+	Bool fast = False;
+	int i;
+
+	for(i = 1; i < argc; i++)
+		/* single flags */
+		if(!strcmp(argv[i], "-v")) {
+			puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
+			exit(EXIT_SUCCESS);
+		}
+		else if(!strcmp(argv[i], "-b"))
+			topbar = False;
+		else if(!strcmp(argv[i], "-f"))
+			fast = True;
+		else if(!strcmp(argv[i], "-i")) {
+			fstrncmp = strncasecmp;
+			fstrstr = cistrstr;
+		}
+		else if(i+1 == argc)
+			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 = initdc();
+	initfont(dc, font);
+
+	if(fast) {
+		grabkeyboard();
+		readstdin();
+	}
+	else {
+		readstdin();
+		grabkeyboard();
+	}
+	setup();
+	run();
+
+	return EXIT_FAILURE; /* unreachable */
+}
 
 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 x;
+calcoffsets(void) {
+	int i, n;
+
+	if(lines > 0)
+		n = lines * bh;
+	else
+		n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
 
-	x = promptw + cmdw + (2 * spaceitem);
-	for(next = curr; next; next = next->right)
-		if((x += MIN(textw(&dc, next->text), mw / 3)) > mw)
+	for(i = 0, next = curr; next; next = next->right)
+		if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
 			break;
-	x = promptw + cmdw + (2 * spaceitem);
-	for(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(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;
-}
-
 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
-cleanup(void) {
-	Item *itm;
-
-	while(allitems) {
-		itm = allitems->next;
-		free(allitems->text);
-		free(allitems);
-		allitems = itm;
-	}
-	cleanupdraw(&dc);
-	XDestroyWindow(dpy, win);
-	XUngrabKeyboard(dpy, CurrentTime);
-	XCloseDisplay(dpy);
-}
+	size_t len;
 
-void
-dinput(void) {
-	cleanup();
-	argp[0] = "dinput";
-	argp[1] = text;
-	execvp("dinput", argp);
-	eprint("cannot exec dinput\n");
+	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(&dc, NULL, normcol);
-	dc.h = dc.font.height + 2;
-	dc.y = topbar ? 0 : mh - dc.h;
-	/* print prompt? */
+	int curpos;
+	Item *item;
+
+	dc->x = 0;
+	dc->y = 0;
+	dc->h = bh;
+	drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
+
 	if(prompt) {
-		dc.w = promptw;
-		drawtext(&dc, prompt, selcol);
-		dc.x += dc.w;
+		dc->w = promptw;
+		drawtext(dc, prompt, selcol);
+		dc->x = dc->w;
 	}
-	dc.w = mw - dc.x;
-	/* print command */
-	if(cmdw && item && lines == 0)
-		dc.w = cmdw;
-	drawtext(&dc, text, normcol);
-	if(lines > 0)
-		drawmenuv();
-	else if(curr)
-		drawmenuh();
-	commitdraw(&dc, win);
-}
-
-void
-drawmenuh(void) {
-	Item *i;
-
-	dc.x += cmdw;
-	dc.w = spaceitem;
-	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;
+	dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
+	drawtext(dc, text, normcol);
+	if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+		drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
+
+	if(lines > 0) {
+		dc->w = mw - dc->x;
+		for(item = curr; item != next; item = item->right) {
+			dc->y += dc->h;
+			drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+		}
 	}
-	dc.w = spaceitem;
-	dc.x = mw - dc.w;
-	drawtext(&dc, next ? ">" : NULL, normcol);
-}
-
-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;
+	else if(matches) {
+		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 - dc->x - textw(dc, ">"));
+			drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+		}
+		dc->w = textw(dc, ">");
+		dc->x = mw - dc->w;
+		if(next)
+			drawtext(dc, ">", normcol);
 	}
-	if(!XGetWindowAttributes(dpy, win, &wa))
-		eprint("cannot get window attributes");
-	XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh);
+	mapdc(dc, win, mw, mh);
 }
 
 void
 grabkeyboard(void) {
-	unsigned int len;
+	int i;
 
-	for(len = 1000; len; len--) {
-		if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-		== GrabSuccess)
+	for(i = 0; i < 1000; i++) {
+		if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
+		                 GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
 			return;
 		usleep(1000);
 	}
-	exit(EXIT_FAILURE);
+	eprintf("cannot grab keyboard\n");
 }
 
 void
-kpress(XKeyEvent *e) {
-	char buf[sizeof text];
-	int num;
-	unsigned int i, len;
+insert(const char *str, 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], str, n);
+	cursor += n;
+	match(n > 0 && text[cursor] == '\0');
+}
+
+void
+keypress(XKeyEvent *ev) {
+	char buf[32];
 	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) {
-		switch(tolower(ksym)) {
-		default:
-			return;
-		case XK_a:
-			ksym = XK_Home;
-			break;
-		case XK_b:
-			ksym = XK_Left;
-			break;
-		case XK_c:
-			ksym = XK_Escape;
-			break;
-		case XK_e:
-			ksym = XK_End;
-			break;
-		case XK_f:
-			ksym = XK_Right;
-			break;
-		case XK_h:
-			ksym = XK_BackSpace;
+	XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+	if(ev->state & ControlMask) {
+		KeySym lower, upper;
+
+		XConvertCase(ksym, &lower, &upper);
+		switch(lower) {
+		case XK_a: ksym = XK_Home;      break;
+		case XK_b: ksym = XK_Left;      break;
+		case XK_c: ksym = XK_Escape;    break;
+		case XK_d: ksym = XK_Delete;    break;
+		case XK_e: ksym = XK_End;       break;
+		case XK_f: ksym = XK_Right;     break;
+		case XK_h: ksym = XK_BackSpace; break;
+		case XK_i: ksym = XK_Tab;       break;
+		case XK_j: ksym = XK_Return;    break;
+		case XK_m: ksym = XK_Return;    break;
+		case XK_n: ksym = XK_Up;        break;
+		case XK_p: ksym = XK_Down;      break;
+
+		case XK_k: /* delete right */
+			text[cursor] = '\0';
+			match(False);
 			break;
-		case XK_i:
-			ksym = XK_Tab;
+		case XK_u: /* delete left */
+			insert(NULL, 0 - cursor);
 			break;
-		case XK_j:
-		case XK_m:
-			ksym = XK_Return;
-			break;
-		case XK_n:
-			ksym = XK_Down;
-			break;
-		case XK_p:
-			ksym = XK_Up;
-			break;
-		case XK_u:
-			text[0] = '\0';
-			match(text);
-			break;
-		case XK_w:
-			if(len == 0)
-				return;
-			i = len;
-			while(i-- > 0 && text[i] == ' ');
-			while(i-- > 0 && text[i] != ' ');
-			text[++i] = '\0';
-			match(text);
+		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;
+		case XK_y: /* paste selection */
+			XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+			return;
+		default:
+			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(*buf))
+			insert(buf, strlen(buf));
 		break;
+	case XK_Delete:
+		if(text[cursor] == '\0')
+			return;
+		cursor = nextrune(+1);
+		/* fallthrough */
 	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);
+		insert(NULL, nextrune(-1) - cursor);
 		break;
 	case XK_End:
-		while(next) {
-			sel = curr = next;
+		if(text[cursor] != '\0') {
+			cursor = strlen(text);
+			break;
+		}
+		if(next) {
+			curr = matchend;
+			calcoffsets();
+			curr = prev;
 			calcoffsets();
+			while(next && (curr = curr->right))
+				calcoffsets();
 		}
-		while(sel && sel->right)
-			sel = sel->right;
+		sel = matchend;
 		break;
 	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_Left:
+		if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
+			cursor = nextrune(-1);
+			break;
+		}
+		/* fallthrough */
 	case XK_Up:
-		if(!sel || !sel->left)
-			return;
-		sel = sel->left;
-		if(sel->right == curr) {
+		if(sel && sel->left && (sel = sel->left)->right == curr) {
 			curr = prev;
 			calcoffsets();
 		}
@@ -352,169 +335,173 @@ kpress(XKeyEvent *e) {
 		calcoffsets();
 		break;
 	case XK_Return:
-		if(e->state & ShiftMask)
-			dinput();
-		fprintf(stdout, "%s", sel ? sel->text : text);
-		fflush(stdout);
+	case XK_KP_Enter:
+		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
 		exit(EXIT_SUCCESS);
 	case XK_Right:
+		if(text[cursor] != '\0') {
+			cursor = nextrune(+1);
+			break;
+		}
+		/* fallthrough */
 	case XK_Down:
-		if(!sel || !sel->right)
-			return;
-		sel = sel->right;
-		if(sel == next) {
+		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(True);
 		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);
-	if(lexact) {
-		item = lexact;
-		itemend = exactend;
+match(Bool sub) {
+	size_t len = strlen(text);
+	Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+	Item *item, *lnext;
+
+	lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
+	for(item = sub ? matches : items; item && item->text; item = lnext) {
+		lnext = sub ? item->right : item + 1;
+		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);
 	}
+	matches = lexact;
+	matchend = exactend;
+
 	if(lprefix) {
-		if(itemend) {
-			itemend->right = lprefix;
-			lprefix->left = itemend;
+		if(matchend) {
+			matchend->right = lprefix;
+			lprefix->left = matchend;
 		}
 		else
-			item = lprefix;
-		itemend = prefixend;
+			matches = lprefix;
+		matchend = prefixend;
 	}
 	if(lsubstr) {
-		if(itemend) {
-			itemend->right = lsubstr;
-			lsubstr->left = itemend;
+		if(matchend) {
+			matchend->right = lsubstr;
+			lsubstr->left = matchend;
 		}
 		else
-			item = lsubstr;
+			matches = lsubstr;
+		matchend = substrend;
 	}
-	curr = prev = next = sel = item;
+	curr = sel = matches;
 	calcoffsets();
 }
 
+size_t
+nextrune(int inc) {
+	ssize_t n;
+
+	for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
+	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 : (ssize_t)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, *maxstr = NULL;
+	size_t i, max = 0, size = 0;
+
+	for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
+		if(i+1 >= size / sizeof *items)
+			if(!(items = realloc(items, (size += BUFSIZ))))
+				eprintf("cannot realloc %u bytes:", size);
+		if((p = strchr(buf, '\n')))
+			*p = '\0';
+		if(!(items[i].text = strdup(buf)))
+			eprintf("cannot strdup %u bytes:", strlen(buf)+1);
+		if(strlen(items[i].text) > max)
+			max = strlen(maxstr = items[i].text);
 	}
+	if(items)
+		items[i].text = NULL;
+	inputw = maxstr ? textw(dc, maxstr) : 0;
 }
 
 void
 run(void) {
 	XEvent ev;
 
-	/* main event loop */
-	XSync(dpy, False);
-	while(!XNextEvent(dpy, &ev))
+	while(!XNextEvent(dc->dpy, &ev))
 		switch(ev.type) {
-		case KeyPress:
-			kpress(&ev.xkey);
-			break;
 		case Expose:
 			if(ev.xexpose.count == 0)
-				drawmenu();
+				mapdc(dc, win, mw, mh);
+			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);
+				XRaiseWindow(dc->dpy, win);
 			break;
 		}
-	exit(EXIT_FAILURE);
 }
 
 void
 setup(void) {
-	int i, j, x, y;
-#if XINERAMA
+	int x, y, screen = DefaultScreen(dc->dpy);
+	Window root = RootWindow(dc->dpy, screen);
+	XSetWindowAttributes wa;
+#ifdef XINERAMA
 	int n;
-	XineramaScreenInfo *info = NULL;
+	XineramaScreenInfo *info;
 #endif
-	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);
 
-	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);
+	normcol[ColBG] = getcolor(dc, normbgcolor);
+	normcol[ColFG] = getcolor(dc, normfgcolor);
+	selcol[ColBG]  = getcolor(dc, selbgcolor);
+	selcol[ColFG]  = getcolor(dc, selfgcolor);
 
-	/* menu window */
-	wa.override_redirect = True;
-	wa.background_pixmap = ParentRelative;
-	wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
 
-	/* menu window geometry */
-	mh = (dc.font.height + 2) * (lines + 1);
-#if XINERAMA
-	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
-		i = 0;
-		if(n > 1) {
-			int di;
-			unsigned int dui;
-			Window dummy;
-			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;
-		}
+	/* 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-1; 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);
 	}
@@ -522,85 +509,30 @@ setup(void) {
 #endif
 	{
 		x = 0;
-		y = topbar ? 0 : mh - DisplayHeight(dpy, screen);
-		mw = DisplayWidth(dpy, screen);
+		y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
+		mw = DisplayWidth(dc->dpy, screen);
 	}
+	promptw = prompt ? textw(dc, prompt) : 0;
+	inputw = MIN(inputw, mw/3);
+	match(False);
 
-	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
-			DefaultDepth(dpy, screen), CopyFromParent,
-			DefaultVisual(dpy, screen),
-			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-
-	setupdraw(&dc, win);
-	if(maxname)
-		cmdw = MIN(textw(&dc, maxname), mw / 3);
-	if(prompt)
-		promptw = MIN(textw(&dc, prompt), mw / 5);
-	text[0] = '\0';
-	match(text);
-	XMapRaised(dpy, win);
-}
+	/* 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);
 
-int
-main(int argc, char *argv[]) {
-	unsigned int i;
+	XMapRaised(dc->dpy, win);
+	resizedc(dc, mw, mh);
+	drawmenu();
+}
 
-	/* command line args */
-	progname = "dmenu";
-	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")) {
-			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);
-
-	readstdin();
-	grabkeyboard();
-	setup();
-	run();
-	return 0;
+void
+usage(void) {
+	fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n"
+	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+	exit(EXIT_FAILURE);
 }