prepared dmenu-4.1 release

.hgtags

@@ -36,3 +36,7 @@ e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2
 9ab649b3b3e5bfccf1c8f352c59e5361e070a25f 3.4
 05e5bd706b3b3e61399d57c4bb43df296a20112d 3.5
 0bc2751d06e8b95e0138854c7815e154c5c3d990 3.6
+0508a3a6ee106f36d9b8ff07bb5b28584edfa89c 3.7
+644b0798fcccd570fd519899e1601c6857496b91 3.8
+21a1ed9a69b9541a355758a57103e294fb722c33 3.9
+78f9f72cc9c6bdb022ff8908486b61ef5e242aad 4.0

LICENSE

@@ -1,6 +1,10 @@
 MIT/X Consortium License
 
-© 2006-2008 Anselm R. Garbe <garbeam at gmail dot com>
+© 2010 Connor Lane Smith <cls@lubutu.com>
+© 2006-2010 Anselm R Garbe <anselm@garbe.us>
+© 2009 Gottox <gottox@s01.de>
+© 2009 Markus Schnalke <meillo@marmaro.de>
+© 2009 Evan Gates <evan.gates@gmail.com>
 © 2006-2008 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 © 2006-2007 Michał Janeczek <janeczek at gmail dot com>
 

Makefile

@@ -20,6 +20,10 @@ options:
 
 ${OBJ}: config.h config.mk
 
+config.h:
+	@echo creating $@ from config.def.h
+	@cp config.def.h $@
+
 dmenu: ${OBJ}
 	@echo CC -o $@
 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
@@ -31,7 +35,7 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp -R LICENSE Makefile README config.mk dmenu.1 config.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
+	@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
 	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
 	@gzip dmenu-${VERSION}.tar
 	@rm -rf dmenu-${VERSION}

config.def.h

@@ -6,9 +6,4 @@ static const char *normbgcolor = "#cccccc";
 static const char *normfgcolor = "#000000";
 static const char *selbgcolor  = "#0066ff";
 static const char *selfgcolor  = "#ffffff";
-
+static unsigned int spaceitem  = 30; /* px between menu items */
-static uint spaceitem          = 30; /* px between menu items */
-
-#ifdef XINERAMA
-static uint xidx               = 0;  /* Xinerama screen index to use */
-#endif

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 3.7
+VERSION = 4.1
 
 # Customize below to fit your system
 
@@ -19,7 +19,7 @@ INCS = -I. -I/usr/include -I${X11INC}
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
 

dmenu.1

@@ -5,6 +5,7 @@ dmenu \- dynamic menu
 .B dmenu
 .RB [ \-i ]
 .RB [ \-b ]
+.RB [ \-l " <lines>"]
 .RB [ \-fn " <font>"]
 .RB [ \-nb " <color>"]
 .RB [ \-nf " <color>"]
@@ -26,6 +27,10 @@ makes dmenu match menu entries case insensitively.
 .B \-b
 defines that dmenu appears at the bottom.
 .TP
+.B \-l <lines>
+activates vertical list mode.
+The given number of lines will be displayed. Window height will get adjusted.
+.TP
 .B \-fn <font>
 defines the font.
 .TP
@@ -57,7 +62,7 @@ dmenu is completely controlled by the keyboard. The following keys are recognize
 Appends the character to the text in the input field.  This works as a filter:
 only items containing this text will be displayed.
 .TP
-.B Left/Right (Mod1\-h/Mod1\-l)
+.B Left/Right (Up/Down) (Mod1\-h/Mod1\-l)
 Select the previous/next item.
 .TP
 .B PageUp/PageDown (Mod1\-k/Mod1\-j)

dmenu.c

@@ -15,18 +15,19 @@
 #endif
 
 /* macros */
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))
+#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define MIN(a, b)               ((a) < (b) ? (a) : (b))
+#define MAX(a, b)               ((a) > (b) ? (a) : (b))
 
 /* enums */
 enum { ColFG, ColBG, ColLast };
 
 /* typedefs */
-typedef unsigned int uint;
-typedef unsigned long ulong;
 typedef struct {
 	int x, y, w, h;
-	ulong norm[ColLast];
+	unsigned long norm[ColLast];
-	ulong sel[ColLast];
+	unsigned long sel[ColLast];
 	Drawable drawable;
 	GC gc;
 	struct {
@@ -41,20 +42,23 @@ typedef struct {
 typedef struct Item Item;
 struct Item {
 	char *text;
-	Item *next;		/* traverses all items */
+	Item *next;         /* traverses all items */
-	Item *left, *right;	/* traverses items matching current search pattern */
+	Item *left, *right; /* traverses items matching current search pattern */
 };
 
 /* forward declarations */
 static void appenditem(Item *i, Item **list, Item **last);
-static void calcoffsets(void);
+static void calcoffsetsh(void);
+static void calcoffsetsv(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);
+static void drawcursor(void);
 static void drawmenu(void);
-static void drawtext(const char *text, ulong col[ColLast]);
+static void drawmenuh(void);
-static void *emalloc(uint size);
+static void drawmenuv(void);
+static void drawtext(const char *text, unsigned long col[ColLast]);
 static void eprint(const char *errstr, ...);
-static ulong getcolor(const char *colstr);
+static unsigned long getcolor(const char *colstr);
 static Bool grabkeyboard(void);
 static void initfont(const char *fontstr);
 static void kpress(XKeyEvent * e);
@@ -62,7 +66,7 @@ static void match(char *pattern);
 static void readstdin(void);
 static void run(void);
 static void setup(Bool topbar);
-static int textnw(const char *text, uint len);
+static int textnw(const char *text, unsigned int len);
 static int textw(const char *text);
 
 #include "config.h"
@@ -74,21 +78,24 @@ static char text[4096];
 static int cmdw = 0;
 static int promptw = 0;
 static int ret = 0;
+static int cursor = 0;
 static int screen;
-static uint mw, mh;
+static unsigned int mw, mh;
-static uint numlockmask = 0;
+static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;
-static DC dc = {0};
+static DC dc;
-static Item *allitems = NULL;	/* first of all items */
+static Item *allitems = NULL;  /* first of all items */
-static Item *item = NULL;	/* first of pattern matching 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, win;
+static Window parent, win;
 static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
+static unsigned int lines = 0;
+static void (*calcoffsets)(void) = calcoffsetsh;
 
 void
 appenditem(Item *i, Item **list, Item **last) {
@@ -102,46 +109,62 @@ appenditem(Item *i, Item **list, Item **last) {
 }
 
 void
-calcoffsets(void) {
+calcoffsetsh(void) {
 	int tw;
-	uint w;
+	unsigned int w;
 
 	if(!curr)
 		return;
 	w = promptw + cmdw + 2 * spaceitem;
 	for(next = curr; next; next=next->right) {
-		tw = textw(next->text);
+		tw = MIN(textw(next->text), mw / 3);
-		if(tw > mw / 3)
-			tw = mw / 3;
 		w += tw;
 		if(w > mw)
 			break;
 	}
 	w = promptw + cmdw + 2 * spaceitem;
 	for(prev = curr; prev && prev->left; prev=prev->left) {
-		tw = textw(prev->left->text);
+		tw = MIN(textw(prev->left->text), mw / 3);
-		if(tw > mw / 3)
-			tw = mw / 3;
 		w += tw;
 		if(w > mw)
 			break;
 	}
 }
 
+void
+calcoffsetsv(void) {
+	static unsigned int h;
+
+	if(!curr)
+		return;
+	h = (dc.font.height + 2) * (lines + 1);
+	for(next = curr; next; next=next->right) {
+		h -= dc.font.height + 2;
+		if(h <= 0)
+			break;
+	}
+	h = (dc.font.height + 2) * (lines + 1);
+	for(prev = curr; prev && prev->left; prev=prev->left) {
+		h -= dc.font.height + 2;
+		if(h <= 0)
+			break;
+	}
+}
+
 char *
 cistrstr(const char *s, const char *sub) {
 	int c, csub;
-	uint len;
+	unsigned int len;
 
 	if(!sub)
 		return (char *)s;
-	if((c = *sub++) != 0) {
+	if((c = *sub++) != '\0') {
 		c = tolower(c);
 		len = strlen(sub);
 		do {
 			do {
-				if((csub = *s++) == 0)
+				if((csub = *s++) == '\0')
-					return (NULL);
+					return NULL;
 			}
 			while(tolower(csub) != c);
 		}
@@ -172,79 +195,96 @@ cleanup(void) {
 }
 
 void
-drawmenu(void) {
+drawcursor(void) {
-	Item *i;
+	XRectangle r = { dc.x, dc.y + 2, 1, dc.font.height - 2 };
 
+	r.x += textnw(text, cursor) + dc.font.height / 2;
+
+	XSetForeground(dpy, dc.gc, dc.norm[ColFG]);
+	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+}
+
+void
+drawmenu(void) {
 	dc.x = 0;
 	dc.y = 0;
 	dc.w = mw;
 	dc.h = mh;
 	drawtext(NULL, dc.norm);
 	/* print prompt? */
-	if(promptw) {
+	if(prompt) {
 		dc.w = promptw;
 		drawtext(prompt, dc.sel);
+		dc.x += dc.w;
 	}
-	dc.x += promptw;
+	dc.w = mw - dc.x;
-	dc.w = mw - promptw;
 	/* print command */
-	if(cmdw && item)
+	if(cmdw && item && lines == 0)
 		dc.w = cmdw;
 	drawtext(text[0] ? text : NULL, dc.norm);
-	dc.x += cmdw;
+	drawcursor();
 	if(curr) {
-		dc.w = spaceitem;
+		if(lines > 0)
-		drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
+			drawmenuv();
-		dc.x += dc.w;
+		else
-		/* determine maximum items */
+			drawmenuh();
-		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;
-		}
-		dc.x = mw - spaceitem;
-		dc.w = spaceitem;
-		drawtext(next ? ">" : NULL, dc.norm);
 	}
 	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
 	XFlush(dpy);
 }
 
 void
-drawtext(const char *text, ulong col[ColLast]) {
+drawmenuh(void) {
-	int x, y, w, h;
+	Item *i;
-	static char buf[256];
+
-	uint len, olen;
+	dc.x += cmdw;
+	dc.w = spaceitem;
+	drawtext(curr->left ? "<" : NULL, dc.norm);
+	dc.x += dc.w;
+	for(i = curr; i != next; i=i->right) {
+		dc.w = MIN(textw(i->text), mw / 3);
+		drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+		dc.x += dc.w;
+	}
+	dc.w = spaceitem;
+	dc.x = mw - dc.w;
+	drawtext(next ? ">" : NULL, dc.norm);
+}
+
+void
+drawmenuv(void) {
+	Item *i;
+
+	dc.w = mw - dc.x;
+	dc.y += dc.font.height + 2;
+	for(i = curr; i != next; i=i->right) {
+		drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+		dc.y += dc.font.height + 2;
+	}
+	drawtext(NULL, dc.norm);
+}
+
+void
+drawtext(const char *text, unsigned long col[ColLast]) {
+	char buf[256];
+	int i, x, y, h, 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 = strlen(text);
-	olen = len = strlen(text);
+	h = dc.font.height;
-	if(len >= sizeof buf)
+	y = dc.y + ((h+2) / 2) - (h / 2) + dc.font.ascent;
-		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)
+	for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
-		buf[--len] = 0;
+	if(!len)
-	if(len < olen) {
+		return;
-		if(len > 1)
+	memcpy(buf, text, len);
-			buf[len - 1] = '.';
+	if(len < olen)
-		if(len > 2)
+		for(i = len; i && i > len - 3; buf[--i] = '.');
-			buf[len - 2] = '.';
-		if(len > 3)
-			buf[len - 3] = '.';
-	}
-	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);
@@ -252,15 +292,6 @@ drawtext(const char *text, ulong col[ColLast]) {
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
-void *
-emalloc(uint size) {
-	void *res = malloc(size);
-
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", size);
-	return res;
-}
-
 void
 eprint(const char *errstr, ...) {
 	va_list ap;
@@ -271,7 +302,7 @@ eprint(const char *errstr, ...) {
 	exit(EXIT_FAILURE);
 }
 
-ulong
+unsigned long
 getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
@@ -283,10 +314,10 @@ getcolor(const char *colstr) {
 
 Bool
 grabkeyboard(void) {
-	uint len;
+	unsigned int len;
 
 	for(len = 1000; len; len--) {
-		if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+		if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime)
 		== GrabSuccess)
 			break;
 		usleep(1000);
@@ -302,30 +333,21 @@ initfont(const char *fontstr) {
 	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++) {
+		for(i = 0; i < n; i++) {
-			if(dc.font.ascent < (*xfonts)->ascent)
+			dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
-				dc.font.ascent = (*xfonts)->ascent;
+			dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent);
-			if(dc.font.descent < (*xfonts)->descent)
-				dc.font.descent = (*xfonts)->descent;
 			xfonts++;
 		}
 	}
 	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
 		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
@@ -337,14 +359,14 @@ initfont(const char *fontstr) {
 
 void
 kpress(XKeyEvent * e) {
-	char buf[32];
+	char buf[sizeof text];
 	int i, num;
-	uint len;
+	unsigned int len;
 	KeySym ksym;
 
 	len = strlen(text);
-	buf[0] = 0;
+	buf[0] = '\0';
-	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
+	num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
 	if(IsKeypadKey(ksym)) {
 		if(ksym == XK_KP_Enter)
 			ksym = XK_Return;
@@ -360,9 +382,18 @@ kpress(XKeyEvent * e) {
 		switch (ksym) {
 		default:	/* ignore other control sequences */
 			return;
-		case XK_bracketleft:
+		case XK_a:
+		case XK_A:
+			ksym = XK_Home;
+			break;
+		case XK_c:
+		case XK_C:
 			ksym = XK_Escape;
 			break;
+		case XK_e:
+		case XK_E:
+			ksym = XK_End;
+			break;
 		case XK_h:
 		case XK_H:
 			ksym = XK_BackSpace;
@@ -377,22 +408,21 @@ kpress(XKeyEvent * e) {
 			break;
 		case XK_u:
 		case XK_U:
-			text[0] = 0;
+			memmove(text, text + cursor, sizeof text - cursor + 1);
+			cursor = 0;
 			match(text);
-			drawmenu();
+			break;
-			return;
 		case XK_w:
 		case XK_W:
-			if(len) {
+			if(cursor > 0) {
-				i = len - 1;
+				i = cursor;
-				while(i >= 0 && text[i] == ' ')
+				while(i-- > 0 && text[i] == ' ');
-					text[i--] = 0;
+				while(i-- > 0 && text[i] != ' ');
-				while(i >= 0 && text[i] != ' ')
+				memmove(text + i + 1, text + cursor, sizeof text - cursor + 1);
-					text[i--] = 0;
+				cursor = i + 1;
 				match(text);
-				drawmenu();
 			}
-			return;
+			break;
 		}
 	}
 	if(CLEANMASK(e->state) & Mod1Mask) {
@@ -416,28 +446,49 @@ kpress(XKeyEvent * e) {
 		case XK_G:
 			ksym = XK_End;
 			break;
+		case XK_p:
+			{
+				FILE *fp;
+				char *s;
+				if(!(fp = (FILE*)popen("sselp", "r")))
+					eprint("dmenu: Could not popen sselp\n");
+				s = fgets(buf, sizeof buf, fp);
+				pclose(fp);
+				if(s == NULL)
+					return;
+			}
+			num = strlen(buf);
+			if(num && buf[num-1] == '\n')
+				buf[--num] = '\0';
+			break;
 		}
 	}
 	switch(ksym) {
 	default:
+		num = MIN(num, sizeof text - cursor);
 		if(num && !iscntrl((int) buf[0])) {
-			buf[num] = 0;
+			memmove(text + cursor + num, text + cursor, sizeof text - cursor - num);
-			if(len > 0)
+			memcpy(text + cursor, buf, num);
-				strncat(text, buf, sizeof text);
+			cursor+=num;
-			else
-				strncpy(text, buf, sizeof text);
 			match(text);
 		}
 		break;
 	case XK_BackSpace:
-		if(len) {
+		if(cursor > 0) {
-			text[--len] = 0;
+			memmove(text + cursor - 1, text + cursor, sizeof text - cursor + 1);
+			cursor--;
 			match(text);
 		}
 		break;
+	case XK_Delete:
+		memmove(text + cursor, text + cursor + 1, sizeof text - cursor);
+		match(text);
+		break;
 	case XK_End:
-		if(!item)
+		if(cursor < len) {
-			return;
+			cursor = len;
+			break;
+		}
 		while(next) {
 			sel = curr = next;
 			calcoffsets();
@@ -450,19 +501,26 @@ kpress(XKeyEvent * e) {
 		running = False;
 		break;
 	case XK_Home:
-		if(!item)
+		if(sel == item) {
-			return;
+			cursor = 0;
+			break;
+		}
 		sel = curr = item;
 		calcoffsets();
 		break;
 	case XK_Left:
-		if(!(sel && sel->left))
+	case XK_Up:
-			return;
+		if(sel && sel->left){
-		sel=sel->left;
+			sel=sel->left;
-		if(sel->right == curr) {
+			if(sel->right == curr) {
-			curr = prev;
+				curr = prev;
-			calcoffsets();
+				calcoffsets();
+			}
 		}
+		else if(cursor > 0)
+			cursor--;
+		else
+			return;
 		break;
 	case XK_Next:
 		if(!next)
@@ -477,28 +535,32 @@ kpress(XKeyEvent * e) {
 		calcoffsets();
 		break;
 	case XK_Return:
-		if((e->state & ShiftMask) && text)
+		if((e->state & ShiftMask) || !sel)
 			fprintf(stdout, "%s", text);
-		else if(sel)
+		else
 			fprintf(stdout, "%s", sel->text);
-		else if(text)
-			fprintf(stdout, "%s", text);
 		fflush(stdout);
 		running = False;
 		break;
 	case XK_Right:
-		if(!(sel && sel->right))
+	case XK_Down:
-			return;
+		if(cursor < len)
-		sel=sel->right;
+			cursor++;
-		if(sel == next) {
+		else if(sel && sel->right) {
-			curr = next;
+			sel=sel->right;
-			calcoffsets();
+			if(sel == next) {
+				curr = next;
+				calcoffsets();
+			}
 		}
+		else
+			return;
 		break;
 	case XK_Tab:
 		if(!sel)
 			return;
 		strncpy(text, sel->text, sizeof text);
+		cursor = strlen(text);
 		match(text);
 		break;
 	}
@@ -507,7 +569,7 @@ kpress(XKeyEvent * e) {
 
 void
 match(char *pattern) {
-	uint plen;
+	unsigned int plen;
 	Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
 	if(!pattern)
@@ -548,22 +610,23 @@ match(char *pattern) {
 
 void
 readstdin(void) {
-	char *p, buf[1024];
+	char *p, buf[sizeof text];
-	uint len = 0, max = 0;
+	unsigned int len = 0, max = 0;
 	Item *i, *new;
 
-	i = 0;
+	i = NULL;
 	while(fgets(buf, sizeof buf, stdin)) {
 		len = strlen(buf);
-		if (buf[len - 1] == '\n')
+		if(buf[len-1] == '\n')
-			buf[len - 1] = 0;
+			buf[--len] = '\0';
 		if(!(p = strdup(buf)))
-			eprint("fatal: could not strdup() %u bytes\n", strlen(buf));
+			eprint("fatal: could not strdup() %u bytes\n", len);
-		if(max < len) {
+		if(max < len || !maxname) {
 			maxname = p;
 			max = len;
 		}
-		new = emalloc(sizeof(Item));
+		if(!(new = (Item *)malloc(sizeof(Item))))
+			eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
 		new->next = new->left = new->right = NULL;
 		new->text = p;
 		if(!i)
@@ -590,17 +653,23 @@ run(void) {
 			if(ev.xexpose.count == 0)
 				drawmenu();
 			break;
+		case VisibilityNotify:
+			if (ev.xvisibility.state != VisibilityUnobscured)
+				XRaiseWindow(dpy, win);
+			break;
 		}
 }
 
 void
 setup(Bool topbar) {
 	int i, j, x, y;
-	XModifierKeymap *modmap;
-	XSetWindowAttributes wa;
 #if XINERAMA
+	int n;
 	XineramaScreenInfo *info = NULL;
 #endif
+	XModifierKeymap *modmap;
+	XSetWindowAttributes wa;
+	XWindowAttributes pwa;
 
 	/* init modifier map */
 	modmap = XGetModifierMapping(dpy);
@@ -620,54 +689,60 @@ setup(Bool topbar) {
 	initfont(font);
 
 	/* menu window */
-	wa.override_redirect = 1;
+	wa.override_redirect = True;
 	wa.background_pixmap = ParentRelative;
-	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
+	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
 
 	/* menu window geometry */
-	mh = dc.font.height + 2;
+	mh = (dc.font.height + 2) * (lines + 1);
 #if XINERAMA
-	if(XineramaIsActive(dpy)) {
+	if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
-		info = XineramaQueryScreens(dpy, &i);
+		i = 0;
-		x = info[xidx].x_org;
+		if(n > 1) {
-		y = topbar ? info[xidx].y_org : info[xidx].y_org + info[xidx].height - mh;
+			int di;
-		mw = info[xidx].width;
+			unsigned int dui;
+			Window dummy;
+			if(XQueryPointer(dpy, parent, &dummy, &dummy, &x, &y, &di, &di, &dui))
+				for(i = 0; i < n; i++)
+					if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+						break;
+		}
+		x = info[i].x_org;
+		y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh;
+		mw = info[i].width;
 		XFree(info);
 	}
 	else
 #endif
 	{
+		XGetWindowAttributes(dpy, parent, &pwa);
 		x = 0;
-		y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
+		y = topbar ? 0 : pwa.height - mh;
-		mw = DisplayWidth(dpy, screen);
+		mw = pwa.width;
 	}
 
-	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
+	win = XCreateWindow(dpy, parent, x, y, 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.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen));
-	dc.gc = XCreateGC(dpy, root, 0, 0);
+	dc.gc = XCreateGC(dpy, parent, 0, NULL);
 	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);
+		cmdw = MIN(textw(maxname), mw / 3);
-	if(cmdw > mw / 3)
-		cmdw = mw / 3;
 	if(prompt)
-		promptw = textw(prompt);
+		promptw = MIN(textw(prompt), mw / 5);
-	if(promptw > mw / 5)
+	text[0] = '\0';
-		promptw = mw / 5;
-	text[0] = 0;
 	match(text);
 	XMapRaised(dpy, win);
 }
 
 int
-textnw(const char *text, uint len) {
+textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -684,7 +759,7 @@ textw(const char *text) {
 
 int
 main(int argc, char *argv[]) {
-	uint i;
+	unsigned int i;
 	Bool topbar = True;
 
 	/* command line args */
@@ -695,6 +770,13 @@ main(int argc, char *argv[]) {
 		}
 		else if(!strcmp(argv[i], "-b"))
 			topbar = False;
+		else if(!strcmp(argv[i], "-e")) {
+			if(++i < argc) parent = atoi(argv[i]);
+		}
+		else if(!strcmp(argv[i], "-l")) {
+			calcoffsets = calcoffsetsv;
+			if(++i < argc) lines = atoi(argv[i]);
+		}
 		else if(!strcmp(argv[i], "-fn")) {
 			if(++i < argc) font = argv[i];
 		}
@@ -714,24 +796,20 @@ main(int argc, char *argv[]) {
 			if(++i < argc) selfgcolor = argv[i];
 		}
 		else if(!strcmp(argv[i], "-v"))
-			eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
+			eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
 		else
-			eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+			eprint("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
-			       "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+			       "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
-	setlocale(LC_CTYPE, "");
+	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-	if(!(dpy = XOpenDisplay(0)))
+		fprintf(stderr, "warning: no locale support\n");
+	if(!(dpy = XOpenDisplay(NULL)))
 		eprint("dmenu: cannot open display\n");
 	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
+	if(!parent)
+		parent = RootWindow(dpy, screen);
 
-	if(isatty(STDIN_FILENO)) {
+	readstdin();
-		readstdin();
+	running = grabkeyboard();
-		running = grabkeyboard();
-	}
-	else { /* prevent keypress loss */
-		running = grabkeyboard();
-		readstdin();
-	}
 
 	setup(topbar);
 	drawmenu();