X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/3c366bd73d1812845b0afc185ccaba9bbc871854..b3d9451c2ddfad7c1b10e9a868afed4d92b37e41:/dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 908f548..e0c2f80 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,319 +1,448 @@
 /* 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 <strings.h>
+#include <time.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#include <dc.h>
+#include <X11/Xft/Xft.h>
+
+#include "drw.h"
+#include "util.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))
+/* macros */
+#define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
+                             * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
+#define LENGTH(X)             (sizeof X / sizeof X[0])
+#define TEXTNW(X,N)           (drw_font_getexts_width(drw->fonts[0], (X), (N)))
+#define TEXTW(X)              (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
 
-typedef struct Item Item;
-struct Item {
+/* enums */
+enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
+
+struct item {
 	char *text;
-	Item *next;          /* traverses all items */
-	Item *left, *right;  /* traverses matching items */
+	struct item *left, *right;
+	int out;
 };
 
-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 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 int sw, sh; /* X display screen geometry width, height */
+static int inputw, promptw;
+static size_t cursor;
+static struct item *items = NULL;
+static struct item *matches, *matchend;
+static struct item *prev, *curr, *next, *sel;
+static int mon = -1, screen;
+
+static Atom clip, utf8;
+static Display *dpy;
 static Window root, win;
+static XIC xic;
+
+static ClrScheme scheme[SchemeLast];
+static Drw *drw;
+
+#include "config.h"
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+static char *(*fstrstr)(const char *, const char *) = strstr;
 
-void
-appenditem(Item *item, Item **list, Item **last) {
-	if(!*last)
-		*list = item;
-	else
+static void
+appenditem(struct item *item, struct item **list, struct item **last)
+{
+	if (*last)
 		(*last)->right = item;
+	else
+		*list = item;
+
 	item->left = *last;
 	item->right = NULL;
 	*last = item;
 }
 
-void
-calcoffsets(void) {
-	unsigned int i, n;
+static void
+calcoffsets(void)
+{
+	int i, n;
 
-	if(lines > 0)
+	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)
+		n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
+	/* calculate which items will begin the next page and previous page */
+	for (i = 0, next = curr; next; next = next->right)
+		if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
 			break;
-	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)
+	for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
+		if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
 			break;
 }
 
-void
-drawmenu(void) {
-	int curpos;
-	Item *item;
-
-	dc->x = 0;
-	dc->y = 0;
-	dc->h = bh;
-	dc_drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
+static void
+cleanup(void)
+{
+	size_t i;
 
-	if(prompt) {
-		dc->w = promptw;
-		dc_drawtext(dc, prompt, selcol);
-		dc->x = dc->w;
+	XUngrabKey(dpy, AnyKey, AnyModifier, root);
+	for (i = 0; i < SchemeLast; i++) {
+		drw_clr_free(scheme[i].bg);
+		drw_clr_free(scheme[i].fg);
 	}
-	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));
-
-	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);
-		}
-	}
-	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);
+	drw_free(drw);
+	XSync(dpy, False);
+	XCloseDisplay(dpy);
 }
 
-char *
-fstrstr(const char *s, const char *sub) {
+static char *
+cistrstr(const char *s, const char *sub)
+{
 	size_t len;
 
-	for(len = strlen(sub); *s; s++)
-		if(!fstrncmp(s, sub, len))
+	for (len = strlen(sub); *s; s++)
+		if (!strncasecmp(s, sub, len))
 			return (char *)s;
 	return NULL;
 }
 
-void
-grabkeyboard(void) {
+static void
+drawmenu(void)
+{
+	int curpos;
+	struct item *item;
+	int x = 0, y = 0, h = bh, w;
+
+	drw_setscheme(drw, &scheme[SchemeNorm]);
+	drw_rect(drw, 0, 0, mw, mh, 1, 1, 1);
+
+	if (prompt && *prompt) {
+		drw_setscheme(drw, &scheme[SchemeSel]);
+		drw_text(drw, x, 0, promptw, bh, prompt, 0);
+		x += promptw;
+	}
+	/* draw input field */
+	w = (lines > 0 || !matches) ? mw - x : inputw;
+	drw_setscheme(drw, &scheme[SchemeNorm]);
+	drw_text(drw, x, 0, w, bh, text, 0);
+
+	if ((curpos = TEXTNW(text, cursor) + bh / 2 - 2) < w) {
+		drw_setscheme(drw, &scheme[SchemeNorm]);
+		drw_rect(drw, x + curpos + 2, 2, 1, bh - 4, 1, 1, 0);
+	}
+
+	if (lines > 0) {
+		/* draw vertical list */
+		w = mw - x;
+		for (item = curr; item != next; item = item->right) {
+			y += h;
+			if (item == sel)
+				drw_setscheme(drw, &scheme[SchemeSel]);
+			else if (item->out)
+				drw_setscheme(drw, &scheme[SchemeOut]);
+			else
+				drw_setscheme(drw, &scheme[SchemeNorm]);
+
+			drw_text(drw, x, y, w, bh, item->text, 0);
+		}
+	} else if (matches) {
+		/* draw horizontal list */
+		x += inputw;
+		w = TEXTW("<");
+		if (curr->left) {
+			drw_setscheme(drw, &scheme[SchemeNorm]);
+			drw_text(drw, x, 0, w, bh, "<", 0);
+		}
+		for (item = curr; item != next; item = item->right) {
+			x += w;
+			w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
+
+			if (item == sel)
+				drw_setscheme(drw, &scheme[SchemeSel]);
+			else if (item->out)
+				drw_setscheme(drw, &scheme[SchemeOut]);
+			else
+				drw_setscheme(drw, &scheme[SchemeNorm]);
+			drw_text(drw, x, 0, w, bh, item->text, 0);
+		}
+		w = TEXTW(">");
+		x = mw - w;
+		if (next) {
+			drw_setscheme(drw, &scheme[SchemeNorm]);
+			drw_text(drw, x, 0, w, bh, ">", 0);
+		}
+	}
+	drw_map(drw, win, 0, 0, mw, mh);
+}
+
+static void
+grabkeyboard(void)
+{
+	struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
 	int i;
 
-	for(i = 0; i < 1000; i++) {
-		if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+	/* try to grab keyboard, we may have to wait for another process to ungrab */
+	for (i = 0; i < 1000; i++) {
+		if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True,
+		                 GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
 			return;
-		usleep(1000);
+		nanosleep(&ts, NULL);
 	}
-	eprintf("cannot grab keyboard\n");
+	die("cannot grab keyboard\n");
 }
 
-void
-insert(const char *s, ssize_t n) {
-	if(strlen(text) + n > sizeof text - 1)
+static void
+match(void)
+{
+	static char **tokv = NULL;
+	static int tokn = 0;
+
+	char buf[sizeof text], *s;
+	int i, tokc = 0;
+	size_t len, textsize;
+	struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+
+	strcpy(buf, text);
+	/* separate input text into tokens to be matched individually */
+	for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
+		if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
+			die("cannot realloc %u bytes\n", tokn * sizeof *tokv);
+	len = tokc ? strlen(tokv[0]) : 0;
+
+	matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+	textsize = strlen(text);
+	for (item = items; item && item->text; item++) {
+		for (i = 0; i < tokc; i++)
+			if (!fstrstr(item->text, tokv[i]))
+				break;
+		if (i != tokc) /* not all tokens match */
+			continue;
+		/* exact matches go first, then prefixes, then substrings */
+		if (!tokc || !fstrncmp(text, item->text, textsize))
+			appenditem(item, &matches, &matchend);
+		else if (!fstrncmp(tokv[0], item->text, len))
+			appenditem(item, &lprefix, &prefixend);
+		else
+			appenditem(item, &lsubstr, &substrend);
+	}
+	if (lprefix) {
+		if (matches) {
+			matchend->right = lprefix;
+			lprefix->left = matchend;
+		} else
+			matches = lprefix;
+		matchend = prefixend;
+	}
+	if (lsubstr) {
+		if (matches) {
+			matchend->right = lsubstr;
+			lsubstr->left = matchend;
+		} else
+			matches = lsubstr;
+		matchend = substrend;
+	}
+	curr = sel = matches;
+	calcoffsets();
+}
+
+static void
+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, s, n);
+	/* move existing text out of the way, insert new text, and update cursor */
+	memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
+	if (n > 0)
+		memcpy(&text[cursor], str, n);
 	cursor += n;
 	match();
 }
 
-void
-keypress(XKeyEvent *ev) {
+static size_t
+nextrune(int inc)
+{
+	ssize_t n;
+
+	/* return location of next utf8 rune in the given direction (+1 or -1) */
+	for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
+		;
+	return n;
+}
+
+static void
+keypress(XKeyEvent *ev)
+{
 	char buf[32];
-	size_t len;
-	KeySym ksym;
+	int len;
+	KeySym ksym = NoSymbol;
+	Status status;
 
-	len = strlen(text);
-	XLookupString(ev, buf, sizeof buf, &ksym, NULL);
-	if(ev->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_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_k:  /* delete right */
+	len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+	if (status == XBufferOverflow)
+		return;
+	if (ev->state & ControlMask)
+		switch(ksym) {
+		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_g: ksym = XK_Escape;    break;
+		case XK_h: ksym = XK_BackSpace; break;
+		case XK_i: ksym = XK_Tab;       break;
+		case XK_j: /* fallthrough */
+		case XK_J: /* fallthrough */
+		case XK_m: /* fallthrough */
+		case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break;
+		case XK_n: ksym = XK_Down;      break;
+		case XK_p: ksym = XK_Up;        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:  /* delete left */
+		case XK_u: /* delete left */
 			insert(NULL, 0 - cursor);
 			break;
-		case XK_w:  /* delete word */
-			while(cursor > 0 && text[nextrune(-1)] == ' ')
+		case XK_w: /* delete word */
+			while (cursor > 0 && strchr(worddelimiters,
+			       text[nextrune(-1)]))
 				insert(NULL, nextrune(-1) - cursor);
-			while(cursor > 0 && text[nextrune(-1)] != ' ')
+			while (cursor > 0 && !strchr(worddelimiters,
+			       text[nextrune(-1)]))
 				insert(NULL, nextrune(-1) - cursor);
 			break;
+		case XK_y: /* paste selection */
+		case XK_Y:
+			XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
+			                  utf8, utf8, win, CurrentTime);
+			return;
+		case XK_Return:
+		case XK_KP_Enter:
+			break;
+		case XK_bracketleft:
+			cleanup();
+			exit(1);
+		default:
+			return;
+		}
+	else if (ev->state & Mod1Mask)
+		switch(ksym) {
+		case XK_g: ksym = XK_Home;  break;
+		case XK_G: ksym = XK_End;   break;
+		case XK_h: ksym = XK_Up;    break;
+		case XK_j: ksym = XK_Next;  break;
+		case XK_k: ksym = XK_Prior; break;
+		case XK_l: ksym = XK_Down;  break;
+		default:
+			return;
 		}
-	}
 	switch(ksym) {
 	default:
-		if(!iscntrl(*buf))
-			insert(buf, strlen(buf));
+		if (!iscntrl(*buf))
+			insert(buf, len);
 		break;
 	case XK_Delete:
-		if(cursor == len)
+		if (text[cursor] == '\0')
 			return;
 		cursor = nextrune(+1);
+		/* fallthrough */
 	case XK_BackSpace:
-		if(cursor > 0)
-			insert(NULL, nextrune(-1) - cursor);
+		if (cursor == 0)
+			return;
+		insert(NULL, nextrune(-1) - cursor);
 		break;
 	case XK_End:
-		if(cursor < len) {
-			cursor = len;
+		if (text[cursor] != '\0') {
+			cursor = strlen(text);
 			break;
 		}
-		while(next) {
-			sel = curr = next;
+		if (next) {
+			/* jump to end of list and position items in reverse */
+			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);
+		cleanup();
+		exit(1);
 	case XK_Home:
-		if(sel == matches) {
+		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:
-		if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
+		if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
 			cursor = nextrune(-1);
 			break;
 		}
-		else if(lines > 0)
+		if (lines > 0)
 			return;
+		/* fallthrough */
 	case XK_Up:
-		if(sel && sel->left && (sel = sel->left)->right == curr) {
+		if (sel && sel->left && (sel = sel->left)->right == curr) {
 			curr = prev;
 			calcoffsets();
 		}
 		break;
 	case XK_Next:
-		if(!next)
+		if (!next)
 			return;
 		sel = curr = next;
 		calcoffsets();
 		break;
 	case XK_Prior:
-		if(!prev)
+		if (!prev)
 			return;
 		sel = curr = prev;
 		calcoffsets();
 		break;
 	case XK_Return:
 	case XK_KP_Enter:
-		fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
-		fflush(stdout);
-		exit(EXIT_SUCCESS);
+		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+		if (!(ev->state & ControlMask)) {
+			cleanup();
+			exit(0);
+		}
+		if (sel)
+			sel->out = 1;
+		break;
 	case XK_Right:
-		if(cursor < len) {
+		if (text[cursor] != '\0') {
 			cursor = nextrune(+1);
 			break;
 		}
-		else if(lines > 0)
+		if (lines > 0)
 			return;
+		/* fallthrough */
 	case XK_Down:
-		if(sel && sel->right && (sel = sel->right) == next) {
+		if (sel && sel->right && (sel = sel->right) == next) {
 			curr = next;
 			calcoffsets();
 		}
 		break;
 	case XK_Tab:
-		if(!sel)
+		if (!sel)
 			return;
-		strncpy(text, sel->text, sizeof text);
+		strncpy(text, sel->text, sizeof text - 1);
+		text[sizeof text - 1] = '\0';
 		cursor = strlen(text);
 		match();
 		break;
@@ -321,219 +450,233 @@ keypress(XKeyEvent *ev) {
 	drawmenu();
 }
 
-void
-match(void) {
-	size_t len;
-	Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
-
-	len = strlen(text);
-	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) {
-		matches = lexact;
-		itemend = exactend;
-	}
-	if(lprefix) {
-		if(itemend) {
-			itemend->right = lprefix;
-			lprefix->left = itemend;
-		}
-		else
-			matches = lprefix;
-		itemend = prefixend;
-	}
-	if(lsubstr) {
-		if(itemend) {
-			itemend->right = lsubstr;
-			lsubstr->left = itemend;
-		}
-		else
-			matches = lsubstr;
-	}
-	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) {
+static void
+paste(void)
+{
 	char *p, *q;
 	int di;
 	unsigned long dl;
 	Atom da;
 
-	XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
+	/* we have been given the current selection, now insert it into input */
+	XGetWindowProperty(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));
+	insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
 	XFree(p);
 	drawmenu();
 }
 
-void
-readstdin(void) {
-	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')))
+static void
+readstdin(void)
+{
+	char buf[sizeof text], *p, *maxstr = NULL;
+	size_t i, max = 0, size = 0;
+
+	/* read each line from stdin and add it to the item list */
+	for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
+		if (i + 1 >= size / sizeof *items)
+			if (!(items = realloc(items, (size += BUFSIZ))))
+				die("cannot realloc %u bytes:", size);
+		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));
+		if (!(items[i].text = strdup(buf)))
+			die("cannot strdup %u bytes:", strlen(buf) + 1);
+		items[i].out = 0;
+		if (strlen(items[i].text) > max)
+			max = strlen(maxstr = items[i].text);
 	}
+	if (items)
+		items[i].text = NULL;
+	inputw = maxstr ? TEXTW(maxstr) : 0;
+	lines = MIN(lines, i);
 }
 
-void
-run(void) {
+static void
+run(void)
+{
 	XEvent ev;
 
-	while(!XNextEvent(dc->dpy, &ev))
+	while (!XNextEvent(dpy, &ev)) {
+		if (XFilterEvent(&ev, win))
+			continue;
 		switch(ev.type) {
 		case Expose:
-			if(ev.xexpose.count == 0)
-				drawmenu();
+			if (ev.xexpose.count == 0)
+				drw_map(drw, win, 0, 0, mw, mh);
 			break;
 		case KeyPress:
 			keypress(&ev.xkey);
 			break;
 		case SelectionNotify:
-			if(ev.xselection.property == utf8)
+			if (ev.xselection.property == utf8)
 				paste();
 			break;
 		case VisibilityNotify:
-			if(ev.xvisibility.state != VisibilityUnobscured)
-				XRaiseWindow(dc->dpy, win);
+			if (ev.xvisibility.state != VisibilityUnobscured)
+				XRaiseWindow(dpy, win);
 			break;
 		}
+	}
 }
 
-void
-setup(void) {
-	int x, y, screen;
-	XSetWindowAttributes wa;
+static void
+setup(void)
+{
+	int x, y;
+	XSetWindowAttributes swa;
+	XIM xim;
 #ifdef XINERAMA
-	int n;
 	XineramaScreenInfo *info;
+	Window w, pw, dw, *dws;
+	XWindowAttributes wa;
+	int a, j, di, n, i = 0, area = 0;
+	unsigned int du;
 #endif
 
-	screen = DefaultScreen(dc->dpy);
-	root = RootWindow(dc->dpy, screen);
-	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+	/* init appearance */
+	scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
+	scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
+	scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
+	scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
+	scheme[SchemeOut].bg = drw_clr_create(drw, outbgcolor);
+	scheme[SchemeOut].fg = drw_clr_create(drw, outfgcolor);
 
-	normcol[ColBG] = dc_color(dc, normbgcolor);
-	normcol[ColFG] = dc_color(dc, normfgcolor);
-	selcol[ColBG] = dc_color(dc, selbgcolor);
-	selcol[ColFG] = dc_color(dc, selfgcolor);
+	clip = XInternAtom(dpy, "CLIPBOARD",   False);
+	utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
-	/* menu geometry */
-	bh = dc->font.height + 2;
+	/* calculate menu geometry */
+	bh = drw->fonts[0]->h + 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;
+	if ((info = XineramaQueryScreens(dpy, &n))) {
+		XGetInputFocus(dpy, &w, &di);
+		if (mon != -1 && mon < n)
+			i = mon;
+		else if (w != root && w != PointerRoot && w != None) {
+			/* find top-level window containing current input focus */
+			do {
+				if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
+					XFree(dws);
+			} while (w != root && w != pw);
+			/* find xinerama screen with which the window intersects most */
+			if (XGetWindowAttributes(dpy, pw, &wa))
+				for (j = 0; j < n; j++)
+					if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
+						area = a;
+						i = j;
+					}
+		}
+		/* no focused window is on screen, so use pointer location instead */
+		if (mon == -1 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+			for (i = 0; i < n; i++)
+				if (INTERSECT(x, y, 1, 1, info[i]))
+					break;
+
 		x = info[i].x_org;
 		y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
 		mw = info[i].width;
 		XFree(info);
-	}
-	else
+	} else
 #endif
 	{
 		x = 0;
-		y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
-		mw = DisplayWidth(dc->dpy, screen);
+		y = topbar ? 0 : sh - mh;
+		mw = sw;
 	}
-	/* 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);
+	promptw = (prompt && *prompt) ? TEXTW(prompt) : 0;
 	inputw = MIN(inputw, mw/3);
-	promptw = prompt ? dc_textw(dc, prompt) : 0;
-	XMapRaised(dc->dpy, win);
-	text[0] = '\0';
 	match();
+
+	/* create menu window */
+	swa.override_redirect = True;
+	swa.background_pixel = scheme[SchemeNorm].bg->pix;
+	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
+	                    DefaultDepth(dpy, screen), CopyFromParent,
+	                    DefaultVisual(dpy, screen),
+	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
+
+	/* open input methods */
+	xim = XOpenIM(dpy, NULL, NULL, NULL);
+	xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+	                XNClientWindow, win, XNFocusWindow, win, NULL);
+
+	XMapRaised(dpy, win);
+	drw_resize(drw, mw, mh);
+	drawmenu();
 }
 
-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);
+static void
+usage(void)
+{
+	fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+	exit(1);
 }
 
 int
-main(int argc, char *argv[]) {
-	int i;
-
-	progname = "dmenu";
-	for(i = 1; i < argc; i++)
-		/* 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], "-i"))
+main(int argc, char *argv[])
+{
+	int i, fast = 0;
+
+	for (i = 1; i < argc; i++)
+		/* these options take no arguments */
+		if (!strcmp(argv[i], "-v")) {      /* prints version information */
+			puts("dmenu-"VERSION);
+			exit(0);
+		} else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
+			topbar = 0;
+		else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
+			fast = 1;
+		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
 			fstrncmp = strncasecmp;
-		else if(i == argc-1)
+			fstrstr = cistrstr;
+		} else if (i + 1 == argc)
 			usage();
-		/* double flags */
-		else if(!strcmp(argv[i], "-l"))
+		/* these options take one argument */
+		else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
 			lines = atoi(argv[++i]);
-		else if(!strcmp(argv[i], "-p"))
+		else if (!strcmp(argv[i], "-m"))
+			mon = atoi(argv[++i]);
+		else if (!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
 			prompt = argv[++i];
-		else if(!strcmp(argv[i], "-fn"))
-			font = argv[++i];
-		else if(!strcmp(argv[i], "-nb"))
+		else if (!strcmp(argv[i], "-fn"))  /* font or font set */
+			fonts[0] = argv[++i];
+		else if (!strcmp(argv[i], "-nb"))  /* normal background color */
 			normbgcolor = argv[++i];
-		else if(!strcmp(argv[i], "-nf"))
+		else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
 			normfgcolor = argv[++i];
-		else if(!strcmp(argv[i], "-sb"))
+		else if (!strcmp(argv[i], "-sb"))  /* selected background color */
 			selbgcolor = argv[++i];
-		else if(!strcmp(argv[i], "-sf"))
+		else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
 			selfgcolor = argv[++i];
 		else
 			usage();
 
-	dc = dc_init();
-	dc_font(dc, font);
-	readstdin();
+	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+		fputs("warning: no locale support\n", stderr);
+	if (!(dpy = XOpenDisplay(NULL)))
+		die("cannot open display\n");
+	screen = DefaultScreen(dpy);
+	root = RootWindow(dpy, screen);
+	sw = DisplayWidth(dpy, screen);
+	sh = DisplayHeight(dpy, screen);
+	drw = drw_create(dpy, screen, root, sw, sh);
+	drw_load_fonts(drw, fonts, LENGTH(fonts));
+	if (!drw->fontcount)
+		die("no fonts could be loaded.\n");
+	drw_setscheme(drw, &scheme[SchemeNorm]);
+
+	if (fast) {
+		grabkeyboard();
+		readstdin();
+	} else {
+		readstdin();
+		grabkeyboard();
+	}
 	setup();
 	run();
 
-	return EXIT_FAILURE;  /* should not reach */
+	return 1; /* unreachable */
 }