bugfix

M- binds tend to be wm level, and there were up to 3 binds for the same action
M-{hjkl} also no longer made sense in vlist mode

.hgtags

@@ -17,3 +17,31 @@ 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
+709df5a4bad7015a346b2b44b1b3b573ea3088ff 3.3
+9ab649b3b3e5bfccf1c8f352c59e5361e070a25f 3.4
+05e5bd706b3b3e61399d57c4bb43df296a20112d 3.5
+0bc2751d06e8b95e0138854c7815e154c5c3d990 3.6
+0508a3a6ee106f36d9b8ff07bb5b28584edfa89c 3.7
+644b0798fcccd570fd519899e1601c6857496b91 3.8
+21a1ed9a69b9541a355758a57103e294fb722c33 3.9
+78f9f72cc9c6bdb022ff8908486b61ef5e242aad 4.0
+844587572673cf6326c3f61737264a46b728fc0a 4.1
+72749a826cab0baa805620e44a22e54486c97a4e 4.1.1
+379813a051f03a1b20bdbfdc2d2d1d2d794ace48 4.2
+abb6579a324fffdf6a23c2fa4c32911277da594a 4.2.1
+14c79f054bdf43ff3213af8e60a783192e92a018 4.3

LICENSE

@@ -1,22 +1,27 @@
 MIT/X Consortium License
 
-(C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+© 2010-2011 Connor Lane Smith <cls@lubutu.com>
-(C)opyright MMVI-MMVII Sander van Dijk <a dot h dot vandijk at gmail dot com>
+© 2006-2011 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"),
 to deal in the Software without restriction, including without limitation
 the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the 
+and/or sell copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in 
+The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software. 
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.

Makefile

@@ -1,9 +1,9 @@
 # dmenu - dynamic menu
-#   (C)opyright MMVII Anselm R. Garbe
+# See LICENSE file for copyright and license details.
 
 include config.mk
 
-SRC = draw.c main.c util.c
+SRC = dmenu.c draw.c
 OBJ = ${SRC:.c=.o}
 
 all: options dmenu
@@ -13,18 +13,16 @@ options:
 	@echo "CFLAGS   = ${CFLAGS}"
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
-	@echo "LD       = ${LD}"
 
 .c.o:
-	@echo CC $<
+	@echo CC -c $<
-	@${CC} -c ${CFLAGS} $<
+	@${CC} -c $< ${CFLAGS}
 
-${OBJ}: dmenu.h config.mk
+${OBJ}: config.mk
 
 dmenu: ${OBJ}
-	@echo LD $@
+	@echo CC -o $@
-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
-	@strip $@
 
 clean:
 	@echo cleaning
@@ -33,24 +31,28 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
+	@cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
 	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
 	@gzip dmenu-${VERSION}.tar
 	@rm -rf dmenu-${VERSION}
 
 install: all
-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+	@echo installing executables to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dmenu ${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
+	@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
+	@echo removing executables from ${DESTDIR}${PREFIX}/bin
 	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
 	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 

README

@@ -1,6 +1,6 @@
 dmenu - dynamic menu
 ====================
-dmenu is a generic and efficient menu for X. 
+dmenu is an efficient dynamic menu for X.
 
 
 Requirements
@@ -13,8 +13,8 @@ Installation
 Edit config.mk to match your local setup (dmenu is installed into
 the /usr/local namespace by default).
 
-Afterwards enter the following command to build and install dmenu (if
+Afterwards enter the following command to build and install dmenu
-necessary as root):
+(if necessary as root):
 
     make clean install
 

config.mk

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

dmenu.1

@@ -1,95 +1,103 @@
-.TH DMENU 1 dmenu-VERSION
+.TH DMENU 1 dmenu\-VERSION
 .SH NAME
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
 .RB [ \-b ]
-.RB [ \-fn " <font>"]
+.RB [ \-f ]
-.RB [ \-nb " <color>"]
+.RB [ \-i ]
-.RB [ \-nf " <color>"]
+.RB [ \-l
-.RB [ \-p " <prompt>"]
+.IR lines ]
-.RB [ \-sb " <color>"]
+.RB [ \-p
-.RB [ \-sf " <color>"]
+.IR prompt ]
-.RB [ \-t " <seconds>"]
+.RB [ \-fn
+.IR font ]
+.RB [ \-nb
+.IR color ]
+.RB [ \-nf
+.IR color ]
+.RB [ \-sb
+.IR color ]
+.RB [ \-sf
+.IR color ]
 .RB [ \-v ]
+.P
+.BR dmenu_run " ..."
+.P
+.B dmenu_path
 .SH DESCRIPTION
-.SS Overview
+.B dmenu
-dmenu is a generic menu for X, originally designed for
+is a dynamic menu for X, originally designed for
 .BR dwm (1).
-It manages huge amounts (up to 10.000 and more) of user defined menu items
+It manages huge numbers of user\-defined menu items efficiently.
-efficiently.
+.P
-.SS Options
+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, their
+choice is printed to stdout and dmenu terminates.
+.P
+.B dmenu_run
+is a dmenu script used by dwm which lists programs in the user's PATH and
+executes the selected item.
+.P
+.B dmenu_path
+is a script used by dmenu_run to find and cache a list of executables.
+.SH OPTIONS
 .TP
 .B \-b
-makes dmenu appear at the screen bottom (by default it appears at the screen top).
+dmenu appears at the bottom of the screen.
 .TP
-.B \-fn <font>
+.B \-f
-defines the font.
+dmenu grabs the keyboard before reading stdin.  This is faster, but may lock up
+X if stdin is from a terminal.
 .TP
-.B \-nb <color>
+.B \-i
-defines the normal background color (#RGB, #RRGGBB, and color names are supported).
+dmenu matches menu items case insensitively.
 .TP
-.B \-nf <color>
+.BI \-l " lines"
-defines the normal foreground color (#RGB, #RRGGBB, and color names are supported).
+dmenu lists items vertically, with the given number of lines.
 .TP
-.B \-p <prompt>
+.BI \-p " prompt"
-defines a prompt to be displayed before the input area.
+defines the prompt to be displayed to the left of the input field.
 .TP
-.B \-sb <color>
+.BI \-fn " font"
-defines the selected background color (#RGB, #RRGGBB, and color names are supported).
+defines the font or font set used.
 .TP
-.B \-sf <color>
+.BI \-nb " color"
-defines the selected foreground color (#RGB, #RRGGBB, and color names are supported).
+defines the normal background color.
+.IR #RGB ,
+.IR #RRGGBB ,
+and X color names are supported.
 .TP
-.B \-t <seconds>
+.BI \-nf " color"
-defines the seconds to wait for standard input, before exiting (default is 3).
+defines the normal foreground color.
+.TP
+.BI \-sb " color"
+defines the selected background color.
+.TP
+.BI \-sf " color"
+defines the selected foreground color.
 .TP
 .B \-v
-prints version information to standard output, then exits.
+prints version information to stdout, then exits.
 .SH USAGE
-dmenu reads a list of newline-separated items from standard input and creates a
+dmenu is completely controlled by the keyboard.  Besides standard Unix line
-menu.  When the user selects an item or enters any text and presses Return, his/her
+editing and item selection (arrow keys, page up/down, home and end), the
-choice is printed to standard output and dmenu terminates.
+following keys are recognized:
-.P
-dmenu is completely controlled by the keyboard. The following keys are recognized:
 .TP
-.B Any printable character
+.B Tab (Ctrl\-i)
-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)
-Select the previous/next item.
-.TP
-.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
-.B Return
+.B Return (Ctrl\-j)
-Confirm selection and quit (print the selected item to standard output). Returns
+Confirm selection.  Prints the selected item to stdout and exits, returning
-.B 0
+success.
-on termination.
 .TP
-.B Shift-Return (Control-j)
+.B Shift\-Return (Ctrl\-Shift\-j)
-Confirm selection and quit (print the text in the input field to standard output).
+Confirm input.  Prints the input text to stdout and exits, returning success.
-Returns
-.B 0
-on termination.
 .TP
-.B Escape (Control-bracketleft)
+.B Escape (Ctrl\-c)
-Quit without selecting an item. Returns
+Exit without selecting an item, returning failure.
-.B 1
-on termination.
 .TP
-.B Backspace (Control-h)
+.B Ctrl\-y
-Remove enough characters from the input field to change its filtering effect.
+Paste the current X selection into the input field.
-.TP
-.B Control-u
-Remove all characters from the input field.
 .SH SEE ALSO
-.BR dwm (1),
+.BR dwm (1)
-.BR wmii (1) .

dmenu.c

@@ -0,0 +1,554 @@
+/* See LICENSE file for copyright and license details. */
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+#include "draw.h"
+
+#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))
+
+typedef struct Item Item;
+struct Item {
+	char *text;
+	Item *left, *right;
+};
+
+static void appenditem(Item *item, Item **list, Item **last);
+static void calcoffsets(void);
+static void drawmenu(void);
+static char *fstrstr(const char *s, const char *sub);
+static void grabkeyboard(void);
+static void insert(const char *str, ssize_t n);
+static void keypress(XKeyEvent *ev);
+static void match(Bool sub);
+static size_t nextrune(int inc);
+static void paste(void);
+static void readstdin(void);
+static void run(void);
+static void setup(void);
+static void usage(void);
+
+static char text[BUFSIZ] = "";
+static int bh, mw, mh;
+static int inputw, promptw;
+static int lines = 0;
+static size_t cursor = 0;
+static const char *font = NULL;
+static const char *prompt = NULL;
+static const char *normbgcolor = "#cccccc";
+static const char *normfgcolor = "#000000";
+static const char *selbgcolor  = "#0066ff";
+static const char *selfgcolor  = "#ffffff";
+static unsigned long normcol[ColLast];
+static unsigned long selcol[ColLast];
+static Atom utf8;
+static Bool topbar = True;
+static DC *dc;
+static Item *items = NULL;
+static Item *matches, *matchend;
+static Item *prev, *curr, *next, *sel;
+static Window win;
+
+static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+
+int
+main(int argc, char *argv[]) {
+	Bool fast = False;
+	int i;
+
+	for(i = 1; i < argc; i++)
+		/* single flags */
+		if(!strcmp(argv[i], "-v")) {
+			puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
+			exit(EXIT_SUCCESS);
+		}
+		else if(!strcmp(argv[i], "-b"))
+			topbar = False;
+		else if(!strcmp(argv[i], "-f"))
+			fast = True;
+		else if(!strcmp(argv[i], "-i"))
+			fstrncmp = strncasecmp;
+		else if(i+1 == argc)
+			usage();
+		/* double flags */
+		else if(!strcmp(argv[i], "-l"))
+			lines = atoi(argv[++i]);
+		else if(!strcmp(argv[i], "-p"))
+			prompt = argv[++i];
+		else if(!strcmp(argv[i], "-fn"))
+			font = argv[++i];
+		else if(!strcmp(argv[i], "-nb"))
+			normbgcolor = argv[++i];
+		else if(!strcmp(argv[i], "-nf"))
+			normfgcolor = argv[++i];
+		else if(!strcmp(argv[i], "-sb"))
+			selbgcolor = argv[++i];
+		else if(!strcmp(argv[i], "-sf"))
+			selfgcolor = argv[++i];
+		else
+			usage();
+
+	dc = initdc();
+	initfont(dc, font);
+
+	if(fast) {
+		grabkeyboard();
+		readstdin();
+	}
+	else {
+		readstdin();
+		grabkeyboard();
+	}
+	setup();
+	run();
+
+	return EXIT_FAILURE;  /* should not reach */
+}
+
+void
+appenditem(Item *item, Item **list, Item **last) {
+	if(!*last)
+		*list = item;
+	else
+		(*last)->right = item;
+	item->left = *last;
+	item->right = NULL;
+	*last = item;
+}
+
+void
+calcoffsets(void) {
+	int i, n;
+
+	if(lines > 0)
+		n = lines * bh;
+	else
+		n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
+
+	for(i = 0, next = curr; next; next = next->right)
+		if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
+			break;
+	for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
+		if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n)
+			break;
+}
+
+void
+drawmenu(void) {
+	int curpos;
+	Item *item;
+
+	dc->x = 0;
+	dc->y = 0;
+	dc->h = bh;
+	drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
+
+	if(prompt) {
+		dc->w = promptw;
+		drawtext(dc, prompt, selcol);
+		dc->x = dc->w;
+	}
+	dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
+	drawtext(dc, text, normcol);
+	if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+		drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
+
+	if(lines > 0) {
+		dc->w = mw - dc->x;
+		for(item = curr; item != next; item = item->right) {
+			dc->y += dc->h;
+			drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+		}
+	}
+	else if(matches) {
+		dc->x += inputw;
+		dc->w = textw(dc, "<");
+		if(curr->left)
+			drawtext(dc, "<", normcol);
+		for(item = curr; item != next; item = item->right) {
+			dc->x += dc->w;
+			dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">"));
+			drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+		}
+		dc->w = textw(dc, ">");
+		dc->x = mw - dc->w;
+		if(next)
+			drawtext(dc, ">", normcol);
+	}
+	mapdc(dc, win, mw, mh);
+}
+
+char *
+fstrstr(const char *s, const char *sub) {
+	size_t len;
+
+	for(len = strlen(sub); *s; s++)
+		if(!fstrncmp(s, sub, len))
+			return (char *)s;
+	return NULL;
+}
+
+void
+grabkeyboard(void) {
+	int i;
+
+	for(i = 0; i < 1000; i++) {
+		if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
+		                 GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
+			return;
+		usleep(1000);
+	}
+	eprintf("cannot grab keyboard\n");
+}
+
+void
+insert(const char *str, ssize_t n) {
+	if(strlen(text) + n > sizeof text - 1)
+		return;
+	memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
+	if(n > 0)
+		memcpy(&text[cursor], str, n);
+	cursor += n;
+	match(n > 0 && text[cursor] == '\0');
+}
+
+void
+keypress(XKeyEvent *ev) {
+	char buf[32];
+	KeySym ksym;
+
+	XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+	if(ev->state & ControlMask) {
+		KeySym lower, upper;
+
+		XConvertCase(ksym, &lower, &upper);
+		switch(lower) {
+		default:
+			return;
+		case XK_a:
+			ksym = XK_Home;
+			break;
+		case XK_b:
+			ksym = XK_Left;
+			break;
+		case XK_c:
+			ksym = XK_Escape;
+			break;
+		case XK_d:
+			ksym = XK_Delete;
+			break;
+		case XK_e:
+			ksym = XK_End;
+			break;
+		case XK_f:
+			ksym = XK_Right;
+			break;
+		case XK_h:
+			ksym = XK_BackSpace;
+			break;
+		case XK_i:
+			ksym = XK_Tab;
+			break;
+		case XK_j:
+			ksym = XK_Return;
+			break;
+		case XK_k:  /* delete right */
+			text[cursor] = '\0';
+			match(False);
+			break;
+		case XK_n:
+			ksym = XK_Down;
+			break;
+		case XK_p:
+			ksym = XK_Up;
+			break;
+		case XK_u:  /* delete left */
+			insert(NULL, 0 - cursor);
+			break;
+		case XK_w:  /* delete word */
+			while(cursor > 0 && text[nextrune(-1)] == ' ')
+				insert(NULL, nextrune(-1) - cursor);
+			while(cursor > 0 && text[nextrune(-1)] != ' ')
+				insert(NULL, nextrune(-1) - cursor);
+			break;
+		case XK_y:  /* paste selection */
+			XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+			return;
+		}
+	}
+	switch(ksym) {
+	default:
+		if(!iscntrl(*buf))
+			insert(buf, strlen(buf));
+		break;
+	case XK_Delete:
+		if(text[cursor] == '\0')
+			return;
+		cursor = nextrune(+1);
+	case XK_BackSpace:
+		if(cursor > 0)
+			insert(NULL, nextrune(-1) - cursor);
+		break;
+	case XK_End:
+		if(text[cursor] != '\0') {
+			cursor = strlen(text);
+			break;
+		}
+		if(next) {
+			curr = matchend;
+			calcoffsets();
+			curr = prev;
+			calcoffsets();
+			while(next && (curr = curr->right))
+				calcoffsets();
+		}
+		sel = matchend;
+		break;
+	case XK_Escape:
+		exit(EXIT_FAILURE);
+	case XK_Home:
+		if(sel == matches) {
+			cursor = 0;
+			break;
+		}
+		sel = curr = matches;
+		calcoffsets();
+		break;
+	case XK_Left:
+		if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
+			cursor = nextrune(-1);
+			break;
+		}
+		else if(lines > 0)
+			return;
+	case XK_Up:
+		if(sel && sel->left && (sel = sel->left)->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:
+	case XK_KP_Enter:
+		fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
+		exit(EXIT_SUCCESS);
+	case XK_Right:
+		if(text[cursor] != '\0') {
+			cursor = nextrune(+1);
+			break;
+		}
+		else if(lines > 0)
+			return;
+	case XK_Down:
+		if(sel && sel->right && (sel = sel->right) == next) {
+			curr = next;
+			calcoffsets();
+		}
+		break;
+	case XK_Tab:
+		if(!sel)
+			return;
+		strncpy(text, sel->text, sizeof text);
+		cursor = strlen(text);
+		match(True);
+		break;
+	}
+	drawmenu();
+}
+
+void
+match(Bool sub) {
+	size_t len = strlen(text);
+	Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+	Item *item, *lnext;
+
+	lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
+	for(item = sub ? matches : items; item && item->text; item = lnext) {
+		lnext = sub ? item->right : item + 1;
+		if(!fstrncmp(text, item->text, len + 1))
+			appenditem(item, &lexact, &exactend);
+		else if(!fstrncmp(text, item->text, len))
+			appenditem(item, &lprefix, &prefixend);
+		else if(fstrstr(item->text, text))
+			appenditem(item, &lsubstr, &substrend);
+	}
+	matches = lexact;
+	matchend = exactend;
+
+	if(lprefix) {
+		if(matchend) {
+			matchend->right = lprefix;
+			lprefix->left = matchend;
+		}
+		else
+			matches = lprefix;
+		matchend = prefixend;
+	}
+	if(lsubstr) {
+		if(matchend) {
+			matchend->right = lsubstr;
+			lsubstr->left = matchend;
+		}
+		else
+			matches = lsubstr;
+		matchend = substrend;
+	}
+	curr = sel = matches;
+	calcoffsets();
+}
+
+size_t
+nextrune(int inc) {
+	ssize_t n;
+
+	for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
+	return n;
+}
+
+void
+paste(void) {
+	char *p, *q;
+	int di;
+	unsigned long dl;
+	Atom da;
+
+	XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
+	                   utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
+	insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));
+	XFree(p);
+	drawmenu();
+}
+
+void
+readstdin(void) {
+	char buf[sizeof text], *p, *maxstr = NULL;
+	size_t i, max = 0, size = 0;
+
+	for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
+		if(i+1 >= size / sizeof *items)
+			if(!(items = realloc(items, (size += BUFSIZ))))
+				eprintf("cannot realloc %u bytes:", size);
+		if((p = strchr(buf, '\n')))
+			*p = '\0';
+		if(!(items[i].text = strdup(buf)))
+			eprintf("cannot strdup %u bytes:", strlen(buf)+1);
+		if(strlen(items[i].text) > max)
+			max = strlen(maxstr = items[i].text);
+	}
+	if(items)
+		items[i].text = NULL;
+	inputw = maxstr ? textw(dc, maxstr) : 0;
+}
+
+void
+run(void) {
+	XEvent ev;
+
+	while(!XNextEvent(dc->dpy, &ev))
+		switch(ev.type) {
+		case Expose:
+			if(ev.xexpose.count == 0)
+				drawmenu();
+			break;
+		case KeyPress:
+			keypress(&ev.xkey);
+			break;
+		case SelectionNotify:
+			if(ev.xselection.property == utf8)
+				paste();
+			break;
+		case VisibilityNotify:
+			if(ev.xvisibility.state != VisibilityUnobscured)
+				XRaiseWindow(dc->dpy, win);
+			break;
+		}
+}
+
+void
+setup(void) {
+	int x, y, screen = DefaultScreen(dc->dpy);
+	Window root = RootWindow(dc->dpy, screen);
+	XSetWindowAttributes wa;
+#ifdef XINERAMA
+	int n;
+	XineramaScreenInfo *info;
+#endif
+
+	normcol[ColBG] = getcolor(dc, normbgcolor);
+	normcol[ColFG] = getcolor(dc, normfgcolor);
+	selcol[ColBG]  = getcolor(dc, selbgcolor);
+	selcol[ColFG]  = getcolor(dc, selfgcolor);
+
+	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+
+	/* menu geometry */
+	bh = dc->font.height + 2;
+	lines = MAX(lines, 0);
+	mh = (lines + 1) * bh;
+#ifdef XINERAMA
+	if((info = XineramaQueryScreens(dc->dpy, &n))) {
+		int i, di;
+		unsigned int du;
+		Window dw;
+
+		XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
+		for(i = 0; i < n-1; 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 = info[i].y_org + (topbar ? 0 : info[i].height - mh);
+		mw = info[i].width;
+		XFree(info);
+	}
+	else
+#endif
+	{
+		x = 0;
+		y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
+		mw = DisplayWidth(dc->dpy, screen);
+	}
+	promptw = prompt ? textw(dc, prompt) : 0;
+	inputw = MIN(inputw, mw/3);
+	match(False);
+
+	/* menu window */
+	wa.override_redirect = True;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+	win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
+	                    DefaultDepth(dc->dpy, screen), CopyFromParent,
+	                    DefaultVisual(dc->dpy, screen),
+	                    CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+
+	XMapRaised(dc->dpy, win);
+	resizedc(dc, mw, mh);
+	drawmenu();
+}
+
+void
+usage(void) {
+	fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n"
+	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+	exit(EXIT_FAILURE);
+}

dmenu.h

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

dmenu_path

@@ -0,0 +1,9 @@
+#!/bin/sh
+CACHE=$HOME/.dmenu_cache
+IFS=:
+
+if ! test -f "$CACHE" || find $PATH -type d -newer "$CACHE" | grep -q .; then
+	find $PATH ! -type d \( -perm -1 -o -perm -10 -o -perm -100 \) | sed 's/.*\///' | sort -u > "$CACHE"
+fi
+
+cat "$CACHE"

dmenu_run

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

draw.c

@@ -1,121 +1,177 @@
-/* (C)opyright MMIV-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+/* See LICENSE file for copyright and license details. */
- * See LICENSE file for license details.
+#include <locale.h>
- */
+#include <stdarg.h>
-#include "dmenu.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <X11/Xlib.h>
+#include "draw.h"
 
-/* static */
+#define MAX(a, b)  ((a) > (b) ? (a) : (b))
+#define MIN(a, b)  ((a) < (b) ? (a) : (b))
+#define DEFAULTFN  "fixed"
 
-static unsigned int
+static Bool loadfont(DC *dc, const char *fontstr);
-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, unsigned long col[ColLast]) {
+drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
-	int x, y, w, h;
+	XSetForeground(dc->dpy, dc->gc, color);
-	static char buf[256];
+	if(fill)
-	unsigned int len, olen;
+		XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h);
-	XGCValues gcv;
+	else
-	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+		XDrawRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w-1, h-1);
+}
+
+void
+drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
+	char buf[BUFSIZ];
+	size_t mn, n = strlen(text);
 
-	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)
+	for(mn = MIN(n, sizeof buf); textnw(dc, text, mn) + dc->font.height/2 > dc->w; mn--)
-		buf[--len] = 0;
+		if(mn == 0)
-	if(len < olen) {
+			return;
-		if(len > 1)
+	memcpy(buf, text, mn);
-			buf[len - 1] = '.';
+	if(mn < n)
-		if(len > 2)
+		for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
-			buf[len - 2] = '.';
+
-		if(len > 3)
+	drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
-			buf[len - 3] = '.';
+	drawtextn(dc, buf, mn, col);
-	}
+}
-	if(w > dc.w)
+
-		return; /* too long */
+void
-	gcv.foreground = col[ColFG];
+drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
-	if(dc.font.set) {
+	int x = dc->x + dc->font.height/2;
-		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+	int y = dc->y + dc->font.ascent+1;
-		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc,
+
-				x, y, buf, len);
+	XSetForeground(dc->dpy, dc->gc, FG(dc, col));
-	}
+	if(dc->font.set)
+		XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
 	else {
-		gcv.font = dc.font.xfont->fid;
+		XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
-		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+		XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
-		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
 }
 
+void
+eprintf(const char *fmt, ...) {
+	va_list ap;
+
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+
+	if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
+	}
+	exit(EXIT_FAILURE);
+}
+
+void
+freedc(DC *dc) {
+	if(dc->font.set)
+		XFreeFontSet(dc->dpy, dc->font.set);
+	if(dc->font.xfont)
+		XFreeFont(dc->dpy, dc->font.xfont);
+	if(dc->canvas)
+		XFreePixmap(dc->dpy, dc->canvas);
+	XFreeGC(dc->dpy, dc->gc);
+	XCloseDisplay(dc->dpy);
+	free(dc);
+}
+
 unsigned long
-getcolor(const char *colstr) {
+getcolor(DC *dc, const char *colstr) {
-	Colormap cmap = DefaultColormap(dpy, screen);
+	Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy));
 	XColor color;
 
-	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+	if(!XAllocNamedColor(dc->dpy, cmap, colstr, &color, &color))
-		eprint("error, cannot allocate color '%s'\n", colstr);
+		eprintf("cannot allocate color '%s'\n", colstr);
 	return color.pixel;
 }
 
+DC *
+initdc(void) {
+	DC *dc;
+
+	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+		fprintf(stderr, "no locale support\n");
+	if(!(dc = calloc(1, sizeof *dc)))
+		eprintf("cannot malloc %u bytes:", sizeof *dc);
+	if(!(dc->dpy = XOpenDisplay(NULL)))
+		eprintf("cannot open display\n");
+
+	dc->gc = XCreateGC(dc->dpy, DefaultRootWindow(dc->dpy), 0, NULL);
+	XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
+	return dc;
+}
+
 void
-setfont(const char *fontstr) {
+initfont(DC *dc, const char *fontstr) {
+	if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
+		if(fontstr != NULL)
+			fprintf(stderr, "cannot load font '%s'\n", fontstr);
+		if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
+			eprintf("cannot load font '%s'\n", DEFAULTFN);
+	}
+	dc->font.height = dc->font.ascent + dc->font.descent;
+}
+
+Bool
+loadfont(DC *dc, const char *fontstr) {
 	char *def, **missing;
 	int i, n;
 
-	missing = NULL;
+	if(!*fontstr)
-	if(dc.font.set)
+		return False;
-		XFreeFontSet(dpy, dc.font.set);
+	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
-	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+		char **names;
-	if(missing)
-		XFreeStringList(missing);
-	if(dc.font.set) {
-		XFontSetExtents *font_extents;
 		XFontStruct **xfonts;
-		char **font_names;
+
-		dc.font.ascent = dc.font.descent = 0;
+		n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
-		font_extents = XExtentsOfFontSet(dc.font.set);
+		for(i = dc->font.ascent = dc->font.descent = 0; i < n; i++) {
-		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+			dc->font.ascent = MAX(dc->font.ascent, xfonts[i]->ascent);
-		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+			dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
-			if(dc.font.ascent < (*xfonts)->ascent)
-				dc.font.ascent = (*xfonts)->ascent;
-			if(dc.font.descent < (*xfonts)->descent)
-				dc.font.descent = (*xfonts)->descent;
-			xfonts++;
 		}
 	}
-	else {
+	else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
-		if(dc.font.xfont)
+		dc->font.ascent = dc->font.xfont->ascent;
-			XFreeFont(dpy, dc.font.xfont);
+		dc->font.descent = dc->font.xfont->descent;
-		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;
+	if(missing)
+		XFreeStringList(missing);
+	return (dc->font.set || dc->font.xfont);
 }
 
-unsigned int
+void
-textw(const char *text) {
+mapdc(DC *dc, Window win, unsigned int w, unsigned int h) {
-	return textnw(text, strlen(text)) + dc.font.height;
+	XCopyArea(dc->dpy, dc->canvas, win, dc->gc, 0, 0, w, h, 0, 0);
+}
+
+void
+resizedc(DC *dc, unsigned int w, unsigned int h) {
+	if(dc->canvas)
+		XFreePixmap(dc->dpy, dc->canvas);
+
+	dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
+	                           DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
+	dc->w = w;
+	dc->h = h;
+}
+
+int
+textnw(DC *dc, const char *text, size_t len) {
+	if(dc->font.set) {
+		XRectangle r;
+
+		XmbTextExtents(dc->font.set, text, len, NULL, &r);
+		return r.width;
+	}
+	return XTextWidth(dc->font.xfont, text, len);
+}
+
+int
+textw(DC *dc, const char *text) {
+	return textnw(dc, text, strlen(text)) + dc->font.height;
 }

draw.h

@@ -0,0 +1,34 @@
+/* See LICENSE file for copyright and license details. */
+
+#define FG(dc, col)  ((col)[(dc)->invert ? ColBG : ColFG])
+#define BG(dc, col)  ((col)[(dc)->invert ? ColFG : ColBG])
+
+enum { ColBG, ColFG, ColBorder, ColLast };
+
+typedef struct {
+	int x, y, w, h;
+	Bool invert;
+	Display *dpy;
+	GC gc;
+	Pixmap canvas;
+	struct {
+		int ascent;
+		int descent;
+		int height;
+		XFontSet set;
+		XFontStruct *xfont;
+	} font;
+} DC;  /* draw context */
+
+void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color);
+void drawtext(DC *dc, const char *text, unsigned long col[ColLast]);
+void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]);
+void eprintf(const char *fmt, ...);
+void freedc(DC *dc);
+unsigned long getcolor(DC *dc, const char *colstr);
+DC *initdc(void);
+void initfont(DC *dc, const char *fontstr);
+void mapdc(DC *dc, Window win, unsigned int w, unsigned int h);
+void resizedc(DC *dc, unsigned int w, unsigned int h);
+int textnw(DC *dc, const char *text, size_t len);
+int textw(DC *dc, const char *text);

main.c

@@ -1,493 +0,0 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details.
- */
-#include "dmenu.h"
-
-#include <ctype.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/select.h>
-#include <sys/time.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 mx, my, 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 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;
-		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;
-		}
-	}
-	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((i = len)) {
-			prev_nitem = nitem;
-			do {
-				text[--i] = 0;
-				match(text);
-			} while(i && nitem && prev_nitem == nitem);
-			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;
-}
-
-/* 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;
-	fd_set rd;
-	int i, j;
-	struct timeval timeout;
-	Item *itm;
-	XEvent ev;
-	XModifierKeymap *modmap;
-	XSetWindowAttributes wa;
-
-	timeout.tv_usec = 0;
-	timeout.tv_sec = 3;
-	/* command line args */
-	for(i = 1; i < argc; i++)
-		if(!strncmp(argv[i], "-b", 3)) {
-			bottom = True;
-		}
-		else if(!strncmp(argv[i], "-fn", 4)) {
-			if(++i < argc) font = argv[i];
-		}
-		else if(!strncmp(argv[i], "-nb", 4)) {
-			if(++i < argc) normbg = argv[i];
-		}
-		else if(!strncmp(argv[i], "-nf", 4)) {
-			if(++i < argc) normfg = argv[i];
-		}
-		else if(!strncmp(argv[i], "-p", 3)) {
-			if(++i < argc) prompt = argv[i];
-		}
-		else if(!strncmp(argv[i], "-sb", 4)) {
-			if(++i < argc) selbg = argv[i];
-		}
-		else if(!strncmp(argv[i], "-sf", 4)) {
-			if(++i < argc) selfg = argv[i];
-		}
-		else if(!strncmp(argv[i], "-t", 3)) {
-			if(++i < argc) timeout.tv_sec = atoi(argv[i]);
-		}
-		else if(!strncmp(argv[i], "-v", 3)) {
-			fputs("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
-			exit(EXIT_SUCCESS);
-		}
-		else
-			eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>] [-p <prompt>]\n"
-				"             [-sb <color>] [-sf <color>] [-t <seconds>] [-v]\n", stdout);
-	setlocale(LC_CTYPE, "");
-	dpy = XOpenDisplay(0);
-	if(!dpy)
-		eprint("dmenu: cannot open display\n");
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-
-	/* Note, the select() construction allows to grab all keypresses as
-	 * early as possible, to not loose them. But if there is no standard
-	 * input supplied, we will make sure to exit after MAX_WAIT_STDIN
-	 * seconds. This is convenience behavior for rapid typers.
-	 */ 
-	while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
-			 GrabModeAsync, CurrentTime) != GrabSuccess)
-		usleep(1000);
-	FD_ZERO(&rd);
-	FD_SET(STDIN_FILENO, &rd);
-	if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
-		goto UninitializedEnd;
-	maxname = readstdin();
-	/* 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);
-	setfont(font);
-	/* menu window */
-	wa.override_redirect = 1;
-	wa.background_pixmap = ParentRelative;
-	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-	mx = my = 0;
-	mw = DisplayWidth(dpy, screen);
-	mh = dc.font.height + 2;
-	if(bottom)
-		my += DisplayHeight(dpy, screen) - mh;
-	win = XCreateWindow(dpy, root, mx, my, 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(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);
-UninitializedEnd:
-	XUngrabKeyboard(dpy, CurrentTime);
-	XCloseDisplay(dpy);
-	return ret;
-}

util.c

@@ -1,38 +0,0 @@
-/* (C)opyright MMVI-MMVII 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>
-
-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;
-}