fixed dist target bug

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

@@ -39,3 +39,7 @@ e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2
 0508a3a6ee106f36d9b8ff07bb5b28584edfa89c 3.7
 644b0798fcccd570fd519899e1601c6857496b91 3.8
 21a1ed9a69b9541a355758a57103e294fb722c33 3.9
+78f9f72cc9c6bdb022ff8908486b61ef5e242aad 4.0
+844587572673cf6326c3f61737264a46b728fc0a 4.1
+72749a826cab0baa805620e44a22e54486c97a4e 4.1.1
+379813a051f03a1b20bdbfdc2d2d1d2d794ace48 4.2

LICENSE

@@ -1,6 +1,10 @@
 MIT/X Consortium License
 
-© 2006-2008 Anselm R. Garbe <garbeam at gmail dot com>
+© 2010 Connor Lane Smith <cls@lubutu.com>
+© 2006-2010 Anselm R Garbe <anselm@garbe.us>
+© 2009 Gottox <gottox@s01.de>
+© 2009 Markus Schnalke <meillo@marmaro.de>
+© 2009 Evan Gates <evan.gates@gmail.com>
 © 2006-2008 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 © 2006-2007 Michał Janeczek <janeczek at gmail dot com>
 

Makefile

@@ -3,10 +3,7 @@
 
 include config.mk
 
-SRC = dmenu.c
+all: options dmenu dmenu_path
-OBJ = ${SRC:.c=.o}
-
-all: options dmenu
 
 options:
 	@echo dmenu build options:
@@ -14,30 +11,31 @@ 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}: config.h config.mk
+.c.o: config.mk
+	@echo CC -c $<
+	@${CC} -c $< ${CFLAGS}
 
-dmenu: ${OBJ}
+dmenu dmenu_path:
 	@echo CC -o $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@${CC} -o $@ $+ ${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 dmenu.1 config.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
+	@cp LICENSE Makefile README config.mk dmenu.1 dmenu.c draw.c draw.h dmenu_path.c dmenu_run 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 dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
@@ -49,9 +47,10 @@ install: all
 	@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 ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu
-	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_run
+	@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.h

@@ -1,9 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* appearance */
-static const char *font        = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
-static const char *normbgcolor = "#cccccc";
-static const char *normfgcolor = "#000000";
-static const char *selbgcolor  = "#0066ff";
-static const char *selfgcolor  = "#ffffff";
-static unsigned int spaceitem  = 30; /* px between menu items */

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 4.0
+VERSION = 4.2.1
 
 # Customize below to fit your system
 
@@ -11,21 +11,17 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # Xinerama, comment if you don't want it
-XINERAMALIBS = -L${X11LIB} -lXinerama
+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 ${XINERAMALIBS}
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
 CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+LDFLAGS  = -s ${LIBS}
-
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
 
 # compiler and linker
 CC = cc

dmenu.1

@@ -3,96 +3,102 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
-.RB [ \-i ]
 .RB [ \-b ]
-.RB [ \-fn " <font>"]
+.RB [ \-i ]
-.RB [ \-nb " <color>"]
+.RB [ \-l
-.RB [ \-nf " <color>"]
+.IR lines ]
-.RB [ \-p " <prompt>"]
+.RB [ \-m
-.RB [ \-sb " <color>"]
+.IR monitor ]
-.RB [ \-sf " <color>"]
+.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 ]
+.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 standard input and creates a
-.TP
+menu.  When the user selects an item or enters any text and presses Return,
-.B \-i
+their choice is printed to standard output and dmenu terminates.
-makes dmenu match menu entries case insensitively.
+.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
-defines that dmenu appears at the bottom.
+dmenu appears at the bottom of the screen.
 .TP
-.B \-fn <font>
+.B \-i
-defines the font.
+dmenu matches menu items case insensitively.
 .TP
-.B \-nb <color>
+.BI \-l " lines"
-defines the normal background color (#RGB, #RRGGBB, and color names are supported).
+dmenu lists items vertically, with the given number of lines.
 .TP
-.B \-nf <color>
+.BI \-m " monitor"
-defines the normal foreground color (#RGB, #RRGGBB, and color names are supported).
+dmenu appears on the given Xinerama screen.
 .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 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 standard output, 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 (Up/Down/Left/Right, PageUp/PageDown, Home/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
-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 (Control\-j)
-Confirm selection and quit (print the selected item to standard output). Returns
+Confirm selection.  Prints the selected item to standard output and exits,
-.B 0
+returning success.
-on termination.
 .TP
 .B Shift\-Return (Control\-Shift\-j)
-Confirm selection and quit (print the text in the input field to standard output).
+Confirm input.  Prints the input text to standard output and exits, returning
-Returns
+success.
-.B 0
-on termination.
 .TP
-.B Escape (Control\-bracketleft)
+.B Escape (Control\-c)
-Quit without selecting an item. Returns
+Exit without selecting an item, returning failure.
-.B 1
-on termination.
 .TP
-.B Backspace (Control\-h)
+.B Control\-y
-Remove a character from the input field.
+Paste the current X selection into the input field.
-.TP
-.B Control\-u
-Remove all characters from the input field.
-.TP
-.B Control\-w
-Remove all characters of current word from the input field.
 .SH SEE ALSO
-.BR dwm (1),
+.BR dwm (1)
-.BR wmii (1) .

dmenu_path

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

dmenu_path.c

@@ -0,0 +1,102 @@
+/* See LICENSE file for copyright and license details. */
+#include <dirent.h>
+#include <limits.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;
+}

draw.c

@@ -0,0 +1,194 @@
+/* See LICENSE file for copyright and license details. */
+#include <locale.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <X11/Xlib.h>
+#include "draw.h"
+
+#define MAX(a, b)   ((a) > (b) ? (a) : (b))
+#define MIN(a, b)   ((a) < (b) ? (a) : (b))
+#define DEFFONT     "fixed"
+
+static Bool loadfont(DC *dc, const char *fontstr);
+
+void
+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 };
+
+	if(!fill) {
+		r.width -= 1;
+		r.height -= 1;
+	}
+	XSetForeground(dc->dpy, dc->gc, color);
+	(fill ? XFillRectangles : XDrawRectangles)(dc->dpy, dc->canvas, dc->gc, &r, 1);
+}
+
+
+void
+drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
+	char buf[256];
+	size_t n, mn;
+
+	/* shorten text if necessary */
+	n = strlen(text);
+	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++] = '.');
+
+	drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
+	drawtextn(dc, buf, mn, col);
+}
+
+void
+drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
+	int x, y;
+
+	x = dc->x + dc->font.height/2;
+	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 {
+		XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
+		XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
+	}
+}
+
+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(DC *dc, const char *colstr) {
+	Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy));
+	XColor 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
+initfont(DC *dc, const char *fontstr) {
+	if(!loadfont(dc, fontstr ? fontstr : DEFFONT)) {
+		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;
+
+	if(!*fontstr)
+		return False;
+	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
+		char **names;
+		XFontStruct **xfonts;
+
+		n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
+		for(i = dc->font.ascent = dc->font.descent = 0; i < n; i++) {
+			dc->font.ascent = MAX(dc->font.ascent, xfonts[i]->ascent);
+			dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
+		}
+	}
+	else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
+		dc->font.ascent = dc->font.xfont->ascent;
+		dc->font.descent = dc->font.xfont->descent;
+	}
+	if(missing)
+		XFreeStringList(missing);
+	return (dc->font.set || dc->font.xfont);
+}
+
+void
+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);
+}
+
+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;