made function signatures more consistent to my coding style

.hgtags

@@ -1,3 +1,9 @@
 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

Makefile

@@ -19,7 +19,7 @@ options:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: dmenu.h config.h
+${OBJ}: dmenu.h config.h config.mk
 
 config.h:
 	@echo creating $@ from config.default.h

README

@@ -1,7 +1,6 @@
 dmenu - dynamic menu
 --------------------
-dmenu is a generic, highly customizable, and efficient menu for the
+dmenu is a generic and efficient menu for X. 
-X Window System.
 
 
 Requirements

config.arg.h

@@ -4,6 +4,8 @@
  */
 
 #define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
-#define BGCOLOR			"#0d121d"
+#define SELBGCOLOR		"#333366"
-#define FGCOLOR			"#eeeeee"
+#define SELFGCOLOR		"#eeeeee"
-#define BORDERCOLOR		"#3f484d"
+#define NORMBGCOLOR		"#333333"
+#define NORMFGCOLOR		"#dddddd"
+#define STDIN_TIMEOUT		3 /* seconds */

config.default.h

@@ -4,6 +4,8 @@
  */
 
 #define FONT			"fixed"
-#define BGCOLOR			"#666699"
+#define SELBGCOLOR		"#666699"
-#define FGCOLOR			"#eeeeee"
+#define SELFGCOLOR		"#eeeeee"
-#define BORDERCOLOR		"#9999CC"
+#define NORMBGCOLOR		"#333366"
+#define NORMFGCOLOR		"#cccccc"
+#define STDIN_TIMEOUT		3 /* seconds */

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 0.4
+VERSION = 1.0
 
 # Customize below to fit your system
 
@@ -11,7 +11,7 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # includes and libs
-INCS = -I/usr/lib -I${X11INC}
+INCS = -I. -I/usr/include -I${X11INC}
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 
 # flags

dmenu.1

@@ -6,59 +6,54 @@ dmenu \- dynamic menu
 .RB [ \-v ]
 .SH DESCRIPTION
 .SS Overview
-.B dmenu
+dmenu is a generic menu for X, originally designed for
-is a generic, highly customizable, and efficient menu for the X Window System,
-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.
+prints version information to standard output, then exits.
 .SH USAGE
-.B dmenu
+dmenu reads a list of newline-separated items from standard input and creates a
-reads a list of newline-separated items from stdin and creates a menu.
+menu.  When the user selects an item or enters any text and presses Return, his
-When the user selects an item or enters any text and presses Return, his choice
+choice is printed to standard output and dmenu terminates.
-is printed to stdout and
+.P
-.B dmenu
+dmenu is completely controlled by the keyboard. The following keys are recognized:
-terminates.
-.B dmenu
-is completely controlled by the keyboard.  The following keys are recognized:
 .TP
-Any printable character
+.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 Tab
 Copy the selected item to the input field.
 .TP
-Return
+.B Return
-Confirm selection and quit (print the selected item to stdout).
+Confirm selection and quit (print the selected item to standard output). Returns
+.B 0
+on termination.
 .TP
-Shift-Return
+.B Shift-Return
-Confirm selection and quit (print the text in the input field to stdout).
+Confirm selection and quit (print the text in the input field to standard output).
+Returns
+.B 0
+on termination.
 .TP
-Escape
+.B Escape
-Quit without selecting an item.
+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
+dmenu is customized by creating a custom config.h and (re)compiling the source
-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

@@ -9,6 +9,9 @@
 
 #define SPACE		30 /* px */
 
+/* color */
+enum { ColFG, ColBG, ColLast };
+
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 
@@ -20,27 +23,27 @@ struct Fnt {
 	int height;
 };
 
-struct DC { /* draw context */
+struct DC {
 	int x, y, w, h;
-	unsigned long bg;
+	unsigned long norm[ColLast];
-	unsigned long fg;
+	unsigned long sel[ColLast];
-	unsigned long border;
 	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 void drawtext(const char *text,
-extern unsigned long getcolor(const char *colstr);
+			unsigned long col[ColLast]);	/* draws text with the defined color tuple */
-extern void setfont(const char *fontstr);
+extern unsigned long getcolor(const char *colstr);	/* returns color of colstr */
-extern unsigned int textw(const char *text);
+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 *emalloc(unsigned int size);		/* allocates memory, exits on error */
-extern void eprint(const char *errstr, ...);
+extern void eprint(const char *errstr, ...);		/* prints errstr and exits with 1 */
-extern char *estrdup(const char *str);
+extern char *estrdup(const char *str);			/* duplicates str, exits on allocation error */

draw.c

@@ -10,8 +10,7 @@
 /* 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,38 +23,20 @@ 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) {
-		XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-		XSetForeground(dpy, dc.gc, dc.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);
-		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;
@@ -81,23 +62,21 @@ drawtext(const char *text, Bool invert, Bool border)
 	if(w > dc.w)
 		return; /* too long */
 
-	gcv.foreground = invert ? dc.bg : dc.fg;
+	gcv.foreground = col[ColFG];
-	gcv.background = invert ? dc.fg : dc.bg;
 	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
+		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
+		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);
+		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
-		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+		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;
 
@@ -106,8 +85,7 @@ getcolor(const char *colstr)
 }
 
 void
-setfont(const char *fontstr)
+setfont(const char *fontstr) {
-{
 	char **missing, *def;
 	int i, n;
 
@@ -155,7 +133,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

@@ -11,6 +11,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/select.h>
+#include <sys/time.h>
 #include <X11/cursorfont.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
@@ -29,7 +31,7 @@ static int mx, my, mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
-static Bool done = False;
+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;
@@ -40,8 +42,7 @@ static Window root;
 static Window win;
 
 static void
-calcoffsets()
+calcoffsets() {
-{
 	unsigned int tw, w;
 
 	if(!curr)
@@ -69,25 +70,24 @@ calcoffsets()
 }
 
 static void
-drawmenu()
+drawmenu() {
-{
 	Item *i;
 
 	dc.x = 0;
 	dc.y = 0;
 	dc.w = mw;
 	dc.h = mh;
-	drawtext(NULL, False, False);
+	drawtext(NULL, dc.norm);
 
 	/* 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 */
@@ -95,21 +95,20 @@ drawmenu()
 			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;
 
@@ -149,8 +148,7 @@ match(char *pattern)
 }
 
 static void
-kpress(XKeyEvent * e)
+kpress(XKeyEvent * e) {
-{
 	char buf[32];
 	int num, prev_nitem;
 	unsigned int i, len;
@@ -219,11 +217,11 @@ kpress(XKeyEvent * e)
 		else if(text)
 			fprintf(stdout, "%s", text);
 		fflush(stdout);
-		done = True;
+		running = False;
 		break;
 	case XK_Escape:
 		ret = 1;
-		done = True;
+		running = False;
 		break;
 	case XK_BackSpace:
 		if((i = len)) {
@@ -249,8 +247,7 @@ kpress(XKeyEvent * e)
 }
 
 static char *
-readstdin()
+readstdin() {
-{
 	static char *maxname = NULL;
 	char *p, buf[1024];
 	unsigned int len = 0, max = 0;
@@ -287,9 +284,11 @@ Display *dpy;
 DC dc = {0};
 
 int
-main(int argc, char *argv[])
+main(int argc, char *argv[]) {
-{
 	char *maxname;
+	fd_set rd;
+	struct timeval timeout;
+	Item *i;
 	XEvent ev;
 	XSetWindowAttributes wa;
 
@@ -306,17 +305,28 @@ main(int argc, char *argv[])
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 
-	maxname = readstdin();
+	/* Note, the select() construction allows to grab all keypresses as
-
+	 * early as possible, to not loose them. But if there is no standard
-	/* grab as early as possible, but after reading all items!!! */
+	 * 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);
 
+	timeout.tv_usec = 0;
+	timeout.tv_sec = STDIN_TIMEOUT;
+	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.sel[ColBG] = getcolor(SELBGCOLOR);
-	dc.fg = getcolor(FGCOLOR);
+	dc.sel[ColFG] = getcolor(SELFGCOLOR);
-	dc.border = getcolor(BORDERCOLOR);
+	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
 	setfont(FONT);
 
 	wa.override_redirect = 1;
@@ -325,7 +335,7 @@ main(int argc, char *argv[])
 
 	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,
@@ -336,6 +346,7 @@ main(int argc, char *argv[])
 	/* 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);
@@ -349,8 +360,10 @@ main(int argc, char *argv[])
 	XSync(dpy, False);
 
 	/* main event loop */
-	while(!done && !XNextEvent(dpy, &ev)) {
+	while(running && !XNextEvent(dpy, &ev)) {
 		switch (ev.type) {
+		default:	/* ignore all crap */
+			break;
 		case KeyPress:
 			kpress(&ev.xkey);
 			break;
@@ -358,15 +371,24 @@ main(int argc, char *argv[])
 			if(ev.xexpose.count == 0)
 				drawmenu();
 			break;
-		default:
-			break;
 		}
 	}
 
-	XUngrabKeyboard(dpy, CurrentTime);
+	while(allitems) {
+		i = allitems->next;
+		free(allitems->text);
+		free(allitems);
+		allitems = i;
+	}
+	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);
+UninitializedEnd:
+	XUngrabKeyboard(dpy, CurrentTime);
 	XCloseDisplay(dpy);
 
 	return ret;

util.c

@@ -13,25 +13,22 @@
 /* static */
 
 static void
-bad_malloc(unsigned int size)
+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)
-		bad_malloc(size);
+		badmalloc(size);
 	return res;
 }
 
 void
-eprint(const char *errstr, ...)
+eprint(const char *errstr, ...) {
-{
 	va_list ap;
 
 	va_start(ap, errstr);
@@ -41,10 +38,9 @@ eprint(const char *errstr, ...)
 }
 
 char *
-estrdup(const char *str)
+estrdup(const char *str) {
-{
 	void *res = strdup(str);
 	if(!res)
-		bad_malloc(strlen(str));
+		badmalloc(strlen(str));
 	return res;
 }