removed unnecessary defines

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

@@ -0,0 +1,44 @@
+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
+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

LICENSE

@@ -1,7 +1,12 @@
 MIT/X Consortium License
 
-(C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+© 2010 Connor Lane Smith <cls@lubutu.com>
-(C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot 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,13 +1,9 @@
 # dmenu - dynamic menu
-#   (C)opyright MMVI Anselm R. Garbe
+# See LICENSE file for copyright and license details.
 
 include config.mk
 
-SRC = draw.c main.c util.c
+all: options dmenu dmenu_path
-OBJ = ${SRC:.c=.o}
-
-all: options dmenu
-	@echo finished
 
 options:
 	@echo dmenu build options:
@@ -15,46 +11,46 @@ options:
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
 
-.c.o:
+dmenu: dmenu.o draw.o
-	@echo CC $<
+dmenu_path: dmenu_path.o
-	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: dmenu.h config.h
+.c.o: config.mk
+	@echo CC -c $<
+	@${CC} -c $< ${CFLAGS}
 
-config.h:
+dmenu dmenu_path:
-	@echo creating $@ from config.default.h
+	@echo CC -o $@
-	@cp config.default.h $@
+	@${CC} -o $@ $+ ${LDFLAGS}
-
-dmenu: ${OBJ}
-	@echo LD $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
 	@echo cleaning
-	@rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+	@rm -f dmenu dmenu.o draw.o dmenu_path dmenu_path.o dmenu-${VERSION}.tar.gz
 
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp -R LICENSE Makefile README config.mk \
+	@cp LICENSE Makefile README config.mk dmenu.1 dmenu.c dmenu_path.c dmenu_run dmenu-${VERSION}
-		dmenu.1 dmenu.h ${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
-	@cp -f dmenu.1 ${DESTDIR}${MANPREFIX}/man1
+	@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,48 +1,24 @@
-dwm - dynamic window manager
+dmenu - dynamic menu
-----------------------------
+====================
-dwm is an extremely fast, small, and dynamic X11 window manager.
+dmenu is an efficient dynamic menu for X.
 
 
 Requirements
 ------------
-In order to build dwm you need the Xlib header files.
+In order to build dmenu you need the Xlib header files.
 
 
 Installation
 ------------
-Edit config.mk to match your local setup (dwm is installed into
+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 dwm (if
+Afterwards enter the following command to build and install dmenu
-necessary as root):
+(if necessary as root):
 
     make clean install
 
 
-Running dwm
+Running dmenu
------------
-Add the following line to your .xinitrc to start dwm using startx:
-
-    exec dwm
-
-In order to connect dwm to a specific display, make sure that
-the DISPLAY environment variable is set correctly, e.g.:
-
-    DISPLAY=foo.bar:1 exec dwm
-
-(This will start dwm on display :1 of the host foo.bar.)
-
-In order to display status info in the bar, you can do something
-like this in your .xinitrc:
-
-    while true
-    do
-        echo `date` `uptime | sed 's/.*://; s/,//g'`
-        sleep 1
-    done | dwm
-
-
-Configuration
 -------------
-The configuration of dwm is done by creating a custom config.h
+See the man page for details.
-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-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR			"#0a2c2d"
-#define FGCOLOR			"#ddeeee"
-#define BORDERCOLOR		"#176164"

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

@@ -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-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR			"#0a2c2d"
-#define FGCOLOR			"#ddeeee"
-#define BORDERCOLOR		"#176164"

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 0.1
+VERSION = 4.2
 
 # Customize below to fit your system
 
@@ -10,15 +10,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/usr/lib -I${X11INC}
+INCS = -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
-CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\"
+CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-LDFLAGS = ${LIBS}
+CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
+LDFLAGS  = -s ${LIBS}
-#LDFLAGS = -g ${LIBS}
 
-# compiler
+# compiler and linker
 CC = cc

dmenu.1

@@ -1,68 +1,104 @@
-.TH DMENU 1 d-0.0
+.TH DMENU 1 dmenu\-VERSION
 .SH NAME
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
+.RB [ \-b ]
+.RB [ \-i ]
+.RB [ \-l
+.IR lines ]
+.RB [ \-m
+.IR monitor ]
+.RB [ \-p
+.IR prompt ]
+.RB [ \-fn
+.IR font ]
+.RB [ \-nb
+.IR color ]
+.RB [ \-nf
+.IR color ]
+.RB [ \-sb
+.IR color ]
+.RB [ \-sf
+.IR color ]
 .RB [ \-v ]
-.RB [ \-t
+.P
-.IR title ]
+.BR dmenu_run " ..."
+.P
+.B dmenu_path
 .SH DESCRIPTION
-.SS Overview
 .B dmenu
-is a generic, highly customizable, and efficient menu for the X Window System,
+is a dynamic menu for X, originally designed for
-originally designed for
 .BR dwm (1).
-It supports arbitrary, user defined menu contents.
+It manages huge numbers of user-defined menu items efficiently.
-.SS Options
+.P
+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,
+their choice is printed to standard output 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 program used by dmenu_run to find and cache a list of executables.
+.SH OPTIONS
+.TP
+.B \-b
+dmenu appears at the bottom of the screen.
+.TP
+.B \-i
+dmenu matches menu items case insensitively.
+.TP
+.BI \-l " lines"
+dmenu lists items vertically, with the given number of lines.
+.TP
+.BI \-m " monitor"
+dmenu appears on the given Xinerama screen.
+.TP
+.BI \-p " prompt"
+defines the prompt to be displayed to the left of the input field.
+.TP
+.BI \-fn " font"
+defines the font or font set used.
+.TP
+.BI \-nb " color"
+defines the normal background color.
+.IR #RGB ,
+.IR #RRGGBB ,
+and color names are supported.
+.TP
+.BI \-nf " color"
+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 stdout, then exits.
+prints version information to standard output, then exits.
+.SH USAGE
+dmenu is completely controlled by the keyboard.  Besides standard Unix line
+editing and item selection (Up/Down/Left/Right, PageUp/PageDown, Home/End), the
+following keys are recognized:
 .TP
-.BI \-t " title"
+.B Tab (Control\-i)
-displays
+Copy the selected item to the input field.
-.I title
+.TP
-above the menu.
+.B Return (Control\-j)
-.SS Usage
+Confirm selection.  Prints the selected item to standard output and exits,
-.B dmenu
+returning success.
-reads a list of newline-separated items from stdin and creates a menu.
+.TP
-When the user selects an item or enters any text and presses Enter, his choice
+.B Shift\-Return (Control\-Shift\-j)
-is printed to stdout and
+Confirm input.  Prints the input text to standard output and exits, returning
-.B dmenu
+success.
-terminates.
+.TP
-.SS Keyboard Control 
+.B Escape (Control\-c)
-.B dmenu
+Exit without selecting an item, returning failure.
-is completely controlled by the keyboard.  The following keys are recognized:
+.TP
-.TP 2
+.B Control\-y
-Any printable character
+Paste the current X selection into the input field.
-appends the character to the text in the input field. This works as a filter:
-only items containing this text will be displayed.
-.TP 2
-Left/Right (Control-p/Control-n)
-select the previous/next item.
-.TP 2
-Tab (Control-i)
-copy the selected item to the input field.
-.TP 2
-Enter (Control-j)
-confirm selection and quit (print the selected item to stdout).
-.TP 2
-Shift-Enter (Shift-Control-j)
-confirm selection and quit (print the text in the input field to stdout).
-.TP 2
-Escape (Control-[)
-quit without selecting an item.
-.TP 2
-Backspace (Control-h)
-remove enough characters from the input field to change its filtering effect.
-.TP 2
-Control-u
-remove all characters from the input field.
-.SS Exit codes
-.B dmenu
-returns
-.B 0
-if Enter is pressed on termination,
-.B 1
-if Escape is pressed.
 .SH SEE ALSO
 .BR dwm (1)

dmenu.c

@@ -0,0 +1,542 @@
+/* See LICENSE file for copyright and license details. */
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.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 *next;          /* traverses all items */
+	Item *left, *right;  /* traverses matching items */
+};
+
+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 *s, ssize_t n);
+static void keypress(XKeyEvent *ev);
+static void match(void);
+static size_t nextrune(int incr);
+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 = 0;
+static int lines = 0;
+static int monitor = -1;
+static int promptw;
+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, *sel;
+static Item *prev, *curr, *next;
+static Window root, win;
+
+static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+
+int
+main(int argc, char *argv[]) {
+	int i;
+
+	progname = "dmenu";
+	for(i = 1; i < argc; i++)
+		/* single flags */
+		if(!strcmp(argv[i], "-v")) {
+			fputs("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n", stdout);
+			exit(EXIT_SUCCESS);
+		}
+		else if(!strcmp(argv[i], "-b"))
+			topbar = False;
+		else if(!strcmp(argv[i], "-i"))
+			fstrncmp = strncasecmp;
+		else if(i == argc-1)
+			usage();
+		/* double flags */
+		else if(!strcmp(argv[i], "-l"))
+			lines = atoi(argv[++i]);
+		else if(!strcmp(argv[i], "-m"))
+			monitor = 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);
+	readstdin();
+	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) {
+	unsigned 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, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+			return;
+		usleep(1000);
+	}
+	eprintf("cannot grab keyboard\n");
+}
+
+void
+insert(const char *s, 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, s, n);
+	cursor += n;
+	match();
+}
+
+void
+keypress(XKeyEvent *ev) {
+	char buf[32];
+	size_t len;
+	KeySym ksym;
+
+	len = strlen(text);
+	XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+	if(ev->state & ControlMask) {
+		switch(tolower(ksym)) {
+		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();
+			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(cursor == len)
+			return;
+		cursor = nextrune(+1);
+	case XK_BackSpace:
+		if(cursor > 0)
+			insert(NULL, nextrune(-1) - cursor);
+		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:
+		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);
+		fflush(stdout);
+		exit(EXIT_SUCCESS);
+	case XK_Right:
+		if(cursor < len) {
+			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();
+		break;
+	}
+	drawmenu();
+}
+
+void
+match(void) {
+	size_t len;
+	Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+
+	len = strlen(text);
+	matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
+	for(item = items; item; item = item->next)
+		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);
+
+	if(lexact) {
+		matches = lexact;
+		itemend = exactend;
+	}
+	if(lprefix) {
+		if(itemend) {
+			itemend->right = lprefix;
+			lprefix->left = itemend;
+		}
+		else
+			matches = lprefix;
+		itemend = prefixend;
+	}
+	if(lsubstr) {
+		if(itemend) {
+			itemend->right = lsubstr;
+			lsubstr->left = itemend;
+		}
+		else
+			matches = lsubstr;
+	}
+	curr = prev = next = sel = matches;
+	calcoffsets();
+}
+
+size_t
+nextrune(int incr) {
+	size_t n, len;
+
+	len = strlen(text);
+	for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+	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 : strlen(p));
+	XFree(p);
+	drawmenu();
+}
+
+void
+readstdin(void) {
+	char buf[sizeof text], *p;
+	Item *item, **end;
+
+	for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
+		if((p = strchr(buf, '\n')))
+			*p = '\0';
+		if(!(item = malloc(sizeof *item)))
+			eprintf("cannot malloc %u bytes\n", sizeof *item);
+		if(!(item->text = strdup(buf)))
+			eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
+		item->next = item->left = item->right = NULL;
+		inputw = MAX(inputw, textw(dc, item->text));
+	}
+}
+
+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;
+	XSetWindowAttributes wa;
+#ifdef XINERAMA
+	int n;
+	XineramaScreenInfo *info;
+#endif
+
+	screen = DefaultScreen(dc->dpy);
+	root = RootWindow(dc->dpy, screen);
+	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+
+	normcol[ColBG] = getcolor(dc, normbgcolor);
+	normcol[ColFG] = getcolor(dc, normfgcolor);
+	selcol[ColBG] = getcolor(dc, selbgcolor);
+	selcol[ColFG] = getcolor(dc, selfgcolor);
+
+	/* 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; i++)
+			if((monitor == info[i].screen_number)
+			|| (monitor < 0 && 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);
+	}
+	/* 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);
+
+	grabkeyboard();
+	resizedc(dc, mw, mh);
+	inputw = MIN(inputw, mw/3);
+	promptw = prompt ? textw(dc, prompt) : 0;
+	XMapRaised(dc->dpy, win);
+	text[0] = '\0';
+	match();
+}
+
+void
+usage(void) {
+	fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+	exit(EXIT_FAILURE);
+}

dmenu.h

@@ -1,47 +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 Brush Brush;
-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.c

@@ -0,0 +1,101 @@
+/* See LICENSE file for copyright and license details. */
+#include <dirent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#define CACHE ".dmenu_cache"
+
+static void die(const char *s);
+static int qstrcmp(const void *a, const void *b);
+static void scan(void);
+static int uptodate(void);
+
+static char **items = NULL;
+static const char *home, *path;
+
+int
+main(void) {
+	if(!(home = getenv("HOME")))
+		die("no $HOME");
+	if(!(path = getenv("PATH")))
+		die("no $PATH");
+	if(chdir(home) < 0)
+		die("chdir failed");
+	if(uptodate()) {
+		execlp("cat", "cat", CACHE, NULL);
+		die("exec failed");
+	}
+	scan();
+	return EXIT_SUCCESS;
+}
+
+void
+die(const char *s) {
+	fprintf(stderr, "dmenu_path: %s\n", s);
+	exit(EXIT_FAILURE);
+}
+
+int
+qstrcmp(const void *a, const void *b) {
+	return strcmp(*(const char **)a, *(const char **)b);
+}
+
+void
+scan(void) {
+	char buf[PATH_MAX];
+	char *dir, *p;
+	size_t i, count;
+	struct dirent *ent;
+	DIR *dp;
+	FILE *cache;
+
+	count = 0;
+	if(!(p = strdup(path)))
+		die("strdup failed");
+	for(dir = strtok(p, ":"); dir; dir = strtok(NULL, ":")) {
+		if(!(dp = opendir(dir)))
+			continue;
+		while((ent = readdir(dp))) {
+			snprintf(buf, sizeof buf, "%s/%s", dir, ent->d_name);
+			if(ent->d_name[0] == '.' || access(buf, X_OK) < 0)
+				continue;
+			if(!(items = realloc(items, ++count * sizeof *items)))
+				die("malloc failed");
+			if(!(items[count-1] = strdup(ent->d_name)))
+				die("strdup failed");
+		}
+		closedir(dp);
+	}
+	qsort(items, count, sizeof *items, qstrcmp);
+	if(!(cache = fopen(CACHE, "w")))
+		die("open failed");
+	for(i = 0; i < count; i++) {
+		if(i > 0 && !strcmp(items[i], items[i-1]))
+			continue;
+		fprintf(cache,  "%s\n", items[i]);
+		fprintf(stdout, "%s\n", items[i]);
+	}
+	fclose(cache);
+	free(p);
+}
+
+int
+uptodate(void) {
+	char *dir, *p;
+	time_t mtime;
+	struct stat st;
+
+	if(stat(CACHE, &st) < 0)
+		return 0;
+	mtime = st.st_mtime;
+	if(!(p = strdup(path)))
+		die("strdup failed");
+	for(dir = strtok(p, ":"); dir; dir = strtok(NULL, ":"))
+		if(!stat(dir, &st) && st.st_mtime > mtime)
+			return 0;
+	free(p);
+	return 1;
+}

dmenu_run

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

draw.c

@@ -1,159 +1,194 @@
-/*
+/* See LICENSE file for copyright and license details. */
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+#include <locale.h>
- * See LICENSE file for license details.
+#include <stdarg.h>
- */
-#include "dmenu.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <X11/Xlocale.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 DEFFONT     "fixed"
 
-static void
+static Bool loadfont(DC *dc, const char *fontstr);
-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)
+drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
-{
+	XRectangle r = { dc->x + x, dc->y + y, w, h };
-	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);
+	if(!fill) {
-	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+		r.width -= 1;
+		r.height -= 1;
+	}
+	XSetForeground(dc->dpy, dc->gc, color);
+	(fill ? XFillRectangles : XDrawRectangles)(dc->dpy, dc->canvas, dc->gc, &r, 1);
+}
 
-	w = 0;
-	if(border)
-		drawborder();
 
-	if(!text)
+void
-		return;
+drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
-
+	char buf[256];
-	len = strlen(text);
+	size_t n, mn;
-	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)
+	n = strlen(text);
-		buf[--len] = 0;
+	for(mn = MIN(n, sizeof buf); textnw(dc, text, mn) > dc->w - dc->font.height/2; mn--)
+		if(mn == 0)
+			return;
+	memcpy(buf, text, mn);
+	if(mn < n)
+		for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
 
-	if(w > dc.w)
+	drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
-		return; /* too long */
+	drawtextn(dc, buf, mn, col);
+}
 
-	gcv.foreground = invert ? dc.bg : dc.fg;
+void
-	gcv.background = invert ? dc.fg : dc.bg;
+drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
-	if(dc.font.set) {
+	int x, y;
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
+
-		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
+	x = dc->x + dc->font.height/2;
-				x, y, buf, len);
+	y = dc->y + dc->font.ascent+1;
-	}
+
+	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 | GCBackground | GCFont, &gcv);
+		XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
-		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
 }
 
+void
+eprintf(const char *fmt, ...) {
+	va_list ap;
+
+	fprintf(stderr, "%s: ", progname);
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	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(dc->dpy, DefaultScreen(dc->dpy));
-	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 
-	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+	if(!XAllocNamedColor(dc->dpy, cmap, colstr, &color, &color))
+		eprintf("cannot allocate color '%s'\n", colstr);
 	return color.pixel;
 }
 
+DC *
+initdc(void) {
+	DC *dc;
+
+	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+		weprintf("no locale support\n");
+	if(!(dc = malloc(sizeof *dc)))
+		eprintf("cannot malloc %u bytes\n", 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);
+	dc->font.xfont = NULL;
+	dc->font.set = NULL;
+	dc->canvas = None;
+	return dc;
+}
+
 void
-setfont(const char *fontstr)
+initfont(DC *dc, const char *fontstr) {
-{
+	if(!loadfont(dc, fontstr ? fontstr : DEFFONT)) {
-	char **missing, *def;
+		if(fontstr != NULL)
+			weprintf("cannot load font '%s'\n", fontstr);
+		if(fontstr == NULL || !loadfont(dc, DEFFONT))
+			eprintf("cannot load font '%s'\n", DEFFONT);
+	}
+	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)
-	setlocale(LC_ALL, "");
+		return False;
-	if(dc.font.set)
+	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
-		XFreeFontSet(dpy, dc.font.set);
+		char **names;
-	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;
+		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;
-		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;
+	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) {
-{
+	XCopyArea(dc->dpy, dc->canvas, win, dc->gc, 0, 0, w, h, 0, 0);
-	return textnw(text, strlen(text)) + dc.font.height;
+}
+
+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->x = dc->y = 0;
+	dc->w = w;
+	dc->h = h;
+	dc->invert = False;
+}
+
+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;
+}
+
+void
+weprintf(const char *fmt, ...) {
+	va_list ap;
+
+	fprintf(stderr, "%s: warning: ", progname);
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
 }

draw.h

@@ -0,0 +1,37 @@
+/* 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 */
+
+unsigned long getcolor(DC *dc, const char *colstr);
+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 initfont(DC *dc, const char *fontstr);
+void freedc(DC *dc);
+DC *initdc(void);
+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);
+void eprintf(const char *fmt, ...);
+void weprintf(const char *fmt, ...);
+
+const char *progname;

main.c

@@ -1,414 +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 *title, text[4096];
-static int mx, my, mw, mh;
-static int ret = 0;
-static int nitem = 0;
-static unsigned int cmdw = 0;
-static unsigned int tw = 0;
-static unsigned int cw = 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(!title || text[0]) {
-		cmdw = cw;
-		if(cmdw && item)
-			dc.w = cmdw;
-		drawtext(text, False, False);
-	}
-	else {
-		cmdw = tw;
-		dc.w = cmdw;
-		drawtext(title, False, False);
-	}
-	dc.x += dc.w;
-
-	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.border = False;
-			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
-input(char *pattern)
-{
-	unsigned int plen;
-	Item *i, *j;
-
-	if(!pattern)
-		return;
-
-	if(!title || *pattern)
-		cmdw = cw;
-	else
-		cmdw = tw;
-
-	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:
-			ksym = XK_BackSpace;
-			break;
-		case XK_U:
-		case XK_u:
-			text[0] = 0;
-			input(text);
-			drawmenu();
-			return;
-			break;
-		case XK_bracketleft:
-			ksym = XK_Escape;
-			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));
-		input(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;
-				input(text);
-			} while(i && nitem && prev_nitem == nitem);
-			input(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));
-			input(text);
-		}
-	}
-	drawmenu();
-}
-
-static char *
-readinput()
-{
-	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;
-	int i;
-	XEvent ev;
-	XSetWindowAttributes wa;
-
-	/* command line args */
-	for(i = 1; i < argc; i++) {
-		if (argv[i][0] == '-')
-			switch (argv[i][1]) {
-			case 'v':
-				fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-				exit(EXIT_SUCCESS);
-				break;
-			case 't':
-				if(++i < argc) {
-					title = argv[i];
-					break;
-				}
-			default:
-				eprint("usage: dmenu [-v] [-t <title>]\n");
-				break;
-			}
-		else
-			eprint("usage: dmenu [-v] [-t <title>]\n");
-	}
-
-	dpy = XOpenDisplay(0);
-	if(!dpy)
-		eprint("dmenu: cannot open dpy\n");
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-
-	maxname = readinput();
-
-	/* 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)
-		cw = textw(maxname);
-	if(cw > mw / 3)
-		cw = mw / 3;
-
-	if(title) {
-		tw = textw(title);
-		if(tw > mw / 3)
-			tw = mw / 3;
-	}
-
-	cmdw = title ? tw : cw;
-
-	text[0] = 0;
-	input(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;
-}