simplified initfont

.hgtags

@@ -33,3 +33,8 @@ dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8
 8f0f917ac988164e1b4446236e3a6ab6cfcb8c67 3.1
 e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2
 709df5a4bad7015a346b2b44b1b3b573ea3088ff 3.3
+9ab649b3b3e5bfccf1c8f352c59e5361e070a25f 3.4
+05e5bd706b3b3e61399d57c4bb43df296a20112d 3.5
+0bc2751d06e8b95e0138854c7815e154c5c3d990 3.6
+0508a3a6ee106f36d9b8ff07bb5b28584edfa89c 3.7
+644b0798fcccd570fd519899e1601c6857496b91 3.8

LICENSE

@@ -1,7 +1,7 @@
 MIT/X Consortium License
 
-© 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+© 2006-2008 Anselm R. Garbe <garbeam at gmail dot com>
-© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot 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

Makefile

@@ -1,5 +1,5 @@
 # dmenu - dynamic menu
-# © 2006-2007 Anselm R. Garbe, Sander van Dijk
+# See LICENSE file for copyright and license details.
 
 include config.mk
 
@@ -31,7 +31,7 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp -R LICENSE Makefile README config.mk dmenu.1 config.h dmenu_path ${SRC} dmenu-${VERSION}
+	@cp -R LICENSE Makefile README config.mk dmenu.1 config.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
 	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
 	@gzip dmenu-${VERSION}.tar
 	@rm -rf dmenu-${VERSION}
@@ -39,9 +39,10 @@ dist: clean
 install: all
 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dmenu dmenu_path ${DESTDIR}${PREFIX}/bin
+	@cp -f dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
@@ -50,6 +51,7 @@ install: all
 uninstall:
 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
 	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_run
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
 	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 

config.h

@@ -1,10 +1,9 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-#define FONT			"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"
+static const char *font        = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
-#define NORMBGCOLOR             "#cccccc"
+static const char *normbgcolor = "#cccccc";
-#define NORMFGCOLOR             "#000000"
+static const char *normfgcolor = "#000000";
-#define SELBGCOLOR              "#0066ff"
+static const char *selbgcolor  = "#0066ff";
-#define SELFGCOLOR              "#ffffff"
+static const char *selfgcolor  = "#ffffff";
-/* next macro defines the space between menu items */
+static unsigned int spaceitem  = 30; /* px between menu items */
-#define SPACE			30 /* px */

config.mk

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

dmenu.1

@@ -3,8 +3,8 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
-.RB [ \-b ]
 .RB [ \-i ]
+.RB [ \-b ]
 .RB [ \-fn " <font>"]
 .RB [ \-nb " <color>"]
 .RB [ \-nf " <color>"]
@@ -20,11 +20,11 @@ It manages huge amounts (up to 10.000 and more) of user defined menu items
 efficiently.
 .SS Options
 .TP
-.B \-b
-makes dmenu appear at the screen bottom (by default it appears at the screen top).
-.TP
 .B \-i
-makes dmenu match menu entries with ignoring intermediate characters.
+makes dmenu match menu entries case insensitively.
+.TP
+.B \-b
+defines that dmenu appears at the bottom.
 .TP
 .B \-fn <font>
 defines the font.

dmenu.c

@@ -1,17 +1,24 @@
 /* See LICENSE file for copyright and license details. */
+#define _BSD_SOURCE
 #include <ctype.h>
 #include <locale.h>
 #include <stdarg.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
+#include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/keysym.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
 
 /* macros */
 #define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))
+#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define MIN(a, b)               ((a) < (b) ? (a) : (b))
 
 /* enums */
 enum { ColFG, ColBG, ColLast };
@@ -34,85 +41,74 @@ typedef struct {
 
 typedef struct Item Item;
 struct Item {
+	char *text;
 	Item *next;		/* traverses all items */
 	Item *left, *right;	/* traverses items matching current search pattern */
-	char *text;
-	Bool matched;
 };
 
 /* forward declarations */
-Item *appenditem(Item *i, Item *last);
+static void appenditem(Item *i, Item **list, Item **last);
-void calcoffsets(void);
+static void calcoffsets(void);
-void cleanup(void);
+static char *cistrstr(const char *s, const char *sub);
-void drawmenu(void);
+static void cleanup(void);
-void drawtext(const char *text, unsigned long col[ColLast]);
+static void drawmenu(void);
-void *emalloc(unsigned int size);
+static void drawtext(const char *text, unsigned long col[ColLast]);
-void eprint(const char *errstr, ...);
+static void eprint(const char *errstr, ...);
-char *estrdup(const char *str);
+static unsigned long getcolor(const char *colstr);
-unsigned long getcolor(const char *colstr);
+static Bool grabkeyboard(void);
-Bool grabkeyboard(void);
+static void initfont(const char *fontstr);
-void initfont(const char *fontstr);
+static void kpress(XKeyEvent * e);
-void kpress(XKeyEvent * e);
+static void match(char *pattern);
-void match(char *pattern);
+static void readstdin(void);
-void readstdin(void);
+static void run(void);
-void run(void);
+static void setup(Bool topbar);
-void setup(Bool bottom);
+static int textnw(const char *text, unsigned int len);
-int strcaseido(const char *text, const char *pattern);
+static int textw(const char *text);
-char *cistrstr(const char *s, const char *sub);
-unsigned int textnw(const char *text, unsigned int len);
-unsigned int textw(const char *text);
 
 #include "config.h"
 
 /* variables */
-char *font = FONT;
+static char *maxname = NULL;
-char *maxname = NULL;
+static char *prompt = NULL;
-char *normbg = NORMBGCOLOR;
+static char text[4096];
-char *normfg = NORMFGCOLOR;
+static int cmdw = 0;
-char *prompt = NULL;
+static int promptw = 0;
-char *selbg = SELBGCOLOR;
+static int ret = 0;
-char *selfg = SELFGCOLOR;
+static int screen;
-char text[4096];
+static unsigned int mw, mh;
-int screen;
+static unsigned int numlockmask = 0;
-int ret = 0;
+static Bool running = True;
-unsigned int cmdw = 0;
+static Display *dpy;
-unsigned int mw, mh;
+static DC dc;
-unsigned int promptw = 0;
+static Item *allitems = NULL;	/* first of all items */
-unsigned int nitem = 0;
+static Item *item = NULL;	/* first of pattern matching items */
-unsigned int numlockmask = 0;
+static Item *sel = NULL;
-Bool idomatch = False;
+static Item *next = NULL;
-Bool running = True;
+static Item *prev = NULL;
-Display *dpy;
+static Item *curr = NULL;
-DC dc = {0};
+static Window root, win;
-Item *allitems = NULL;	/* first of all items */
+static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
-Item *item = NULL;	/* first of pattern matching items */
+static char *(*fstrstr)(const char *, const char *) = strstr;
-Item *sel = NULL;
-Item *next = NULL;
-Item *prev = NULL;
-Item *curr = NULL;
-Window root, win;
 
-Item *
+void
-appenditem(Item *i, Item *last) {
+appenditem(Item *i, Item **list, Item **last) {
-	if(!last)
+	if(!(*last))
-		item = i;
+		*list = i;
 	else
-		last->right = i;
+		(*last)->right = i;
-	i->matched = True;
+	i->left = *last;
-	i->left = last;
 	i->right = NULL;
-	last = i;
+	*last = i;
-	nitem++;
-	return last;
 }
 
 void
 calcoffsets(void) {
-	unsigned int tw, w;
+	int tw;
+	unsigned int w;
 
 	if(!curr)
 		return;
-	w = promptw + cmdw + 2 * SPACE;
+	w = promptw + cmdw + 2 * spaceitem;
 	for(next = curr; next; next=next->right) {
 		tw = textw(next->text);
 		if(tw > mw / 3)
@@ -121,7 +117,7 @@ calcoffsets(void) {
 		if(w > mw)
 			break;
 	}
-	w = promptw + cmdw + 2 * SPACE;
+	w = promptw + cmdw + 2 * spaceitem;
 	for(prev = curr; prev && prev->left; prev=prev->left) {
 		tw = textw(prev->left->text);
 		if(tw > mw / 3)
@@ -132,6 +128,29 @@ calcoffsets(void) {
 	}
 }
 
+char *
+cistrstr(const char *s, const char *sub) {
+	int c, csub;
+	unsigned int len;
+
+	if(!sub)
+		return (char *)s;
+	if((c = *sub++) != 0) {
+		c = tolower(c);
+		len = strlen(sub);
+		do {
+			do {
+				if((csub = *s++) == 0)
+					return (NULL);
+			}
+			while(tolower(csub) != c);
+		}
+		while(strncasecmp(s, sub, len) != 0);
+		s--;
+	}
+	return (char *)s;
+}
+
 void
 cleanup(void) {
 	Item *itm;
@@ -174,7 +193,7 @@ drawmenu(void) {
 	drawtext(text[0] ? text : NULL, dc.norm);
 	dc.x += cmdw;
 	if(curr) {
-		dc.w = SPACE;
+		dc.w = spaceitem;
 		drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
 		dc.x += dc.w;
 		/* determine maximum items */
@@ -185,8 +204,8 @@ drawmenu(void) {
 			drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
 			dc.x += dc.w;
 		}
-		dc.x = mw - SPACE;
+		dc.x = mw - spaceitem;
-		dc.w = SPACE;
+		dc.w = spaceitem;
 		drawtext(next ? ">" : NULL, dc.norm);
 	}
 	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
@@ -195,37 +214,25 @@ drawmenu(void) {
 
 void
 drawtext(const char *text, unsigned long col[ColLast]) {
-	int x, y, w, h;
+	char buf[256];
-	static char buf[256];
+	int i, x, y, h, len, olen;
-	unsigned int len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	if(!text)
 		return;
-	w = 0;
+	olen = strlen(text);
-	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(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
-		buf[--len] = 0;
+	if(!len)
-	if(len < olen) {
+		return;
-		if(len > 1)
+	memcpy(buf, text, len);
-			buf[len - 1] = '.';
+	if(len < olen)
-		if(len > 2)
+		for(i = len; i && i > len - 3; buf[--i] = '.');
-			buf[len - 2] = '.';
-		if(len > 3)
-			buf[len - 3] = '.';
-	}
-	if(w > dc.w)
-		return; /* too long */
 	XSetForeground(dpy, dc.gc, col[ColFG]);
 	if(dc.font.set)
 		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
@@ -233,15 +240,6 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
-void *
-emalloc(unsigned int size) {
-	void *res = malloc(size);
-
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", size);
-	return res;
-}
-
 void
 eprint(const char *errstr, ...) {
 	va_list ap;
@@ -252,15 +250,6 @@ eprint(const char *errstr, ...) {
 	exit(EXIT_FAILURE);
 }
 
-char *
-estrdup(const char *str) {
-	void *res = strdup(str);
-
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", strlen(str));
-	return res;
-}
-
 unsigned long
 getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
@@ -292,8 +281,6 @@ initfont(const char *fontstr) {
 	if(!fontstr || fontstr[0] == '\0')
 		eprint("error, cannot load font: '%s'\n", fontstr);
 	missing = NULL;
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
 	if(missing)
 		XFreeStringList(missing);
@@ -313,9 +300,6 @@ initfont(const char *fontstr) {
 		}
 	}
 	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
 		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
@@ -336,12 +320,11 @@ kpress(XKeyEvent * e) {
 	buf[0] = 0;
 	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
 	if(IsKeypadKey(ksym)) {
-		if(ksym == XK_KP_Enter) {
+		if(ksym == XK_KP_Enter)
 			ksym = XK_Return;
-		} else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) {
+		else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
 			ksym = (ksym - XK_KP_0) + XK_0;
 	}
-	}
 	if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
 	   || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
 	   || IsPrivateKeypadKey(ksym))
@@ -468,11 +451,11 @@ kpress(XKeyEvent * e) {
 		calcoffsets();
 		break;
 	case XK_Return:
-		if((e->state & ShiftMask) && text)
+		if((e->state & ShiftMask) && *text)
 			fprintf(stdout, "%s", text);
 		else if(sel)
 			fprintf(stdout, "%s", sel->text);
-		else if(text)
+		else if(*text)
 			fprintf(stdout, "%s", text);
 		fflush(stdout);
 		running = False;
@@ -499,25 +482,40 @@ kpress(XKeyEvent * e) {
 void
 match(char *pattern) {
 	unsigned int plen;
-	Item *i, *j;
+	Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
 	if(!pattern)
 		return;
 	plen = strlen(pattern);
-	item = j = NULL;
+	item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-	nitem = 0;
 	for(i = allitems; i; i = i->next)
-		i->matched = False;
+		if(!fstrncmp(pattern, i->text, plen + 1))
-	for(i = allitems; i; i = i->next)
+			appenditem(i, &lexact, &exactend);
-		if(!i->matched && !strncasecmp(pattern, i->text, plen))
+		else if(!fstrncmp(pattern, i->text, plen))
-			j = appenditem(i, j);
+			appenditem(i, &lprefix, &prefixend);
-	for(i = allitems; i; i = i->next)
+		else if(fstrstr(i->text, pattern))
-		if(!i->matched && cistrstr(i->text, pattern))
+			appenditem(i, &lsubstr, &substrend);
-			j = appenditem(i, j);
+	if(lexact) {
-	if(idomatch)
+		item = lexact;
-		for(i = allitems; i; i = i->next)
+		itemend = exactend;
-			if(!i->matched && strcaseido(i->text, pattern))
+	}
-				j = appenditem(i, j);
+	if(lprefix) {
+		if(itemend) {
+			itemend->right = lprefix;
+			lprefix->left = itemend;
+		}
+		else
+			item = lprefix;
+		itemend = prefixend;
+	}
+	if(lsubstr) {
+		if(itemend) {
+			itemend->right = lsubstr;
+			lsubstr->left = itemend;
+		}
+		else
+			item = lsubstr;
+	}
 	curr = prev = next = sel = item;
 	calcoffsets();
 }
@@ -533,12 +531,14 @@ readstdin(void) {
 		len = strlen(buf);
 		if (buf[len - 1] == '\n')
 			buf[len - 1] = 0;
-		p = estrdup(buf);
+		if(!(p = strdup(buf)))
+			eprint("fatal: could not strdup() %u bytes\n", strlen(buf));
 		if(max < len) {
 			maxname = p;
 			max = len;
 		}
-		new = emalloc(sizeof(Item));
+		if((new = (Item *)malloc(sizeof(Item))) == NULL)
+			eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
 		new->next = new->left = new->right = NULL;
 		new->text = p;
 		if(!i)
@@ -569,8 +569,12 @@ run(void) {
 }
 
 void
-setup(Bool bottom) {
+setup(Bool topbar) {
-	unsigned int i, j;
+	int i, j, x, y;
+#if XINERAMA
+	int n;
+	XineramaScreenInfo *info = NULL;
+#endif
 	XModifierKeymap *modmap;
 	XSetWindowAttributes wa;
 
@@ -585,20 +589,45 @@ setup(Bool bottom) {
 	XFreeModifiermap(modmap);
 
 	/* style */
-	dc.norm[ColBG] = getcolor(normbg);
+	dc.norm[ColBG] = getcolor(normbgcolor);
-	dc.norm[ColFG] = getcolor(normfg);
+	dc.norm[ColFG] = getcolor(normfgcolor);
-	dc.sel[ColBG] = getcolor(selbg);
+	dc.sel[ColBG] = getcolor(selbgcolor);
-	dc.sel[ColFG] = getcolor(selfg);
+	dc.sel[ColFG] = getcolor(selfgcolor);
 	initfont(font);
 
 	/* menu window */
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-	mw = DisplayWidth(dpy, screen);
+
+	/* menu window geometry */
 	mh = dc.font.height + 2;
-	win = XCreateWindow(dpy, root, 0,
+#if XINERAMA
-			bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
+	if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) {
+		i = 0;
+		if(n > 1) {
+			int di;
+			unsigned int dui;
+			Window dummy;
+			if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
+				for(i = 0; i < n; i++)
+					if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
+						break;
+		}
+		x = info[i].x_org;
+		y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh;
+		mw = info[i].width;
+		XFree(info);
+	}
+	else
+#endif
+	{
+		x = 0;
+		y = topbar ? 0 : DisplayHeight(dpy, screen) - mh;
+		mw = DisplayWidth(dpy, screen);
+	}
+
+	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
@@ -623,37 +652,6 @@ setup(Bool bottom) {
 }
 
 int
-strcaseido(const char *text, const char *pattern) {
-	for(; *text && *pattern; text++)
-		if(tolower((int)*text) == tolower((int)*pattern))
-			pattern++;
-	return !*pattern;
-}                                  
-
-char *
-cistrstr(const char *s, const char *sub) {
-	int c, csub;
-	unsigned int len;
-
-	if(!sub)
-		return (char *)s;
-	if((c = *sub++) != 0) {
-		c = tolower(c);
-		len = strlen(sub);
-		do {
-			do {
-				if((csub = *s++) == 0)
-					return (NULL);
-			}
-			while(tolower(csub) != c);
-		}
-		while(strncasecmp(s, sub, len) != 0);
-		s--;
-	}
-	return (char *)s;
-}
-
-unsigned int
 textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
@@ -664,49 +662,50 @@ textnw(const char *text, unsigned int len) {
 	return XTextWidth(dc.font.xfont, text, len);
 }
 
-unsigned int
+int
 textw(const char *text) {
 	return textnw(text, strlen(text)) + dc.font.height;
 }
 
 int
 main(int argc, char *argv[]) {
-	Bool bottom = False;
 	unsigned int i;
+	Bool topbar = True;
 
 	/* command line args */
 	for(i = 1; i < argc; i++)
-		if(!strcmp(argv[i], "-b")) {
+		if(!strcmp(argv[i], "-i")) {
-			bottom = True;
+			fstrncmp = strncasecmp;
+			fstrstr = cistrstr;
 		}
-		else if(!strcmp(argv[i], "-i"))
+		else if(!strcmp(argv[i], "-b"))
-			idomatch = True;
+			topbar = False;
 		else if(!strcmp(argv[i], "-fn")) {
 			if(++i < argc) font = argv[i];
 		}
 		else if(!strcmp(argv[i], "-nb")) {
-			if(++i < argc) normbg = argv[i];
+			if(++i < argc) normbgcolor = argv[i];
 		}
 		else if(!strcmp(argv[i], "-nf")) {
-			if(++i < argc) normfg = argv[i];
+			if(++i < argc) normfgcolor = argv[i];
 		}
 		else if(!strcmp(argv[i], "-p")) {
 			if(++i < argc) prompt = argv[i];
 		}
 		else if(!strcmp(argv[i], "-sb")) {
-			if(++i < argc) selbg = argv[i];
+			if(++i < argc) selbgcolor = argv[i];
 		}
 		else if(!strcmp(argv[i], "-sf")) {
-			if(++i < argc) selfg = argv[i];
+			if(++i < argc) selfgcolor = argv[i];
 		}
 		else if(!strcmp(argv[i], "-v"))
-			eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, Michał Janeczek\n");
+			eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
 		else
-			eprint("usage: dmenu [-b] [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+			eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
 			       "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
-	setlocale(LC_CTYPE, "");
+	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-	dpy = XOpenDisplay(0);
+		fprintf(stderr, "warning: no locale support\n");
-	if(!dpy)
+	if(!(dpy = XOpenDisplay(0)))
 		eprint("dmenu: cannot open display\n");
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
@@ -720,7 +719,7 @@ main(int argc, char *argv[]) {
 		readstdin();
 	}
 
-	setup(bottom);
+	setup(topbar);
 	drawmenu();
 	XSync(dpy, False);
 	run();

dmenu_path

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

dmenu_run

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