X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/06ae8944344cd6f7d0aa007b7b036e77cb87fdf1..32f2564dbbbf5aeafb7190a3d35066142f34448f:/dmenu.c

diff --git a/dmenu.c b/dmenu.c
index b684175..a07f8e3 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,701 +1,680 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>
-#include <stdarg.h>
-#include <stdlib.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>
-#include <X11/keysym.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+#include <X11/Xft/Xft.h>
+
+#include "drw.h"
+#include "util.h"
 
 /* macros */
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#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)
 
 /* enums */
-enum { ColFG, ColBG, ColLast };
-
-/* typedefs */
-typedef struct {
-	int x, y, w, h;
-	unsigned long norm[ColLast];
-	unsigned long sel[ColLast];
-	Drawable drawable;
-	GC gc;
-	struct {
-		XFontStruct *xfont;
-		XFontSet set;
-		int ascent;
-		int descent;
-		int height;
-	} font;
-} DC; /* draw context */
-
-typedef struct Item Item;
-struct Item {
-	Item *next;		/* traverses all items */
-	Item *left, *right;	/* traverses items matching current search pattern */
+enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
+
+struct item {
 	char *text;
+	struct item *left, *right;
+	int out;
 };
 
-/* forward declarations */
-static void *emalloc(unsigned int size);
-static void eprint(const char *errstr, ...);
-static char *estrdup(const char *str);
-static void drawtext(const char *text, unsigned long col[ColLast]);
-static unsigned int textw(const char *text);
-static unsigned int textnw(const char *text, unsigned int len);
-static void calcoffsets(void);
-static void drawmenu(void);
-static Bool grabkeyboard(void);
-static unsigned long getcolor(const char *colstr);
-static void initfont(const char *fontstr);
-static int strido(const char *text, const char *pattern);
-static void match(char *pattern);
-static void kpress(XKeyEvent * e);
-static char *readstdin(void);
-static void usage(void);
-
-
-/* variables */
-static int screen;
+static char text[BUFSIZ] = "";
+static int bh, mw, mh;
+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 DC dc = {0};
-static char text[4096];
-static char *prompt = NULL;
-static int mw, mh;
-static int ret = 0;
-static int nitem = 0;
-static unsigned int cmdw = 0;
-static unsigned int promptw = 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 root;
-static Window win;
+static Window root, win;
+static XIC xic;
 
-#include "config.h"
+static ClrScheme scheme[SchemeLast];
+static Drw *drw;
 
-static void *
-emalloc(unsigned int size) {
-	void *res = malloc(size);
+#include "config.h"
 
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", size);
-	return res;
-}
+static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+static char *(*fstrstr)(const char *, const char *) = strstr;
 
 static void
-eprint(const char *errstr, ...) {
-	va_list ap;
+appenditem(struct item *item, struct item **list, struct item **last)
+{
+	if (*last)
+		(*last)->right = item;
+	else
+		*list = item;
 
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(EXIT_FAILURE);
+	item->left = *last;
+	item->right = NULL;
+	*last = item;
 }
 
-static char *
-estrdup(const char *str) {
-	void *res = strdup(str);
+static void
+calcoffsets(void)
+{
+	int i, n;
 
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", strlen(str));
-	return res;
+	if (lines > 0)
+		n = lines * bh;
+	else
+		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(TEXTW(prev->left->text), n)) > n)
+			break;
 }
 
-
 static void
-drawtext(const char *text, unsigned long col[ColLast]) {
-	int x, y, w, h;
-	static char buf[256];
-	unsigned int len, olen;
-	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-	XSetForeground(dpy, dc.gc, col[ColBG]);
-	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-	if(!text)
-		return;
-	w = 0;
-	olen = len = strlen(text);
-	if(len >= sizeof buf)
-		len = sizeof buf - 1;
-	memcpy(buf, text, len);
-	buf[len] = 0;
-	h = dc.font.ascent + dc.font.descent;
-	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
-	x = dc.x + (h / 2);
-	/* shorten text if necessary */
-	while(len && (w = textnw(buf, len)) > dc.w - h)
-		buf[--len] = 0;
-	if(len < olen) {
-		if(len > 1)
-			buf[len - 1] = '.';
-		if(len > 2)
-			buf[len - 2] = '.';
-		if(len > 3)
-			buf[len - 3] = '.';
+cleanup(void)
+{
+	size_t i;
+
+	XUngrabKey(dpy, AnyKey, AnyModifier, root);
+	for (i = 0; i < SchemeLast; i++) {
+		drw_clr_free(scheme[i].bg);
+		drw_clr_free(scheme[i].fg);
 	}
-	if(w > dc.w)
-		return; /* too long */
-	XSetForeground(dpy, dc.gc, col[ColFG]);
-	if(dc.font.set)
-		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-	else
-		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-}
-
-static unsigned int
-textw(const char *text) {
-	return textnw(text, strlen(text)) + dc.font.height;
+	drw_free(drw);
+	XSync(dpy, False);
+	XCloseDisplay(dpy);
 }
 
-static unsigned int
-textnw(const char *text, unsigned int len) {
-	XRectangle r;
-
-	if(dc.font.set) {
-		XmbTextExtents(dc.font.set, text, len, NULL, &r);
-		return r.width;
-	}
-	return XTextWidth(dc.font.xfont, text, len);
+static char *
+cistrstr(const char *s, const char *sub)
+{
+	size_t len;
+
+	for (len = strlen(sub); *s; s++)
+		if (!strncasecmp(s, sub, len))
+			return (char *)s;
+	return NULL;
 }
 
 static void
-calcoffsets(void) {
-	unsigned int tw, w;
-
-	if(!curr)
-		return;
-	w = promptw + cmdw + 2 * SPACE;
-	for(next = curr; next; next=next->right) {
-		tw = textw(next->text);
-		if(tw > mw / 3)
-			tw = mw / 3;
-		w += tw;
-		if(w > mw)
-			break;
+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;
 	}
-	w = promptw + cmdw + 2 * SPACE;
-	for(prev = curr; prev && prev->left; prev=prev->left) {
-		tw = textw(prev->left->text);
-		if(tw > mw / 3)
-			tw = mw / 3;
-		w += tw;
-		if(w > mw)
-			break;
+	/* 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);
 	}
-}
 
-static void
-drawmenu(void) {
-	Item *i;
-
-	dc.x = 0;
-	dc.y = 0;
-	dc.w = mw;
-	dc.h = mh;
-	drawtext(NULL, dc.norm);
-	/* print prompt? */
-	if(promptw) {
-		dc.w = promptw;
-		drawtext(prompt, dc.sel);
-	}
-	dc.x += promptw;
-	dc.w = mw - promptw;
-	/* print command */
-	if(cmdw && item)
-		dc.w = cmdw;
-	drawtext(text[0] ? text : NULL, dc.norm);
-	dc.x += cmdw;
-	if(curr) {
-		dc.w = SPACE;
-		drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
-		dc.x += dc.w;
-		/* determine maximum items */
-		for(i = curr; i != next; i=i->right) {
-			dc.w = textw(i->text);
-			if(dc.w > mw / 3)
-				dc.w = mw / 3;
-			drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
-			dc.x += dc.w;
+	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);
 		}
-		dc.x = mw - SPACE;
-		dc.w = SPACE;
-		drawtext(next ? ">" : NULL, dc.norm);
 	}
-	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
-	XFlush(dpy);
+	drw_map(drw, win, 0, 0, mw, mh);
 }
 
-static Bool
-grabkeyboard(void) {
-	unsigned int len;
-
-	for(len = 1000; len; len--) {
-		if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-			== GrabSuccess)
-			break;
-		usleep(1000);
+static void
+grabkeyboard(void)
+{
+	struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
+	int i;
+
+	/* 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;
+		nanosleep(&ts, NULL);
 	}
-	return len > 0;
-}
-
-static unsigned long
-getcolor(const char *colstr) {
-	Colormap cmap = DefaultColormap(dpy, screen);
-	XColor color;
-
-	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-		eprint("error, cannot allocate color '%s'\n", colstr);
-	return color.pixel;
+	die("cannot grab keyboard\n");
 }
 
 static void
-initfont(const char *fontstr) {
-	char *def, **missing;
-	int i, n;
-
-	if(!fontstr || fontstr[0] == '\0')
-		eprint("error, cannot load font: '%s'\n", fontstr);
-	missing = NULL;
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
-	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-	if(missing)
-		XFreeStringList(missing);
-	if(dc.font.set) {
-		XFontSetExtents *font_extents;
-		XFontStruct **xfonts;
-		char **font_names;
-		dc.font.ascent = dc.font.descent = 0;
-		font_extents = XExtentsOfFontSet(dc.font.set);
-		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-			if(dc.font.ascent < (*xfonts)->ascent)
-				dc.font.ascent = (*xfonts)->ascent;
-			if(dc.font.descent < (*xfonts)->descent)
-				dc.font.descent = (*xfonts)->descent;
-			xfonts++;
-		}
+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);
 	}
-	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
-		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) {
-			if(!(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
-				eprint("error, cannot load font: '%s'\n", fontstr);
-		}
-		dc.font.ascent = dc.font.xfont->ascent;
-		dc.font.descent = dc.font.xfont->descent;
+	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;
 	}
-	dc.font.height = dc.font.ascent + dc.font.descent;
+	curr = sel = matches;
+	calcoffsets();
 }
 
-static int
-strido(const char *text, const char *pattern) {
-	for(; *text && *pattern; text++)
-		if (*text == *pattern)
-			pattern++;
-	return !*pattern;
-}                                  
-
 static void
-match(char *pattern) {
-	unsigned int plen;
-	Item *i, *j;
-
-	if(!pattern)
+insert(const char *str, ssize_t n)
+{
+	if (strlen(text) + n > sizeof text - 1)
 		return;
-	plen = strlen(pattern);
-	item = j = NULL;
-	nitem = 0;
-	for(i = allitems; i; i=i->next)
-		if(!plen || !strncmp(pattern, i->text, plen)) {
-			if(!j)
-				item = i;
-			else
-				j->right = i;
-			i->left = j;
-			i->right = NULL;
-			j = i;
-			nitem++;
-		}
-	for(i = allitems; i; i=i->next)
-		if(plen && strncmp(pattern, i->text, plen)
-				&& strstr(i->text, pattern)) {
-			if(!j)                               
-				item = i;                              
-			else                                     
-				j->right = i;                          
-			i->left = j;      
-			i->right = NULL;                         
-			j = i;                                      
-			nitem++;                                       
-		}                                              
-	for(i = allitems; i; i=i->next)                            
-		if(plen && strncmp(pattern, i->text, plen)             
-				&& !strstr(i->text, pattern)          
-				&& strido(i->text,pattern)) { 
-			if(!j)
-				item = i;
-			else
-				j->right = i;
-			i->left = j;
-			i->right = NULL;
-			j = i;
-			nitem++;
-		}
-	curr = prev = next = sel = item;
-	calcoffsets();
+	/* 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();
+}
+
+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
-kpress(XKeyEvent * e) {
+keypress(XKeyEvent *ev)
+{
 	char buf[32];
-	int i, num;
-	unsigned int len;
-	KeySym ksym;
-
-	len = strlen(text);
-	buf[0] = 0;
-	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
-	if(IsKeypadKey(ksym)) { 
-		if(ksym == XK_KP_Enter) {
-			ksym = XK_Return;
-		} else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) {
-			ksym = (ksym - XK_KP_0) + XK_0;
-		}
-	}
-	if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
-			|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
-			|| IsPrivateKeypadKey(ksym))
+	int len;
+	KeySym ksym = NoSymbol;
+	Status status;
+
+	len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+	if (status == XBufferOverflow)
 		return;
-	/* first check if a control mask is omitted */
-	if(e->state & ControlMask) {
-		switch (ksym) {
-		default:	/* ignore other control sequences */
-			return;
-		case XK_bracketleft:
-			ksym = XK_Escape;
-			break;
-		case XK_h:
-		case XK_H:
-			ksym = XK_BackSpace;
+	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_i:
-		case XK_I:
-			ksym = XK_Tab;
+		case XK_u: /* delete left */
+			insert(NULL, 0 - cursor);
 			break;
-		case XK_j:
-		case XK_J:
-			ksym = XK_Return;
+		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_u:
-		case XK_U:
-			text[0] = 0;
-			match(text);
-			drawmenu();
+		case XK_y: /* paste selection */
+		case XK_Y:
+			XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
+			                  utf8, utf8, win, CurrentTime);
 			return;
-		case XK_w:
-		case XK_W:
-			if(len) {
-				i = len - 1;
-				while(i >= 0 && text[i] == ' ')
-					text[i--] = 0;
-				while(i >= 0 && text[i] != ' ')
-					text[i--] = 0;
-				match(text);
-				drawmenu();
-			}
+		case XK_Return:
+		case XK_KP_Enter:
+			break;
+		case XK_bracketleft:
+			cleanup();
+			exit(1);
+		default:
 			return;
 		}
-	}
-	if(CLEANMASK(e->state) & Mod1Mask) {
+	else if (ev->state & Mod1Mask)
 		switch(ksym) {
-		default: return;
-		case XK_h:
-			ksym = XK_Left;
-			break;
-		case XK_l:
-			ksym = XK_Right;
-			break;
-		case XK_j:
-			ksym = XK_Next;
-			break;
-		case XK_k:
-			ksym = XK_Prior;
-			break;
-		case XK_g:
-			ksym = XK_Home;
-			break;
-		case XK_G:
-			ksym = XK_End;
-			break;
+		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(num && !iscntrl((int) buf[0])) {
-			buf[num] = 0;
-			if(len > 0)
-				strncat(text, buf, sizeof text);
-			else
-				strncpy(text, buf, sizeof text);
-			match(text);
-		}
+		if (!iscntrl(*buf))
+			insert(buf, len);
 		break;
+	case XK_Delete:
+		if (text[cursor] == '\0')
+			return;
+		cursor = nextrune(+1);
+		/* fallthrough */
 	case XK_BackSpace:
-		if(len) {
-			text[--len] = 0;
-			match(text);
-		}
+		if (cursor == 0)
+			return;
+		insert(NULL, nextrune(-1) - cursor);
 		break;
 	case XK_End:
-		if(!item)
-			return;
-		while(next) {
-			sel = curr = next;
+		if (text[cursor] != '\0') {
+			cursor = strlen(text);
+			break;
+		}
+		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:
-		ret = 1;
-		running = False;
-		break;
+		cleanup();
+		exit(1);
 	case XK_Home:
-		if(!item)
-			return;
-		sel = curr = item;
+		if (sel == matches) {
+			cursor = 0;
+			break;
+		}
+		sel = curr = matches;
 		calcoffsets();
 		break;
 	case XK_Left:
-		if(!(sel && sel->left))
+		if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
+			cursor = nextrune(-1);
+			break;
+		}
+		if (lines > 0)
 			return;
-		sel=sel->left;
-		if(sel->right == curr) {
+		/* fallthrough */
+	case XK_Up:
+		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:
-		if((e->state & ShiftMask) && text)
-			fprintf(stdout, "%s", text);
-		else if(sel)
-			fprintf(stdout, "%s", sel->text);
-		else if(text)
-			fprintf(stdout, "%s", text);
-		fflush(stdout);
-		running = False;
+	case XK_KP_Enter:
+		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(!(sel && sel->right))
+		if (text[cursor] != '\0') {
+			cursor = nextrune(+1);
+			break;
+		}
+		if (lines > 0)
 			return;
-		sel=sel->right;
-		if(sel == next) {
+		/* fallthrough */
+	case XK_Down:
+		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);
-		match(text);
+		strncpy(text, sel->text, sizeof text - 1);
+		text[sizeof text - 1] = '\0';
+		cursor = strlen(text);
+		match();
 		break;
 	}
 	drawmenu();
 }
 
-static char *
-readstdin(void) {
-	static char *maxname = NULL;
-	char *p, buf[1024];
-	unsigned int len = 0, max = 0;
-	Item *i, *new;
-
-	i = 0;
-	while(fgets(buf, sizeof buf, stdin)) {
-		len = strlen(buf);
-		if (buf[len - 1] == '\n')
-			buf[len - 1] = 0;
-		p = estrdup(buf);
-		if(max < len) {
-			maxname = p;
-			max = len;
-		}
-		new = emalloc(sizeof(Item));
-		new->next = new->left = new->right = NULL;
-		new->text = p;
-		if(!i)
-			allitems = new;
-		else 
-			i->next = new;
-		i = new;
-	}
-
-	return maxname;
+static void
+paste(void)
+{
+	char *p, *q;
+	int di;
+	unsigned long dl;
+	Atom da;
+
+	/* 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 : (ssize_t)strlen(p));
+	XFree(p);
+	drawmenu();
 }
 
 static void
-usage(void) {
-	eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-		"             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+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 (!(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);
 }
 
-int
-main(int argc, char *argv[]) {
-	Bool bottom = False;
-	char *font = FONT;
-	char *maxname;
-	char *normbg = NORMBGCOLOR;
-	char *normfg = NORMFGCOLOR;
-	char *selbg = SELBGCOLOR;
-	char *selfg = SELFGCOLOR;
-	int i, j;
-	Item *itm;
+static void
+run(void)
+{
 	XEvent ev;
-	XModifierKeymap *modmap;
-	XSetWindowAttributes wa;
 
-	/* command line args */
-	for(i = 1; i < argc; i++)
-		if(!strcmp(argv[i], "-b")) {
-			bottom = True;
-		}
-		else if(!strcmp(argv[i], "-fn")) {
-			if(++i < argc) font = argv[i];
-		}
-		else if(!strcmp(argv[i], "-nb")) {
-			if(++i < argc) normbg = argv[i];
-		}
-		else if(!strcmp(argv[i], "-nf")) {
-			if(++i < argc) normfg = argv[i];
-		}
-		else if(!strcmp(argv[i], "-p")) {
-			if(++i < argc) prompt = argv[i];
-		}
-		else if(!strcmp(argv[i], "-sb")) {
-			if(++i < argc) selbg = argv[i];
-		}
-		else if(!strcmp(argv[i], "-sf")) {
-			if(++i < argc) selfg = argv[i];
+	while (!XNextEvent(dpy, &ev)) {
+		if (XFilterEvent(&ev, win))
+			continue;
+		switch(ev.type) {
+		case Expose:
+			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)
+				paste();
+			break;
+		case VisibilityNotify:
+			if (ev.xvisibility.state != VisibilityUnobscured)
+				XRaiseWindow(dpy, win);
+			break;
 		}
-		else if(!strcmp(argv[i], "-v"))
-			eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
-		else
-			usage();
-	setlocale(LC_CTYPE, "");
-	dpy = XOpenDisplay(0);
-	if(!dpy)
-		eprint("dmenu: cannot open display\n");
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-	if(isatty(STDIN_FILENO)) {
-		maxname = readstdin();
-		running = grabkeyboard();
-	}
-	else { /* prevent keypress loss */
-		running = grabkeyboard();
-		maxname = readstdin();
 	}
-	/* 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);
+}
+
+static void
+setup(void)
+{
+	int x, y;
+	XSetWindowAttributes swa;
+	XIM xim;
+#ifdef XINERAMA
+	XineramaScreenInfo *info;
+	Window w, pw, dw, *dws;
+	XWindowAttributes wa;
+	int a, j, di, n, i = 0, area = 0;
+	unsigned int du;
+#endif
+
+	/* 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);
+
+	clip = XInternAtom(dpy, "CLIPBOARD",   False);
+	utf8 = XInternAtom(dpy, "UTF8_STRING", False);
+
+	/* calculate menu geometry */
+	bh = drw->fonts[0]->h + 2;
+	lines = MAX(lines, 0);
+	mh = (lines + 1) * bh;
+#ifdef XINERAMA
+	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
+#endif
+	{
+		x = 0;
+		y = topbar ? 0 : sh - mh;
+		mw = sw;
 	}
-	XFreeModifiermap(modmap);
-	/* style */
-	dc.norm[ColBG] = getcolor(normbg);
-	dc.norm[ColFG] = getcolor(normfg);
-	dc.sel[ColBG] = getcolor(selbg);
-	dc.sel[ColFG] = getcolor(selfg);
-	initfont(font);
-	/* menu window */
-	wa.override_redirect = 1;
-	wa.background_pixmap = ParentRelative;
-	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-	mw = DisplayWidth(dpy, screen);
-	mh = dc.font.height + 2;
-	win = XCreateWindow(dpy, root, 0,
-			bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
-			DefaultDepth(dpy, screen), CopyFromParent,
-			DefaultVisual(dpy, screen),
-			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-	/* pixmap */
-	dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
-	dc.gc = XCreateGC(dpy, root, 0, 0);
-	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-	if(!dc.font.set)
-		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-	if(maxname)
-		cmdw = textw(maxname);
-	if(cmdw > mw / 3)
-		cmdw = mw / 3;
-	if(prompt)
-		promptw = textw(prompt);
-	if(promptw > mw / 5)
-		promptw = mw / 5;
-	text[0] = 0;
-	match(text);
+	promptw = (prompt && *prompt) ? TEXTW(prompt) : 0;
+	inputw = MIN(inputw, mw/3);
+	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();
-	XSync(dpy, False);
+}
 
-	/* main event loop */
-	while(running && !XNextEvent(dpy, &ev))
-		switch (ev.type) {
-		default:	/* ignore all crap */
-			break;
-		case KeyPress:
-			kpress(&ev.xkey);
-			break;
-		case Expose:
-			if(ev.xexpose.count == 0)
-				drawmenu();
-			break;
-		}
+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, 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;
+			fstrstr = cistrstr;
+		} else if (i + 1 == argc)
+			usage();
+		/* 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], "-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 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"))  /* normal foreground color */
+			normfgcolor = argv[++i];
+		else if (!strcmp(argv[i], "-sb"))  /* selected background color */
+			selbgcolor = argv[++i];
+		else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
+			selfgcolor = argv[++i];
+		else
+			usage();
 
-	/* cleanup */
-	while(allitems) {
-		itm = allitems->next;
-		free(allitems->text);
-		free(allitems);
-		allitems = itm;
+	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();
 	}
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
-	else
-		XFreeFont(dpy, dc.font.xfont);
-	XFreePixmap(dpy, dc.drawable);
-	XFreeGC(dpy, dc.gc);
-	XDestroyWindow(dpy, win);
-	XUngrabKeyboard(dpy, CurrentTime);
-	XCloseDisplay(dpy);
-	return ret;
+	setup();
+	run();
+
+	return 1; /* unreachable */
 }