applied yiyus initfont fix

.hgtags

@@ -1,2 +1,34 @@
 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
+58dbef4aef3d45c7a3da6945e53c9667c0f02d5b 1.7
+3696d77aaf02f5d15728dde3b9e35abcaf291496 1.7.1
+d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8
+c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9
+1fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0
+7656557298c954469a6a9564e6649b1fb5db663e 2.1
+90f0e34e7f118c9ad3227a1606211ee825942b1c 2.2
+b6e09682c8adcb6569656bee73c311f9ab457715 2.3
+9e9036cbfb4b7306c6fb366249e81dc0e65bdfde 2.4
+03e83e2788c83ddd63b45a667939d7ec783c98cb 2.4.1
+1ca5d430524e838c52ede912533cb90108c5cd66 2.4.2
+041143e9fc544c62edc58af52cae9ac5237e5945 2.5
+775f761a5647a05038e091d1c99fc35d3034cd68 2.6
+fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7
+dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8
+59b3024854db49739c6d237fa9077f04a2da847a 3.0
+8f0f917ac988164e1b4446236e3a6ab6cfcb8c67 3.1
+e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2

LICENSE

@@ -1,7 +1,7 @@
 MIT/X Consortium License
 
-(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>
+© 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

Makefile

@@ -1,13 +1,12 @@
 # dmenu - dynamic menu
-#   (C)opyright MMVI Anselm R. Garbe
+# © 2006-2007 Anselm R. Garbe, Sander van Dijk
 
 include config.mk
 
-SRC = draw.c main.c util.c
+SRC = dmenu.c
 OBJ = ${SRC:.c=.o}
 
 all: options dmenu
-	@echo finished
 
 options:
 	@echo dmenu build options:
@@ -19,16 +18,11 @@ options:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: dmenu.h config.h
-
-config.h:
-	@echo creating $@ from config.default.h
-	@cp config.default.h $@
+${OBJ}: config.h config.mk
 
 dmenu: ${OBJ}
-	@echo LD $@
+	@echo CC -o $@
 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
-	@strip $@
 
 clean:
 	@echo cleaning
@@ -37,8 +31,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 config.h dmenu_path ${SRC} dmenu-${VERSION}
 	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
 	@gzip dmenu-${VERSION}.tar
 	@rm -rf dmenu-${VERSION}
@@ -46,16 +39,17 @@ dist: clean
 install: all
 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dmenu ${DESTDIR}${PREFIX}/bin
+	@cp -f dmenu dmenu_path ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@sed 's/VERSION/${VERSION}/g' < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 
 uninstall:
 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
-	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
 	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 

README

@@ -1,7 +1,6 @@
 dmenu - dynamic menu
---------------------
-dmenu is a generic, highly customizable, and efficient menu for the
-X Window System.
+====================
+dmenu is a generic and efficient menu for X. 
 
 
 Requirements
@@ -23,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			"#eeeeee"
-#define FGCOLOR			"#666699"
-#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.h

@@ -0,0 +1,10 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+#define FONT			"-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
+#define NORMBGCOLOR		"#000"
+#define NORMFGCOLOR		"#ccc"
+#define SELBGCOLOR		"#00f"
+#define SELFGCOLOR		"#fff"
+/* next macro defines the space between menu items */
+#define SPACE			30 /* px */

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 0.3
+VERSION = 3.3
 
 # Customize below to fit your system
 
@@ -11,14 +11,19 @@ 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
 CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
-LDFLAGS = ${LIBS}
+LDFLAGS = -s ${LIBS}
 #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = -g ${LIBS}
 
-# compiler
+# Solaris
+#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+#LDFLAGS = ${LIBS}
+#CFLAGS += -xtarget=ultra
+
+# compiler and linker
 CC = cc

dmenu.1

@@ -1,64 +1,94 @@
-.TH DMENU 1 dmenu-VERSION
+.TH DMENU 1 dmenu\-3.2
 .SH NAME
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
+.RB [ \-b ]
+.RB [ \-fn " <font>"]
+.RB [ \-nb " <color>"]
+.RB [ \-nf " <color>"]
+.RB [ \-p " <prompt>"]
+.RB [ \-sb " <color>"]
+.RB [ \-sf " <color>"]
 .RB [ \-v ]
 .SH DESCRIPTION
 .SS Overview
-.B dmenu
-is a generic, highly customizable, and efficient menu for the X Window System,
-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 \-b
+makes dmenu appear at the screen bottom (by default it appears at the screen top).
 .TP
-Any printable character
+.B \-fn <font>
+defines the font.
+.TP
+.B \-nb <color>
+defines the normal background color (#RGB, #RRGGBB, and color names are supported).
+.TP
+.B \-nf <color>
+defines the normal 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 \-sb <color>
+defines the selected background color (#RGB, #RRGGBB, and color names are supported).
+.TP
+.B \-sf <color>
+defines the selected foreground color (#RGB, #RRGGBB, and color names are supported).
+.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 (Mod1\-h/Mod1\-l)
 Select the previous/next item.
 .TP
-Tab
+.B PageUp/PageDown (Mod1\-k/Mod1\-j)
+Select the first item of the previous/next 'page' of items.
+.TP
+.B Home/End (Mod1\-g/Mod1\-G)
+Select the first/last item.
+.TP
+.B Tab (Control\-i)
 Copy the selected item to the input field.
 .TP
-Return
-Confirm selection and quit (print the selected item to stdout).
-.TP
-Shift-Return
-Confirm selection and quit (print the text in the input field to stdout).
-.TP
-Escape
-Quit without selecting an item.
-.TP
-Backspace (Control-h)
-Remove enough characters from the input field to change its filtering effect.
-.TP
-Control-u
-Remove all characters from the input field.
-.P
-.B dmenu
-returns
+.B Return (Control\-j)
+Confirm selection and quit (print the selected item to standard output). Returns
 .B 0
-if Return is pressed on termination,
+on termination.
+.TP
+.B Shift\-Return (Control\-Shift\-j)
+Confirm selection and quit (print the text in the input field to standard output).
+Returns
+.B 0
+on termination.
+.TP
+.B Escape (Control\-bracketleft)
+Quit without selecting an item. Returns
 .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.
+on termination.
+.TP
+.B Backspace (Control\-h)
+Remove a character from the input field.
+.TP
+.B Control\-u
+Remove all characters from the input field.
+.TP
+.B Control\-w
+Remove all characters of current word from the input field.
 .SH SEE ALSO
-.BR dwm (1)
+.BR dwm (1),
+.BR wmii (1) .

dmenu.c

@@ -0,0 +1,711 @@
+/* See LICENSE file for copyright and license details. */
+#include <ctype.h>
+#include <locale.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+
+/* macros */
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+
+/* 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 */
+	char *text;
+};
+
+/* forward declarations */
+void calcoffsets(void);
+void cleanup(void);
+void drawmenu(void);
+void drawtext(const char *text, unsigned long col[ColLast]);
+void *emalloc(unsigned int size);
+void eprint(const char *errstr, ...);
+char *estrdup(const char *str);
+unsigned long getcolor(const char *colstr);
+Bool grabkeyboard(void);
+void initfont(const char *fontstr);
+void kpress(XKeyEvent * e);
+void match(char *pattern);
+void readstdin(void);
+void run(void);
+void setup(Bool bottom);
+int strido(const char *text, const char *pattern);
+unsigned int textnw(const char *text, unsigned int len);
+unsigned int textw(const char *text);
+
+#include "config.h"
+
+/* variables */
+char *font = FONT;
+char *maxname = NULL;
+char *normbg = NORMBGCOLOR;
+char *normfg = NORMFGCOLOR;
+char *prompt = NULL;
+char *selbg = SELBGCOLOR;
+char *selfg = SELFGCOLOR;
+char text[4096];
+int screen;
+int ret = 0;
+unsigned int cmdw = 0;
+unsigned int mw, mh;
+unsigned int promptw = 0;
+unsigned int nitem = 0;
+unsigned int numlockmask = 0;
+Bool running = True;
+Display *dpy;
+DC dc = {0};
+Item *allitems = NULL;	/* first of all items */
+Item *item = NULL;	/* first of pattern matching items */
+Item *sel = NULL;
+Item *next = NULL;
+Item *prev = NULL;
+Item *curr = NULL;
+Window root, win;
+
+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;
+	}
+	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;
+	}
+}
+
+void
+cleanup(void) {
+	Item *itm;
+
+	while(allitems) {
+		itm = allitems->next;
+		free(allitems->text);
+		free(allitems);
+		allitems = itm;
+	}
+	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);
+}
+
+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;
+		}
+		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);
+}
+
+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] = '.';
+	}
+	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);
+}
+
+void *
+emalloc(unsigned int 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;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+char *
+estrdup(const char *str) {
+	void *res = strdup(str);
+
+	if(!res)
+		eprint("fatal: could not malloc() %u bytes\n", strlen(str));
+	return res;
+}
+
+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;
+}
+
+Bool
+grabkeyboard(void) {
+	unsigned int len;
+
+	for(len = 1000; len; len--) {
+		if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+			== GrabSuccess)
+			break;
+		usleep(1000);
+	}
+	return len > 0;
+}
+
+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++;
+		}
+	}
+	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);
+		dc.font.ascent = dc.font.xfont->ascent;
+		dc.font.descent = dc.font.xfont->descent;
+	}
+	dc.font.height = dc.font.ascent + dc.font.descent;
+}
+
+void
+kpress(XKeyEvent * e) {
+	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))
+		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;
+			break;
+		case XK_i:
+		case XK_I:
+			ksym = XK_Tab;
+			break;
+		case XK_j:
+		case XK_J:
+			ksym = XK_Return;
+			break;
+		case XK_u:
+		case XK_U:
+			text[0] = 0;
+			match(text);
+			drawmenu();
+			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();
+			}
+			return;
+		}
+	}
+	if(CLEANMASK(e->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;
+		}
+	}
+	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);
+		}
+		break;
+	case XK_BackSpace:
+		if(len) {
+			text[--len] = 0;
+			match(text);
+		}
+		break;
+	case XK_End:
+		if(!item)
+			return;
+		while(next) {
+			sel = curr = next;
+			calcoffsets();
+		}
+		while(sel && sel->right)
+			sel = sel->right;
+		break;
+	case XK_Escape:
+		ret = 1;
+		running = False;
+		break;
+	case XK_Home:
+		if(!item)
+			return;
+		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)
+			return;
+		sel = curr = next;
+		calcoffsets();
+		break;
+	case XK_Prior:
+		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;
+		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();
+}
+
+void
+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)
+				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();
+}
+
+void
+readstdin(void) {
+	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;
+	}
+}
+
+void
+run(void) {
+	XEvent ev;
+
+	/* 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;
+		}
+}
+
+void
+setup(Bool bottom) {
+	unsigned int i, j;
+	XModifierKeymap *modmap;
+	XSetWindowAttributes wa;
+
+	/* 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);
+		}
+	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);
+	XMapRaised(dpy, win);
+}
+
+int
+strido(const char *text, const char *pattern) {
+	for(; *text && *pattern; text++)
+		if (*text == *pattern)
+			pattern++;
+	return !*pattern;
+}                                  
+
+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);
+}
+
+unsigned int
+textw(const char *text) {
+	return textnw(text, strlen(text)) + dc.font.height;
+}
+
+int
+main(int argc, char *argv[]) {
+	Bool bottom = False;
+	unsigned int i;
+
+	/* 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];
+		}
+		else if(!strcmp(argv[i], "-v"))
+			eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
+		else
+			eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+			"             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+	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)) {
+		readstdin();
+		running = grabkeyboard();
+	}
+	else { /* prevent keypress loss */
+		running = grabkeyboard();
+		readstdin();
+	}
+
+	setup(bottom);
+	drawmenu();
+	XSync(dpy, False);
+	run();
+	cleanup();
+	XCloseDisplay(dpy);
+	return ret;
+}

dmenu.h

@@ -1,46 +0,0 @@
-/*
- * (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 SPACE		30 /* px */
-
-typedef struct DC DC;
-typedef struct Fnt Fnt;
-
-struct Fnt {
-	XFontStruct *xfont;
-	XFontSet set;
-	int ascent;
-	int descent;
-	int height;
-};
-
-struct DC { /* draw context */
-	int x, y, w, h;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
-	Drawable drawable;
-	Fnt font;
-	GC gc;
-};
-
-extern int screen;
-extern Display *dpy;
-extern DC dc;
-
-/* 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);
-
-/* util.c */
-extern void *emalloc(unsigned int size);
-extern void eprint(const char *errstr, ...);
-extern char *estrdup(const char *str);

dmenu_path

@@ -0,0 +1,26 @@
+#!/bin/sh
+CACHE=$HOME/.dmenu_cache
+IFS=:
+
+uptodate() {
+	test ! -f $CACHE && return 1
+	for dir in $PATH
+	do
+		test $dir -nt $CACHE && return 1
+	done
+	return 0
+}
+
+if ! uptodate
+then
+	for dir in $PATH
+	do
+		for file in "$dir"/*
+		do
+			test -x "$file" && echo "${file##*/}"
+		done
+	done | sort | uniq > $CACHE.$$
+	mv $CACHE.$$ $CACHE
+fi
+
+cat $CACHE

draw.c

@@ -1,159 +0,0 @@
-/*
- * (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 void
-drawborder(void)
-{
-	XPoint points[5];
-
-	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);
-}
-
-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);
-}
-
-/* extern */
-
-void
-drawtext(const char *text, Bool invert, Bool border)
-{
-	int x, y, w, h;
-	static char buf[256];
-	unsigned int len;
-	XGCValues gcv;
-	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
-	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-
-	w = 0;
-	if(border)
-		drawborder();
-
-	if(!text)
-		return;
-
-	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(w > dc.w)
-		return; /* too long */
-
-	gcv.foreground = invert ? dc.bg : dc.fg;
-	gcv.background = invert ? dc.fg : dc.bg;
-	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(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);
-	}
-}
-
-unsigned long
-getcolor(const char *colstr)
-{
-	Colormap cmap = DefaultColormap(dpy, screen);
-	XColor color;
-
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-	return color.pixel;
-}
-
-void
-setfont(const char *fontstr)
-{
-	char **missing, *def;
-	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) {
-		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);
-		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++;
-		}
-	}
-	else {
-		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");
-		dc.font.ascent = dc.font.xfont->ascent;
-		dc.font.descent = dc.font.xfont->descent;
-	}
-	dc.font.height = dc.font.ascent + dc.font.descent;
-}
-
-unsigned int
-textw(const char *text)
-{
-	return textnw(text, strlen(text)) + dc.font.height;
-}

main.c

@@ -1,373 +0,0 @@
-/*
- * (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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <X11/cursorfont.h>
-#include <X11/Xutil.h>
-#include <X11/keysym.h>
-
-typedef struct Item Item;
-struct Item {
-	Item *next;		/* traverses all items */
-	Item *left, *right;	/* traverses items matching current search pattern */
-	char *text;
-};
-
-/* static */
-
-static char text[4096];
-static int mx, my, mw, mh;
-static int ret = 0;
-static int nitem = 0;
-static unsigned int cmdw = 0;
-static Bool done = False;
-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 void
-calcoffsets()
-{
-	unsigned int tw, w;
-
-	if(!curr)
-		return;
-
-	w = 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;
-	}
-
-	w = 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;
-	}
-}
-
-static void
-drawmenu()
-{
-	Item *i;
-
-	dc.x = 0;
-	dc.y = 0;
-	dc.w = mw;
-	dc.h = mh;
-	drawtext(NULL, False, False);
-
-	/* print command */
-	if(cmdw && item)
-		dc.w = cmdw;
-	drawtext(text[0] ? text : NULL, False, False);
-	dc.x += cmdw;
-
-	if(curr) {
-		dc.w = SPACE;
-		drawtext((curr && curr->left) ? "<" : NULL, False, False);
-		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);
-			dc.x += dc.w;
-		}
-
-		dc.x = mw - SPACE;
-		dc.w = SPACE;
-		drawtext(next ? ">" : NULL, False, False);
-	}
-	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
-	XFlush(dpy);
-}
-
-static void
-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)
-				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++;
-		}
-
-	curr = prev = next = sel = item;
-	calcoffsets();
-}
-
-static void
-kpress(XKeyEvent * e)
-{
-	char buf[32];
-	int num, prev_nitem;
-	unsigned int i, len;
-	KeySym ksym;
-
-	len = strlen(text);
-	buf[0] = 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) {
-		default:	/* ignore other control sequences */
-			return;
-			break;
-		case XK_h:
-		case XK_H:
-			ksym = XK_BackSpace;
-			break;
-		case XK_u:
-		case XK_U:
-			text[0] = 0;
-			match(text);
-			drawmenu();
-			return;
-			break;
-		}
-	}
-	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));
-		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);
-		done = True;
-		break;
-	case XK_Escape:
-		ret = 1;
-		done = True;
-		break;
-	case XK_BackSpace:
-		if((i = len)) {
-			prev_nitem = nitem;
-			do {
-				text[--i] = 0;
-				match(text);
-			} while(i && nitem && prev_nitem == nitem);
-			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);
-		}
-	}
-	drawmenu();
-}
-
-static char *
-readstdin()
-{
-	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;
-}
-
-/* extern */
-
-int screen;
-Display *dpy;
-DC dc = {0};
-
-int
-main(int argc, char *argv[])
-{
-	char *maxname;
-	XEvent ev;
-	XSetWindowAttributes wa;
-
-	if(argc == 2 && !strncmp("-v", argv[1], 3)) {
-		fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-		exit(EXIT_SUCCESS);
-	}
-	else if(argc != 1)
-		eprint("usage: dmenu [-v]\n");
-
-	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!!! */
-	while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
-			 GrabModeAsync, CurrentTime) != GrabSuccess)
-		usleep(1000);
-
-	/* style */
-	dc.bg = getcolor(BGCOLOR);
-	dc.fg = getcolor(FGCOLOR);
-	dc.border = getcolor(BORDERCOLOR);
-	setfont(FONT);
-
-	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;
-
-	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);
-
-	if(maxname)
-		cmdw = textw(maxname);
-	if(cmdw > mw / 3)
-		cmdw = mw / 3;
-
-	text[0] = 0;
-	match(text);
-	XMapRaised(dpy, win);
-	drawmenu();
-	XSync(dpy, False);
-
-	/* main event loop */
-	while(!done && !XNextEvent(dpy, &ev)) {
-		switch (ev.type) {
-		case KeyPress:
-			kpress(&ev.xkey);
-			break;
-		case Expose:
-			if(ev.xexpose.count == 0)
-				drawmenu();
-			break;
-		default:
-			break;
-		}
-	}
-
-	XUngrabKeyboard(dpy, CurrentTime);
-	XFreePixmap(dpy, dc.drawable);
-	XFreeGC(dpy, dc.gc);
-	XDestroyWindow(dpy, win);
-	XCloseDisplay(dpy);
-
-	return ret;
-}

util.c

@@ -1,50 +0,0 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-#include "dmenu.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-/* static */
-
-static void
-bad_malloc(unsigned int size)
-{
-	eprint("fatal: could not malloc() %u bytes\n", size);
-}
-
-/* extern */
-
-void *
-emalloc(unsigned int size)
-{
-	void *res = malloc(size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
-
-void
-eprint(const char *errstr, ...)
-{
-	va_list ap;
-
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(EXIT_FAILURE);
-}
-
-char *
-estrdup(const char *str)
-{
-	void *res = strdup(str);
-	if(!res)
-		bad_malloc(strlen(str));
-	return res;
-}