changed text in dmenu manpage

.hgtags

@@ -2,3 +2,15 @@ fcc8a282cb52c6a9343b461026b386825590cd31 0.1
 656be0f47df545dfdd2e1e0663663b8b1b26f031 0.2
 d352e9dc112ee96aa5cad961a0ed880ae9ce7276 0.3
 7acf0dde1120542917bae12e0e42293f9d2cc899 0.4
+4a0ecd881c4fc15de4a0bebd79308b064be020ef 0.5
+25f679fb19686140a907684ffcb423b9e9d44b53 0.6
+5fc20d7158bd16b4d5f8d1c25e177680b6d54252 0.7
+409667a57221f7e50ba8b5248f638915cd61b366 0.8
+d046c818ea467555cc338751c9bf3024609f1f12 0.9
+9e11140d4cc3eecac3b0ab752f91528fd5e04be8 1.0
+e8c1e9733752db12f2dbd1fa93c46f5806242ba9 1.1
+bee7fe6d1189174d0204ca3195b83cdc1bb4f82e 1.2
+2eb9997be51cb1b11a8900728ccc0904f9371157 1.3
+df3fbb050004c544d14e43c36f6a94cca6ed4a69 1.4
+e071fb045bd9e8574947acff7196360bc0270e68 1.5
+dcc5427f99f51a978386a0dd770467cd911ac84b 1.6

Makefile

@@ -19,11 +19,7 @@ options:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: dmenu.h config.h config.mk
-
-config.h:
-	@echo creating $@ from config.default.h
-	@cp config.default.h $@
+${OBJ}: dmenu.h config.mk
 
 dmenu: ${OBJ}
 	@echo LD $@
@@ -37,8 +33,7 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp -R LICENSE Makefile README config.*.h config.mk \
-		dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
+	@cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
 	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
 	@gzip dmenu-${VERSION}.tar
 	@rm -rf dmenu-${VERSION}

README

@@ -1,6 +1,6 @@
 dmenu - dynamic menu
---------------------
-dmenu is a generic, highly customizable, and efficient menu for X. 
+====================
+dmenu is a generic and efficient menu for X. 
 
 
 Requirements
@@ -22,9 +22,3 @@ necessary as root):
 Running dmenu
 -------------
 See the man page for details.
-
-
-Configuration
--------------
-The configuration of dmenu is done by creating a custom config.h
-and (re)compiling the source code.

config.arg.h

@@ -1,9 +0,0 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
-#define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
-#define BGCOLOR			"#666699"
-#define FGCOLOR			"#eeeeee"
-#define BORDERCOLOR		"#9999CC"

config.default.h

@@ -1,9 +0,0 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
-#define FONT			"fixed"
-#define BGCOLOR			"#666699"
-#define FGCOLOR			"#eeeeee"
-#define BORDERCOLOR		"#9999CC"

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 0.5
+VERSION = 1.7
 
 # Customize below to fit your system
 

dmenu.1

@@ -3,62 +3,88 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
+.RB [ \-font " <name>"]
+.RB [ \-normbg " <color>"]
+.RB [ \-normfg " <color>"]
+.RB [ \-selbg " <color>"]
+.RB [ \-selfg " <color>"]
+.RB [ \-p " <prompt>"]
+.RB [ \-t " <seconds>"]
 .RB [ \-v ]
 .SH DESCRIPTION
 .SS Overview
-.B dmenu
-is a generic, highly customizable, and efficient menu for X,
-originally designed for
+dmenu is a generic menu for X, originally designed for
 .BR dwm (1).
-It supports arbitrary, user defined menu contents.
+It manages huge amounts (up to 10.000 and more) of user defined menu items
+efficiently.
 .SS Options
 .TP
-.B \-v
-prints version information to stdout, then exits.
-.SH USAGE
-.B dmenu
-reads a list of newline-separated items from stdin and creates a menu.
-When the user selects an item or enters any text and presses Return, his choice
-is printed to stdout and
-.B dmenu
-terminates.
-.B dmenu
-is completely controlled by the keyboard.  The following keys are recognized:
+.B \-font <name>
+defines the font.
 .TP
-Any printable character
+.B \-normbg <color>
+defines the normal background color (#RGB, #RRGGBB, and color names are supported).
+.TP
+.B \-normfg <color>
+defines the normal foreground color (#RGB, #RRGGBB, and color names are supported).
+.TP
+.B \-selbg <color>
+defines the selected background color (#RGB, #RRGGBB, and color names are supported).
+.TP
+.B \-selfg <color>
+defines the selected foreground color (#RGB, #RRGGBB, and color names are supported).
+.TP
+.B \-p <prompt>
+defines a prompt to be displayed before the input area.
+.TP
+.B \-t <seconds>
+defines the seconds to wait for standard input, before exiting (default is 3).
+.TP
+.B \-v
+prints version information to standard output, then exits.
+.SH USAGE
+dmenu reads a list of newline-separated items from standard input and creates a
+menu.  When the user selects an item or enters any text and presses Return, his/her
+choice is printed to standard output and dmenu terminates.
+.P
+dmenu is completely controlled by the keyboard. The following keys are recognized:
+.TP
+.B Any printable character
 Appends the character to the text in the input field.  This works as a filter:
 only items containing this text will be displayed.
 .TP
-Left/Right
+.B Left/Right
 Select the previous/next item.
 .TP
-Tab
+.B PageUp/PageDown
+Select the first item of the previous/next 'page' of items.
+.TP
+.B Home/End
+Select the first/last item.
+.TP
+.B Tab
 Copy the selected item to the input field.
 .TP
-Return
-Confirm selection and quit (print the selected item to stdout).
+.B Return
+Confirm selection and quit (print the selected item to standard output). Returns
+.B 0
+on termination.
 .TP
-Shift-Return
-Confirm selection and quit (print the text in the input field to stdout).
+.B Shift-Return
+Confirm selection and quit (print the text in the input field to standard output).
+Returns
+.B 0
+on termination.
 .TP
-Escape
-Quit without selecting an item.
+.B Escape
+Quit without selecting an item. Returns
+.B 1
+on termination.
 .TP
-Backspace (Control-h)
+.B Backspace (Control-h)
 Remove enough characters from the input field to change its filtering effect.
 .TP
-Control-u
+.B Control-u
 Remove all characters from the input field.
-.P
-.B dmenu
-returns
-.B 0
-if Return is pressed on termination,
-.B 1
-if Escape is pressed.
-.SH CUSTOMIZATION
-.B dmenu
-is customized by creating a custom config.h and (re)compiling the source
-code. This keeps it fast, secure and simple.
 .SH SEE ALSO
 .BR dwm (1)

dmenu.h

@@ -1,14 +1,19 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
-#include "config.h"
 #include <X11/Xlib.h>
-#include <X11/Xlocale.h>
 
+#define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
+#define NORMBGCOLOR		"#333366"
+#define NORMFGCOLOR		"#cccccc"
+#define SELBGCOLOR		"#666699"
+#define SELFGCOLOR		"#eeeeee"
 #define SPACE			30 /* px */
 
+/* color */
+enum { ColFG, ColBG, ColLast };
+
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 
@@ -20,27 +25,27 @@ struct Fnt {
 	int height;
 };
 
-struct DC { /* draw context */
+struct DC {
 	int x, y, w, h;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
 	Drawable drawable;
 	Fnt font;
 	GC gc;
-};
+}; /* draw context */
 
 extern int screen;
 extern Display *dpy;
-extern DC dc;
+extern DC dc;			/* global drawing context */
 
 /* draw.c */
-extern void drawtext(const char *text, Bool invert, Bool border);
-extern unsigned long getcolor(const char *colstr);
-extern void setfont(const char *fontstr);
-extern unsigned int textw(const char *text);
+extern void drawtext(const char *text,
+			unsigned long col[ColLast]);	/* draws text with the defined color tuple */
+extern unsigned long getcolor(const char *colstr);	/* returns color of colstr */
+extern void setfont(const char *fontstr);		/* sets global font */
+extern unsigned int textw(const char *text);		/* returns width of text in px */
 
 /* util.c */
-extern void *emalloc(unsigned int size);
-extern void eprint(const char *errstr, ...);
-extern char *estrdup(const char *str);
+extern void *emalloc(unsigned int size);		/* allocates memory, exits on error */
+extern void eprint(const char *errstr, ...);		/* prints errstr and exits with 1 */
+extern char *estrdup(const char *str);			/* duplicates str, exits on allocation error */

draw.c

@@ -1,17 +1,14 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dmenu.h"
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
 
 /* static */
 
 static unsigned int
-textnw(const char *text, unsigned int len)
-{
+textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -24,47 +21,26 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
-drawtext(const char *text, Bool invert, Bool border)
-{
+drawtext(const char *text, unsigned long col[ColLast]) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
 	XGCValues gcv;
-	XPoint points[5];
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-
-	w = 0;
-	if(border) {
-		points[0].x = dc.x;
-		points[0].y = dc.y;
-		points[1].x = dc.w - 1;
-		points[1].y = 0;
-		points[2].x = 0;
-		points[2].y = dc.h - 1;
-		points[3].x = -(dc.w - 1);
-		points[3].y = 0;
-		points[4].x = 0;
-		points[4].y = -(dc.h - 1);
-		XSetForeground(dpy, dc.gc, dc.border);
-		XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-	}
-
 	if(!text)
 		return;
-
+	w = 0;
 	olen = len = strlen(text);
-	if(len >= sizeof(buf))
-		len = sizeof(buf) - 1;
+	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;
@@ -76,57 +52,46 @@ drawtext(const char *text, Bool invert, Bool border)
 		if(len > 3)
 			buf[len - 3] = '.';
 	}
-
 	if(w > dc.w)
 		return; /* too long */
-
-	gcv.foreground = invert ? dc.bg : dc.fg;
-	gcv.background = invert ? dc.fg : dc.bg;
+	gcv.foreground = col[ColFG];
 	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
+		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc,
 				x, y, buf, len);
 	}
 	else {
 		gcv.font = dc.font.xfont->fid;
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
-		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
 }
 
 unsigned long
-getcolor(const char *colstr)
-{
+getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+		eprint("error, cannot allocate color '%s'\n", colstr);
 	return color.pixel;
 }
 
 void
-setfont(const char *fontstr)
-{
-	char **missing, *def;
+setfont(const char *fontstr) {
+	char *def, **missing;
 	int i, n;
 
 	missing = NULL;
-	setlocale(LC_ALL, "");
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-	if(missing) {
+	if(missing)
 		XFreeStringList(missing);
-		if(dc.font.set) {
-			XFreeFontSet(dpy, dc.font.set);
-			dc.font.set = NULL;
-		}
-	}
 	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);
@@ -142,11 +107,8 @@ setfont(const char *fontstr)
 		if(dc.font.xfont)
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
-		dc.font.xfont = XLoadQueryFont(dpy, fontstr);
-		if (!dc.font.xfont)
-			dc.font.xfont = XLoadQueryFont(dpy, "fixed");
-		if (!dc.font.xfont)
-			eprint("error, cannot init 'fixed' font\n");
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+			eprint("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
 	}
@@ -154,7 +116,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
-textw(const char *text)
-{
+textw(const char *text) {
 	return textnw(text, strlen(text)) + dc.font.height;
 }

main.c

@@ -1,17 +1,17 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * See LICENSE file for license details.
  */
-
 #include "dmenu.h"
 
 #include <ctype.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <X11/cursorfont.h>
+#include <sys/select.h>
+#include <sys/time.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
@@ -25,10 +25,12 @@ struct Item {
 /* static */
 
 static char text[4096];
+static char *prompt = NULL;
 static int mx, my, mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
+static unsigned int promptw = 0;
 static Bool running = True;
 static Item *allitems = NULL;	/* first of all items */
 static Item *item = NULL;	/* first of pattern matching items */
@@ -40,14 +42,12 @@ static Window root;
 static Window win;
 
 static void
-calcoffsets()
-{
+calcoffsets(void) {
 	unsigned int tw, w;
 
 	if(!curr)
 		return;
-
-	w = cmdw + 2 * SPACE;
+	w = promptw + cmdw + 2 * SPACE;
 	for(next = curr; next; next=next->right) {
 		tw = textw(next->text);
 		if(tw > mw / 3)
@@ -56,8 +56,7 @@ calcoffsets()
 		if(w > mw)
 			break;
 	}
-
-	w = cmdw + 2 * SPACE;
+	w = promptw + cmdw + 2 * SPACE;
 	for(prev = curr; prev && prev->left; prev=prev->left) {
 		tw = textw(prev->left->text);
 		if(tw > mw / 3)
@@ -69,57 +68,56 @@ calcoffsets()
 }
 
 static void
-drawmenu()
-{
+drawmenu(void) {
 	Item *i;
 
 	dc.x = 0;
 	dc.y = 0;
 	dc.w = mw;
 	dc.h = mh;
-	drawtext(NULL, False, False);
-
+	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, False, False);
+	drawtext(text[0] ? text : NULL, dc.norm);
 	dc.x += cmdw;
-
 	if(curr) {
 		dc.w = SPACE;
-		drawtext((curr && curr->left) ? "<" : NULL, False, False);
+		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, sel == i);
+			drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
 			dc.x += dc.w;
 		}
-
 		dc.x = mw - SPACE;
 		dc.w = SPACE;
-		drawtext(next ? ">" : NULL, False, False);
+		drawtext(next ? ">" : NULL, dc.norm);
 	}
 	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
 	XFlush(dpy);
 }
 
 static void
-match(char *pattern)
-{
+match(char *pattern) {
 	unsigned int plen;
 	Item *i, *j;
 
 	if(!pattern)
 		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)
@@ -143,14 +141,12 @@ match(char *pattern)
 			j = i;
 			nitem++;
 		}
-
 	curr = prev = next = sel = item;
 	calcoffsets();
 }
 
 static void
-kpress(XKeyEvent * e)
-{
+kpress(XKeyEvent * e) {
 	char buf[32];
 	int num, prev_nitem;
 	unsigned int i, len;
@@ -158,13 +154,11 @@ kpress(XKeyEvent * e)
 
 	len = strlen(text);
 	buf[0] = 0;
-	num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
-
+	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
 	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 (ksym) {
@@ -185,46 +179,16 @@ kpress(XKeyEvent * e)
 		}
 	}
 	switch(ksym) {
-	case XK_Left:
-		if(!(sel && sel->left))
-			return;
-		sel=sel->left;
-		if(sel->right == curr) {
-			curr = prev;
-			calcoffsets();
-		}
-		break;
-	case XK_Tab:
-		if(!sel)
-			return;
-		strncpy(text, sel->text, sizeof(text));
+	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);
-		break;
-	case XK_Right:
-		if(!(sel && sel->right))
-			return;
-		sel=sel->right;
-		if(sel == next) {
-			curr = next;
-			calcoffsets();
 		}
 		break;
-	case XK_Return:
-		if(e->state & ShiftMask) {
-			if(text)
-				fprintf(stdout, "%s", text);
-		}
-		else if(sel)
-			fprintf(stdout, "%s", sel->text);
-		else if(text)
-			fprintf(stdout, "%s", text);
-		fflush(stdout);
-		running = False;
-		break;
-	case XK_Escape:
-		ret = 1;
-		running = False;
-		break;
 	case XK_BackSpace:
 		if((i = len)) {
 			prev_nitem = nitem;
@@ -235,29 +199,81 @@ kpress(XKeyEvent * e)
 			match(text);
 		}
 		break;
-	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);
+	case XK_End:
+		while(next) {
+			sel = curr = next;
+			calcoffsets();
 		}
+		while(sel->right)
+			sel = sel->right;
+		break;
+	case XK_Escape:
+		ret = 1;
+		running = False;
+		break;
+	case XK_Home:
+		sel = curr = item;
+		calcoffsets();
+		break;
+	case XK_Left:
+		if(!(sel && sel->left))
+			return;
+		sel=sel->left;
+		if(sel->right == curr) {
+			curr = prev;
+			calcoffsets();
+		}
+		break;
+	case XK_Next:
+		if(next) {
+			sel = curr = next;
+			calcoffsets();
+		}
+		break;
+	case XK_Prior:
+		if(prev) {
+			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;
+		break;
+	case XK_Right:
+		if(!(sel && sel->right))
+			return;
+		sel=sel->right;
+		if(sel == next) {
+			curr = next;
+			calcoffsets();
+		}
+		break;
+	case XK_Tab:
+		if(!sel)
+			return;
+		strncpy(text, sel->text, sizeof text);
+		match(text);
+		break;
 	}
 	drawmenu();
 }
 
 static char *
-readstdin()
-{
+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)) {
+	while(fgets(buf, sizeof buf, stdin)) {
 		len = strlen(buf);
 		if (buf[len - 1] == '\n')
 			buf[len - 1] = 0;
@@ -266,7 +282,6 @@ readstdin()
 			maxname = p;
 			max = len;
 		}
-
 		new = emalloc(sizeof(Item));
 		new->next = new->left = new->right = NULL;
 		new->text = p;
@@ -287,63 +302,100 @@ Display *dpy;
 DC dc = {0};
 
 int
-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
+	char *font = FONT;
 	char *maxname;
-	Item *i;
+	char *normbg = NORMBGCOLOR;
+	char *normfg = NORMFGCOLOR;
+	char *selbg = SELBGCOLOR;
+	char *selfg = SELFGCOLOR;
+	fd_set rd;
+	int i;
+	struct timeval timeout;
+	Item *itm;
 	XEvent ev;
 	XSetWindowAttributes wa;
 
-	if(argc == 2 && !strncmp("-v", argv[1], 3)) {
+	timeout.tv_usec = 0;
+	timeout.tv_sec = 3;
+	/* command line args */
+	for(i = 1; i < argc; i++)
+		if(!strncmp(argv[i], "-font", 6)) {
+			if(++i < argc) font = argv[i];
+		}
+		else if(!strncmp(argv[i], "-normbg", 8)) {
+			if(++i < argc) normbg = argv[i];
+		}
+		else if(!strncmp(argv[i], "-normfg", 8)) {
+			if(++i < argc) normfg = argv[i];
+		}
+		else if(!strncmp(argv[i], "-selbg", 7)) {
+			if(++i < argc) selbg = argv[i];
+		}
+		else if(!strncmp(argv[i], "-selfg", 7)) {
+			if(++i < argc) selfg = argv[i];
+		}
+		else if(!strncmp(argv[i], "-p", 3)) {
+			if(++i < argc) prompt = argv[i];
+		}
+		else if(!strncmp(argv[i], "-t", 3)) {
+			if(++i < argc) timeout.tv_sec = atoi(argv[i]);
+		}
+		else if(!strncmp(argv[i], "-v", 3)) {
 			fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
 			exit(EXIT_SUCCESS);
 		}
-	else if(argc != 1)
-		eprint("usage: dmenu [-v]\n");
-
+		else
+			eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-p <prompt>] [-t <seconds>] [-v]\n", stdout);
+	setlocale(LC_CTYPE, "");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
 		eprint("dmenu: cannot open display\n");
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 
-	maxname = readstdin();
-
-	/* grab as early as possible, but after reading all items!!! */
+	/* Note, the select() construction allows to grab all keypresses as
+	 * early as possible, to not loose them. But if there is no standard
+	 * input supplied, we will make sure to exit after MAX_WAIT_STDIN
+	 * seconds. This is convenience behavior for rapid typers.
+	 */ 
 	while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
 			 GrabModeAsync, CurrentTime) != GrabSuccess)
 		usleep(1000);
-
+	FD_ZERO(&rd);
+	FD_SET(STDIN_FILENO, &rd);
+	if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
+		goto UninitializedEnd;
+	maxname = readstdin();
 	/* style */
-	dc.bg = getcolor(BGCOLOR);
-	dc.fg = getcolor(FGCOLOR);
-	dc.border = getcolor(BORDERCOLOR);
-	setfont(FONT);
-
+	dc.norm[ColBG] = getcolor(normbg);
+	dc.norm[ColFG] = getcolor(normfg);
+	dc.sel[ColBG] = getcolor(selbg);
+	dc.sel[ColFG] = getcolor(selfg);
+	setfont(font);
+	/* menu window */
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-
 	mx = my = 0;
 	mw = DisplayWidth(dpy, screen);
-	mh = dc.font.height + 4;
-
+	mh = dc.font.height + 2;
 	win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-	XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
-
 	/* 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(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);
 	XMapRaised(dpy, win);
@@ -351,8 +403,10 @@ main(int argc, char *argv[])
 	XSync(dpy, False);
 
 	/* main event loop */
-	while(running && !XNextEvent(dpy, &ev)) {
+	while(running && !XNextEvent(dpy, &ev))
 		switch (ev.type) {
+		default:	/* ignore all crap */
+			break;
 		case KeyPress:
 			kpress(&ev.xkey);
 			break;
@@ -360,17 +414,14 @@ main(int argc, char *argv[])
 			if(ev.xexpose.count == 0)
 				drawmenu();
 			break;
-		default:
-			break;
-		}
 		}
 
-	XUngrabKeyboard(dpy, CurrentTime);
+	/* cleanup */
 	while(allitems) {
-		i = allitems->next;
+		itm = allitems->next;
 		free(allitems->text);
 		free(allitems);
-		allitems = i;
+		allitems = itm;
 	}
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
@@ -379,7 +430,8 @@ main(int argc, char *argv[])
 	XFreePixmap(dpy, dc.drawable);
 	XFreeGC(dpy, dc.gc);
 	XDestroyWindow(dpy, win);
+UninitializedEnd:
+	XUngrabKeyboard(dpy, CurrentTime);
 	XCloseDisplay(dpy);
-
 	return ret;
 }

util.c

@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dmenu.h"
@@ -10,28 +9,17 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-/* static */
-
-static void
-badmalloc(unsigned int size)
-{
-	eprint("fatal: could not malloc() %u bytes\n", size);
-}
-
-/* extern */
-
 void *
-emalloc(unsigned int size)
-{
+emalloc(unsigned int size) {
 	void *res = malloc(size);
+
 	if(!res)
-		badmalloc(size);
+		eprint("fatal: could not malloc() %u bytes\n", size);
 	return res;
 }
 
 void
-eprint(const char *errstr, ...)
-{
+eprint(const char *errstr, ...) {
 	va_list ap;
 
 	va_start(ap, errstr);
@@ -41,10 +29,10 @@ eprint(const char *errstr, ...)
 }
 
 char *
-estrdup(const char *str)
-{
+estrdup(const char *str) {
 	void *res = strdup(str);
+
 	if(!res)
-		badmalloc(strlen(str));
+		eprint("fatal: could not malloc() %u bytes\n", strlen(str));
 	return res;
 }