prepared dmenu-4.1 release

.hgtags

@@ -31,3 +31,12 @@ fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7
 dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8
 59b3024854db49739c6d237fa9077f04a2da847a 3.0
 8f0f917ac988164e1b4446236e3a6ab6cfcb8c67 3.1
+e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2
+709df5a4bad7015a346b2b44b1b3b573ea3088ff 3.3
+9ab649b3b3e5bfccf1c8f352c59e5361e070a25f 3.4
+05e5bd706b3b3e61399d57c4bb43df296a20112d 3.5
+0bc2751d06e8b95e0138854c7815e154c5c3d990 3.6
+0508a3a6ee106f36d9b8ff07bb5b28584edfa89c 3.7
+644b0798fcccd570fd519899e1601c6857496b91 3.8
+21a1ed9a69b9541a355758a57103e294fb722c33 3.9
+78f9f72cc9c6bdb022ff8908486b61ef5e242aad 4.0

LICENSE

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

Makefile

@@ -1,9 +1,9 @@
 # dmenu - dynamic menu
-# © 2006-2007 Anselm R. Garbe, Sander van Dijk
+# See LICENSE file for copyright and license details.
 
 include config.mk
 
-SRC = draw.c main.c util.c
+SRC = dmenu.c
 OBJ = ${SRC:.c=.o}
 
 all: options dmenu
@@ -18,7 +18,11 @@ options:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: dmenu.h config.mk
+${OBJ}: config.h config.mk
+
+config.h:
+	@echo creating $@ from config.def.h
+	@cp config.def.h $@
 
 dmenu: ${OBJ}
 	@echo CC -o $@
@@ -31,7 +35,7 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h dmenu_path ${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}
@@ -39,9 +43,10 @@ dist: clean
 install: all
 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dmenu dmenu_path ${DESTDIR}${PREFIX}/bin
+	@cp -f dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
 	@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
@@ -50,6 +55,7 @@ install: all
 uninstall:
 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
 	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_run
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
 	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 

config.def.h

@@ -0,0 +1,9 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const char *font        = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
+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 */

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 3.2
+VERSION = 4.1
 
 # Customize below to fit your system
 
@@ -10,20 +10,22 @@ MANPREFIX = ${PREFIX}/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
+# Xinerama, comment if you don't want it
+XINERAMALIBS = -L${X11LIB} -lXinerama
+XINERAMAFLAGS = -DXINERAMA
+
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = -g ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = ${LIBS}
-#CFLAGS += -xtarget=ultra
 
 # compiler and linker
 CC = cc

dmenu.1

@@ -3,7 +3,9 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
+.RB [ \-i ]
 .RB [ \-b ]
+.RB [ \-l " <lines>"]
 .RB [ \-fn " <font>"]
 .RB [ \-nb " <color>"]
 .RB [ \-nf " <color>"]
@@ -19,8 +21,15 @@ It manages huge amounts (up to 10.000 and more) of user defined menu items
 efficiently.
 .SS Options
 .TP
+.B \-i
+makes dmenu match menu entries case insensitively.
+.TP
 .B \-b
-makes dmenu appear at the screen bottom (by default it appears at the screen top).
+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.
@@ -53,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

@@ -0,0 +1,821 @@
+/* See LICENSE file for copyright and license details. */
+#include <ctype.h>
+#include <locale.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+#include <X11/keysym.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+
+/* macros */
+#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 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 {
+	char *text;
+	Item *next;         /* traverses all items */
+	Item *left, *right; /* traverses items matching current search pattern */
+};
+
+/* forward declarations */
+static void appenditem(Item *i, Item **list, Item **last);
+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 drawmenuh(void);
+static void drawmenuv(void);
+static void drawtext(const char *text, unsigned long col[ColLast]);
+static void eprint(const char *errstr, ...);
+static unsigned long getcolor(const char *colstr);
+static Bool grabkeyboard(void);
+static void initfont(const char *fontstr);
+static void kpress(XKeyEvent * e);
+static void match(char *pattern);
+static void readstdin(void);
+static void run(void);
+static void setup(Bool topbar);
+static int textnw(const char *text, unsigned int len);
+static int textw(const char *text);
+
+#include "config.h"
+
+/* variables */
+static char *maxname = NULL;
+static char *prompt = NULL;
+static char text[4096];
+static int cmdw = 0;
+static int promptw = 0;
+static int ret = 0;
+static int cursor = 0;
+static int screen;
+static unsigned int mw, mh;
+static unsigned int numlockmask = 0;
+static Bool running = True;
+static Display *dpy;
+static DC dc;
+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 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) {
+	if(!(*last))
+		*list = i;
+	else
+		(*last)->right = i;
+	i->left = *last;
+	i->right = NULL;
+	*last = i;
+}
+
+void
+calcoffsetsh(void) {
+	int tw;
+	unsigned int w;
+
+	if(!curr)
+		return;
+	w = promptw + cmdw + 2 * spaceitem;
+	for(next = curr; next; next=next->right) {
+		tw = MIN(textw(next->text), mw / 3);
+		w += tw;
+		if(w > mw)
+			break;
+	}
+	w = promptw + cmdw + 2 * spaceitem;
+	for(prev = curr; prev && prev->left; prev=prev->left) {
+		tw = MIN(textw(prev->left->text), 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;
+	unsigned int len;
+
+	if(!sub)
+		return (char *)s;
+	if((c = *sub++) != '\0') {
+		c = tolower(c);
+		len = strlen(sub);
+		do {
+			do {
+				if((csub = *s++) == '\0')
+					return NULL;
+			}
+			while(tolower(csub) != c);
+		}
+		while(strncasecmp(s, sub, len) != 0);
+		s--;
+	}
+	return (char *)s;
+}
+
+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
+drawcursor(void) {
+	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(prompt) {
+		dc.w = promptw;
+		drawtext(prompt, dc.sel);
+		dc.x += dc.w;
+	}
+	dc.w = mw - dc.x;
+	/* print command */
+	if(cmdw && item && lines == 0)
+		dc.w = cmdw;
+	drawtext(text[0] ? text : NULL, dc.norm);
+	drawcursor();
+	if(curr) {
+		if(lines > 0)
+			drawmenuv();
+		else
+			drawmenuh();
+	}
+	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
+	XFlush(dpy);
+}
+
+void
+drawmenuh(void) {
+	Item *i;
+
+	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;
+	olen = strlen(text);
+	h = dc.font.height;
+	y = dc.y + ((h+2) / 2) - (h / 2) + dc.font.ascent;
+	x = dc.x + (h / 2);
+	/* shorten text if necessary */
+	for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
+	if(!len)
+		return;
+	memcpy(buf, text, len);
+	if(len < olen)
+		for(i = len; i && i > len - 3; buf[--i] = '.');
+	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
+eprint(const char *errstr, ...) {
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+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, parent, 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;
+	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+	if(missing)
+		XFreeStringList(missing);
+	if(dc.font.set) {
+		XFontStruct **xfonts;
+		char **font_names;
+		dc.font.ascent = dc.font.descent = 0;
+		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+		for(i = 0; i < n; i++) {
+			dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+			dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent);
+			xfonts++;
+		}
+	}
+	else {
+		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[sizeof text];
+	int i, num;
+	unsigned int len;
+	KeySym ksym;
+
+	len = strlen(text);
+	buf[0] = '\0';
+	num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
+	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_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;
+			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:
+			memmove(text, text + cursor, sizeof text - cursor + 1);
+			cursor = 0;
+			match(text);
+			break;
+		case XK_w:
+		case XK_W:
+			if(cursor > 0) {
+				i = cursor;
+				while(i-- > 0 && text[i] == ' ');
+				while(i-- > 0 && text[i] != ' ');
+				memmove(text + i + 1, text + cursor, sizeof text - cursor + 1);
+				cursor = i + 1;
+				match(text);
+			}
+			break;
+		}
+	}
+	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;
+		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])) {
+			memmove(text + cursor + num, text + cursor, sizeof text - cursor - num);
+			memcpy(text + cursor, buf, num);
+			cursor+=num;
+			match(text);
+		}
+		break;
+	case XK_BackSpace:
+		if(cursor > 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(cursor < len) {
+			cursor = len;
+			break;
+		}
+		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(sel == item) {
+			cursor = 0;
+			break;
+		}
+		sel = curr = item;
+		calcoffsets();
+		break;
+	case XK_Left:
+	case XK_Up:
+		if(sel && sel->left){
+			sel=sel->left;
+			if(sel->right == curr) {
+				curr = prev;
+				calcoffsets();
+			}
+		}
+		else if(cursor > 0)
+			cursor--;
+		else
+			return;
+		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) || !sel)
+			fprintf(stdout, "%s", text);
+		else
+			fprintf(stdout, "%s", sel->text);
+		fflush(stdout);
+		running = False;
+		break;
+	case XK_Right:
+	case XK_Down:
+		if(cursor < len)
+			cursor++;
+		else if(sel && sel->right) {
+			sel=sel->right;
+			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;
+	}
+	drawmenu();
+}
+
+void
+match(char *pattern) {
+	unsigned int plen;
+	Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+
+	if(!pattern)
+		return;
+	plen = strlen(pattern);
+	item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
+	for(i = allitems; i; i = i->next)
+		if(!fstrncmp(pattern, i->text, plen + 1))
+			appenditem(i, &lexact, &exactend);
+		else if(!fstrncmp(pattern, i->text, plen))
+			appenditem(i, &lprefix, &prefixend);
+		else if(fstrstr(i->text, pattern))
+			appenditem(i, &lsubstr, &substrend);
+	if(lexact) {
+		item = lexact;
+		itemend = exactend;
+	}
+	if(lprefix) {
+		if(itemend) {
+			itemend->right = lprefix;
+			lprefix->left = itemend;
+		}
+		else
+			item = lprefix;
+		itemend = prefixend;
+	}
+	if(lsubstr) {
+		if(itemend) {
+			itemend->right = lsubstr;
+			lsubstr->left = itemend;
+		}
+		else
+			item = lsubstr;
+	}
+	curr = prev = next = sel = item;
+	calcoffsets();
+}
+
+void
+readstdin(void) {
+	char *p, buf[sizeof text];
+	unsigned int len = 0, max = 0;
+	Item *i, *new;
+
+	i = NULL;
+	while(fgets(buf, sizeof buf, stdin)) {
+		len = strlen(buf);
+		if(buf[len-1] == '\n')
+			buf[--len] = '\0';
+		if(!(p = strdup(buf)))
+			eprint("fatal: could not strdup() %u bytes\n", len);
+		if(max < len || !maxname) {
+			maxname = p;
+			max = len;
+		}
+		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)
+			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;
+		case VisibilityNotify:
+			if (ev.xvisibility.state != VisibilityUnobscured)
+				XRaiseWindow(dpy, win);
+			break;
+		}
+}
+
+void
+setup(Bool topbar) {
+	int i, j, x, y;
+#if XINERAMA
+	int n;
+	XineramaScreenInfo *info = NULL;
+#endif
+	XModifierKeymap *modmap;
+	XSetWindowAttributes wa;
+	XWindowAttributes pwa;
+
+	/* 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(normbgcolor);
+	dc.norm[ColFG] = getcolor(normfgcolor);
+	dc.sel[ColBG] = getcolor(selbgcolor);
+	dc.sel[ColFG] = getcolor(selfgcolor);
+	initfont(font);
+
+	/* menu window */
+	wa.override_redirect = True;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
+
+	/* menu window geometry */
+	mh = (dc.font.height + 2) * (lines + 1);
+#if XINERAMA
+	if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+		i = 0;
+		if(n > 1) {
+			int di;
+			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 : pwa.height - mh;
+		mw = pwa.width;
+	}
+
+	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, parent, mw, mh, DefaultDepth(dpy, screen));
+	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 = MIN(textw(maxname), mw / 3);
+	if(prompt)
+		promptw = MIN(textw(prompt), mw / 5);
+	text[0] = '\0';
+	match(text);
+	XMapRaised(dpy, win);
+}
+
+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);
+}
+
+int
+textw(const char *text) {
+	return textnw(text, strlen(text)) + dc.font.height;
+}
+
+int
+main(int argc, char *argv[]) {
+	unsigned int i;
+	Bool topbar = True;
+
+	/* command line args */
+	for(i = 1; i < argc; i++)
+		if(!strcmp(argv[i], "-i")) {
+			fstrncmp = strncasecmp;
+			fstrstr = cistrstr;
+		}
+		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];
+		}
+		else if(!strcmp(argv[i], "-nb")) {
+			if(++i < argc) normbgcolor = argv[i];
+		}
+		else if(!strcmp(argv[i], "-nf")) {
+			if(++i < argc) normfgcolor = argv[i];
+		}
+		else if(!strcmp(argv[i], "-p")) {
+			if(++i < argc) prompt = argv[i];
+		}
+		else if(!strcmp(argv[i], "-sb")) {
+			if(++i < argc) selbgcolor = argv[i];
+		}
+		else if(!strcmp(argv[i], "-sf")) {
+			if(++i < argc) selfgcolor = argv[i];
+		}
+		else if(!strcmp(argv[i], "-v"))
+			eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n");
+		else
+			eprint("usage: dmenu [-i] [-b] [-e <xid>] [-l <lines>] [-fn <font>] [-nb <color>]\n"
+			       "             [-nf <color>] [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+		fprintf(stderr, "warning: no locale support\n");
+	if(!(dpy = XOpenDisplay(NULL)))
+		eprint("dmenu: cannot open display\n");
+	screen = DefaultScreen(dpy);
+	if(!parent)
+		parent = RootWindow(dpy, screen);
+
+	readstdin();
+	running = grabkeyboard();
+
+	setup(topbar);
+	drawmenu();
+	XSync(dpy, False);
+	run();
+	cleanup();
+	XCloseDisplay(dpy);
+	return ret;
+}

dmenu.h

@@ -1,41 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <X11/Xlib.h>
-
-#define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
-#define NORMBGCOLOR		"#eeeeee"
-#define NORMFGCOLOR		"#222222"
-#define SELBGCOLOR		"#006699"
-#define SELFGCOLOR		"#ffffff"
-#define SPACE			30 /* px */
-
-/* color */
-enum { ColFG, ColBG, ColLast };
-
-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 */
-
-int screen;
-Display *dpy;
-DC dc;			/* global drawing context */
-
-/* draw.c */
-void drawtext(const char *text, unsigned long col[ColLast]);
-unsigned int textw(const char *text);
-unsigned int textnw(const char *text, unsigned int len);
-
-/* util.c */
-void *emalloc(unsigned int size);		/* allocates memory, exits on error */
-void eprint(const char *errstr, ...);		/* prints errstr and exits with 1 */
-char *estrdup(const char *str);			/* duplicates str, exits on allocation error */

dmenu_path

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

dmenu_run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exe=`dmenu_path | dmenu ${1+"$@"}` && exec $exe

draw.c

@@ -1,61 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include "dmenu.h"
-#include <string.h>
-
-/* extern */
-
-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);
-}
-
-unsigned int
-textw(const char *text) {
-	return textnw(text, strlen(text)) + dc.font.height;
-}
-
-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);
-}

main.c

@@ -1,555 +0,0 @@
-/* See LICENSE file for copyright and 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/Xutil.h>
-#include <X11/keysym.h>
-
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
-
-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 char *prompt = NULL;
-static int mw, mh;
-static int ret = 0;
-static int nitem = 0;
-static unsigned int cmdw = 0;
-static unsigned int promptw = 0;
-static unsigned int numlockmask = 0;
-static Bool running = True;
-static Item *allitems = NULL;	/* first of all items */
-static Item *item = NULL;	/* first of pattern matching items */
-static Item *sel = NULL;
-static Item *next = NULL;
-static Item *prev = NULL;
-static Item *curr = NULL;
-static Window root;
-static Window win;
-
-static 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;
-	}
-}
-
-static void
-drawmenu(void) {
-	Item *i;
-
-	dc.x = 0;
-	dc.y = 0;
-	dc.w = mw;
-	dc.h = mh;
-	drawtext(NULL, dc.norm);
-	/* print prompt? */
-	if(promptw) {
-		dc.w = promptw;
-		drawtext(prompt, dc.sel);
-	}
-	dc.x += promptw;
-	dc.w = mw - promptw;
-	/* print command */
-	if(cmdw && item)
-		dc.w = cmdw;
-	drawtext(text[0] ? text : NULL, dc.norm);
-	dc.x += cmdw;
-	if(curr) {
-		dc.w = SPACE;
-		drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
-		dc.x += dc.w;
-		/* determine maximum items */
-		for(i = curr; i != next; i=i->right) {
-			dc.w = textw(i->text);
-			if(dc.w > mw / 3)
-				dc.w = mw / 3;
-			drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
-			dc.x += dc.w;
-		}
-		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);
-}
-
-static 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;
-}
-
-static unsigned long
-initcolor(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;
-}
-
-static void
-initfont(const char *fontstr) {
-	char *def, **missing;
-	int i, n;
-
-	if(!fontstr || fontstr[0] == '\0')
-		eprint("error, cannot load font: '%s'\n", fontstr);
-	missing = NULL;
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
-	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-	if(missing)
-		XFreeStringList(missing);
-	if(dc.font.set) {
-		XFontSetExtents *font_extents;
-		XFontStruct **xfonts;
-		char **font_names;
-		dc.font.ascent = dc.font.descent = 0;
-		font_extents = XExtentsOfFontSet(dc.font.set);
-		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-			if(dc.font.ascent < (*xfonts)->ascent)
-				dc.font.ascent = (*xfonts)->ascent;
-			if(dc.font.descent < (*xfonts)->descent)
-				dc.font.descent = (*xfonts)->descent;
-			xfonts++;
-		}
-	}
-	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
-		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;
-	}
-	dc.font.height = dc.font.ascent + dc.font.descent;
-}
-
-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 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();
-}
-
-static char *
-readstdin(void) {
-	static char *maxname = NULL;
-	char *p, buf[1024];
-	unsigned int len = 0, max = 0;
-	Item *i, *new;
-
-	i = 0;
-	while(fgets(buf, sizeof buf, stdin)) {
-		len = strlen(buf);
-		if (buf[len - 1] == '\n')
-			buf[len - 1] = 0;
-		p = estrdup(buf);
-		if(max < len) {
-			maxname = p;
-			max = len;
-		}
-		new = emalloc(sizeof(Item));
-		new->next = new->left = new->right = NULL;
-		new->text = p;
-		if(!i)
-			allitems = new;
-		else 
-			i->next = new;
-		i = new;
-	}
-
-	return maxname;
-}
-
-static void
-usage(void) {
-	eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-		"             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
-}
-
-/* extern */
-
-int screen;
-Display *dpy;
-DC dc = {0};
-
-int
-main(int argc, char *argv[]) {
-	Bool bottom = False;
-	char *font = FONT;
-	char *maxname;
-	char *normbg = NORMBGCOLOR;
-	char *normfg = NORMFGCOLOR;
-	char *selbg = SELBGCOLOR;
-	char *selfg = SELFGCOLOR;
-	int i, j;
-	Item *itm;
-	XEvent ev;
-	XModifierKeymap *modmap;
-	XSetWindowAttributes wa;
-
-	/* command line args */
-	for(i = 1; i < argc; i++)
-		if(!strcmp(argv[i], "-b")) {
-			bottom = True;
-		}
-		else if(!strcmp(argv[i], "-fn")) {
-			if(++i < argc) font = argv[i];
-		}
-		else if(!strcmp(argv[i], "-nb")) {
-			if(++i < argc) normbg = argv[i];
-		}
-		else if(!strcmp(argv[i], "-nf")) {
-			if(++i < argc) normfg = argv[i];
-		}
-		else if(!strcmp(argv[i], "-p")) {
-			if(++i < argc) prompt = argv[i];
-		}
-		else if(!strcmp(argv[i], "-sb")) {
-			if(++i < argc) selbg = argv[i];
-		}
-		else if(!strcmp(argv[i], "-sf")) {
-			if(++i < argc) selfg = argv[i];
-		}
-		else if(!strcmp(argv[i], "-v"))
-			eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
-		else
-			usage();
-	setlocale(LC_CTYPE, "");
-	dpy = XOpenDisplay(0);
-	if(!dpy)
-		eprint("dmenu: cannot open display\n");
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-	if(isatty(STDIN_FILENO)) {
-		maxname = readstdin();
-		running = grabkeyboard();
-	}
-	else { /* prevent keypress loss */
-		running = grabkeyboard();
-		maxname = readstdin();
-	}
-	/* init modifier map */
-	modmap = XGetModifierMapping(dpy);
-	for (i = 0; i < 8; i++) {
-		for (j = 0; j < modmap->max_keypermod; j++) {
-			if(modmap->modifiermap[i * modmap->max_keypermod + j]
-			== XKeysymToKeycode(dpy, XK_Num_Lock))
-				numlockmask = (1 << i);
-		}
-	}
-	XFreeModifiermap(modmap);
-	/* style */
-	dc.norm[ColBG] = initcolor(normbg);
-	dc.norm[ColFG] = initcolor(normfg);
-	dc.sel[ColBG] = initcolor(selbg);
-	dc.sel[ColFG] = initcolor(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);
-	drawmenu();
-	XSync(dpy, False);
-
-	/* main event loop */
-	while(running && !XNextEvent(dpy, &ev))
-		switch (ev.type) {
-		default:	/* ignore all crap */
-			break;
-		case KeyPress:
-			kpress(&ev.xkey);
-			break;
-		case Expose:
-			if(ev.xexpose.count == 0)
-				drawmenu();
-			break;
-		}
-
-	/* cleanup */
-	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);
-	XCloseDisplay(dpy);
-	return ret;
-}

util.c

@@ -1,34 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include "dmenu.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-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;
-}