bugfix

.hgtags

@@ -42,3 +42,6 @@ e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2
 78f9f72cc9c6bdb022ff8908486b61ef5e242aad 4.0
 844587572673cf6326c3f61737264a46b728fc0a 4.1
 72749a826cab0baa805620e44a22e54486c97a4e 4.1.1
+379813a051f03a1b20bdbfdc2d2d1d2d794ace48 4.2
+abb6579a324fffdf6a23c2fa4c32911277da594a 4.2.1
+14c79f054bdf43ff3213af8e60a783192e92a018 4.3

LICENSE

@@ -1,7 +1,7 @@
 MIT/X Consortium License
 
-© 2010 Connor Lane Smith <cls@lubutu.com>
+© 2010-2011 Connor Lane Smith <cls@lubutu.com>
-© 2006-2010 Anselm R Garbe <anselm@garbe.us>
+© 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>

Makefile

@@ -3,7 +3,10 @@
 
 include config.mk
 
-all: options dmenu dmenu_path
+SRC = dmenu.c draw.c
+OBJ = ${SRC:.c=.o}
+
+all: options dmenu
 
 options:
 	@echo dmenu build options:
@@ -11,25 +14,24 @@ options:
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
 
-dmenu: dmenu.o draw.o
+.c.o:
-dmenu_path: dmenu_path.o
-
-.c.o: config.mk
 	@echo CC -c $<
 	@${CC} -c $< ${CFLAGS}
 
-dmenu dmenu_path:
+${OBJ}: config.mk
+
+dmenu: ${OBJ}
 	@echo CC -o $@
-	@${CC} -o $@ $+ ${LDFLAGS}
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
 	@echo cleaning
-	@rm -f dmenu dmenu.o draw.o dmenu_path dmenu_path.o dmenu-${VERSION}.tar.gz
+	@rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
 
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp LICENSE Makefile README config.mk dmenu.1 dmenu.c dmenu_path.c dmenu_run 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}

config.mk

@@ -1,7 +1,5 @@
 # dmenu version
-VERSION = 4.2
+VERSION = 4.3.1
-
-# Customize below to fit your system
 
 # paths
 PREFIX = /usr/local
@@ -20,7 +18,7 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
 CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+CFLAGS   = -ansi -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 LDFLAGS  = -s ${LIBS}
 
 # compiler and linker

dmenu.1

@@ -4,11 +4,10 @@ dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
 .RB [ \-b ]
+.RB [ \-f ]
 .RB [ \-i ]
 .RB [ \-l
 .IR lines ]
-.RB [ \-m
-.IR monitor ]
 .RB [ \-p
 .IR prompt ]
 .RB [ \-fn
@@ -30,32 +29,33 @@ dmenu \- dynamic menu
 .B dmenu
 is a dynamic menu for X, originally designed for
 .BR dwm (1).
-It manages huge numbers of user-defined menu items efficiently.
+It manages huge numbers of user\-defined menu items efficiently.
 .P
-dmenu reads a list of newline-separated items from standard input and creates a
+dmenu reads a list of newline\-separated items from stdin and creates a menu.
-menu.  When the user selects an item or enters any text and presses Return,
+When the user selects an item or enters any text and presses Return, their
-their choice is printed to standard output and dmenu terminates.
+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 program used by dmenu_run to find and cache a list of executables.
+is a script 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 \-f
+dmenu grabs the keyboard before reading stdin.  This is faster, but may lock up
+X if stdin is from a terminal.
+.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
@@ -66,7 +66,7 @@ defines the font or font set used.
 defines the normal background color.
 .IR #RGB ,
 .IR #RRGGBB ,
-and color names are supported.
+and X color names are supported.
 .TP
 .BI \-nf " color"
 defines the normal foreground color.
@@ -78,27 +78,26 @@ defines the selected background 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 is completely controlled by the keyboard.  Besides standard Unix line
-editing and item selection (Up/Down/Left/Right, PageUp/PageDown, Home/End), the
+editing and item selection (arrow keys, page up/down, home and end), the
 following keys are recognized:
 .TP
-.B Tab (Control\-i)
+.B Tab (Ctrl\-i)
 Copy the selected item to the input field.
 .TP
-.B Return (Control\-j)
+.B Return (Ctrl\-j)
-Confirm selection.  Prints the selected item to standard output and exits,
+Confirm selection.  Prints the selected item to stdout and exits, returning
-returning success.
-.TP
-.B Shift\-Return (Control\-Shift\-j)
-Confirm input.  Prints the input text to standard output and exits, returning
 success.
 .TP
-.B Escape (Control\-c)
+.B Shift\-Return (Ctrl\-Shift\-j)
+Confirm input.  Prints the input text to stdout and exits, returning success.
+.TP
+.B Escape (Ctrl\-c)
 Exit without selecting an item, returning failure.
 .TP
-.B Control\-y
+.B Ctrl\-y
 Paste the current X selection into the input field.
 .SH SEE ALSO
 .BR dwm (1)

dmenu.c

@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -19,8 +20,7 @@
 typedef struct Item Item;
 struct Item {
 	char *text;
-	Item *next;          /* traverses all items */
+	Item *left, *right;
-	Item *left, *right;  /* traverses matching items */
 };
 
 static void appenditem(Item *item, Item **list, Item **last);
@@ -28,22 +28,20 @@ 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 insert(const char *str, ssize_t n);
 static void keypress(XKeyEvent *ev);
-static void match(void);
+static void match(Bool sub);
-static size_t nextrune(int incr);
+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 char text[BUFSIZ] = "";
 static int bh, mw, mh;
-static int inputw = 0;
+static int inputw, promptw;
 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;
@@ -57,34 +55,34 @@ static Atom utf8;
 static Bool topbar = True;
 static DC *dc;
 static Item *items = NULL;
-static Item *matches, *sel;
+static Item *matches, *matchend;
-static Item *prev, *curr, *next;
+static Item *prev, *curr, *next, *sel;
-static Window root, win;
+static Window win;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 
 int
 main(int argc, char *argv[]) {
+	Bool fast = False;
 	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);
+			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 == argc-1)
+		else if(i+1 == argc)
 			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"))
@@ -102,7 +100,15 @@ main(int argc, char *argv[]) {
 
 	dc = initdc();
 	initfont(dc, font);
-	readstdin();
+
+	if(fast) {
+		grabkeyboard();
+		readstdin();
+	}
+	else {
+		readstdin();
+		grabkeyboard();
+	}
 	setup();
 	run();
 
@@ -122,7 +128,7 @@ appenditem(Item *item, Item **list, Item **last) {
 
 void
 calcoffsets(void) {
-	unsigned int i, n;
+	int i, n;
 
 	if(lines > 0)
 		n = lines * bh;
@@ -197,7 +203,8 @@ grabkeyboard(void) {
 	int i;
 
 	for(i = 0; i < 1000; i++) {
-		if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+		if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
+		                 GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
 			return;
 		usleep(1000);
 	}
@@ -205,26 +212,27 @@ grabkeyboard(void) {
 }
 
 void
-insert(const char *s, ssize_t n) {
+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));
+	memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
 	if(n > 0)
-		memcpy(text + cursor, s, n);
+		memcpy(&text[cursor], str, n);
 	cursor += n;
-	match();
+	match(n > 0 && text[cursor] == '\0');
 }
 
 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)) {
+		KeySym lower, upper;
+
+		XConvertCase(ksym, &lower, &upper);
+		switch(lower) {
 		default:
 			return;
 		case XK_a:
@@ -256,7 +264,7 @@ keypress(XKeyEvent *ev) {
 			break;
 		case XK_k:  /* delete right */
 			text[cursor] = '\0';
-			match();
+			match(False);
 			break;
 		case XK_n:
 			ksym = XK_Down;
@@ -284,7 +292,7 @@ keypress(XKeyEvent *ev) {
 			insert(buf, strlen(buf));
 		break;
 	case XK_Delete:
-		if(cursor == len)
+		if(text[cursor] == '\0')
 			return;
 		cursor = nextrune(+1);
 	case XK_BackSpace:
@@ -292,16 +300,19 @@ keypress(XKeyEvent *ev) {
 			insert(NULL, nextrune(-1) - cursor);
 		break;
 	case XK_End:
-		if(cursor < len) {
+		if(text[cursor] != '\0') {
-			cursor = len;
+			cursor = strlen(text);
 			break;
 		}
-		while(next) {
+		if(next) {
-			sel = curr = next;
+			curr = matchend;
 			calcoffsets();
+			curr = prev;
+			calcoffsets();
+			while(next && (curr = curr->right))
+				calcoffsets();
 		}
-		while(sel && sel->right)
+		sel = matchend;
-			sel = sel->right;
 		break;
 	case XK_Escape:
 		exit(EXIT_FAILURE);
@@ -341,10 +352,9 @@ keypress(XKeyEvent *ev) {
 	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) {
+		if(text[cursor] != '\0') {
 			cursor = nextrune(+1);
 			break;
 		}
@@ -361,58 +371,58 @@ keypress(XKeyEvent *ev) {
 			return;
 		strncpy(text, sel->text, sizeof text);
 		cursor = strlen(text);
-		match();
+		match(True);
 		break;
 	}
 	drawmenu();
 }
 
 void
-match(void) {
+match(Bool sub) {
-	size_t len;
+	size_t len = strlen(text);
-	Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+	Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+	Item *item, *lnext;
 
-	len = strlen(text);
+	lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
-	matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
+	for(item = sub ? matches : items; item && item->text; item = lnext) {
-	for(item = items; item; item = item->next)
+		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);
-
-	if(lexact) {
-		matches = lexact;
-		itemend = exactend;
 	}
+	matches = lexact;
+	matchend = exactend;
+
 	if(lprefix) {
-		if(itemend) {
+		if(matchend) {
-			itemend->right = lprefix;
+			matchend->right = lprefix;
-			lprefix->left = itemend;
+			lprefix->left = matchend;
 		}
 		else
 			matches = lprefix;
-		itemend = prefixend;
+		matchend = prefixend;
 	}
 	if(lsubstr) {
-		if(itemend) {
+		if(matchend) {
-			itemend->right = lsubstr;
+			matchend->right = lsubstr;
-			lsubstr->left = itemend;
+			lsubstr->left = matchend;
 		}
 		else
 			matches = lsubstr;
+		matchend = substrend;
 	}
-	curr = prev = next = sel = matches;
+	curr = sel = matches;
 	calcoffsets();
 }
 
 size_t
-nextrune(int incr) {
+nextrune(int inc) {
-	size_t n, len;
+	ssize_t n;
 
-	len = strlen(text);
+	for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
-	for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
 	return n;
 }
 
@@ -425,26 +435,30 @@ paste(void) {
 
 	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));
+	insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));
 	XFree(p);
 	drawmenu();
 }
 
 void
 readstdin(void) {
-	char buf[sizeof text], *p;
+	char buf[sizeof text], *p, *maxstr = NULL;
-	Item *item, **end;
+	size_t i, max = 0, size = 0;
 
-	for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
+	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(!(item = malloc(sizeof *item)))
+		if(!(items[i].text = strdup(buf)))
-			eprintf("cannot malloc %u bytes\n", sizeof *item);
+			eprintf("cannot strdup %u bytes:", strlen(buf)+1);
-		if(!(item->text = strdup(buf)))
+		if(strlen(items[i].text) > max)
-			eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
+			max = strlen(maxstr = items[i].text);
-		item->next = item->left = item->right = NULL;
-		inputw = MAX(inputw, textw(dc, item->text));
 	}
+	if(items)
+		items[i].text = NULL;
+	inputw = maxstr ? textw(dc, maxstr) : 0;
 }
 
 void
@@ -473,21 +487,20 @@ run(void) {
 
 void
 setup(void) {
-	int x, y, screen;
+	int x, y, screen = DefaultScreen(dc->dpy);
+	Window root = RootWindow(dc->dpy, 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[ColBG]  = getcolor(dc, selbgcolor);
-	selcol[ColFG] = getcolor(dc, selfgcolor);
+	selcol[ColFG]  = getcolor(dc, selfgcolor);
+
+	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
 
 	/* menu geometry */
 	bh = dc->font.height + 2;
@@ -500,9 +513,8 @@ setup(void) {
 		Window dw;
 
 		XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
-		for(i = 0; i < n; i++)
+		for(i = 0; i < n-1; i++)
-			if((monitor == info[i].screen_number)
+			if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
-			|| (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);
@@ -516,6 +528,10 @@ setup(void) {
 		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;
@@ -525,18 +541,14 @@ setup(void) {
 	                    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';
+	resizedc(dc, mw, mh);
-	match();
+	drawmenu();
 }
 
 void
 usage(void) {
-	fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+	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_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_path.c

@@ -1,101 +0,0 @@
-/* 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;
-}

draw.c

@@ -7,33 +7,28 @@
 #include <X11/Xlib.h>
 #include "draw.h"
 
-#define MAX(a, b)   ((a) > (b) ? (a) : (b))
+#define MAX(a, b)  ((a) > (b) ? (a) : (b))
-#define MIN(a, b)   ((a) < (b) ? (a) : (b))
+#define MIN(a, b)  ((a) < (b) ? (a) : (b))
-#define DEFFONT     "fixed"
+#define DEFAULTFN  "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);
+	if(fill)
+		XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h);
+	else
+		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[256];
+	char buf[BUFSIZ];
-	size_t n, mn;
+	size_t mn, n = strlen(text);
 
 	/* shorten text if necessary */
-	n = strlen(text);
+	for(mn = MIN(n, sizeof buf); textnw(dc, text, mn) + dc->font.height/2 > dc->w; mn--)
-	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);
@@ -46,10 +41,8 @@ drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
 
 void
 drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
-	int x, y;
+	int x = dc->x + dc->font.height/2;
-
+	int y = dc->y + dc->font.ascent+1;
-	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)
@@ -64,10 +57,14 @@ void
 eprintf(const char *fmt, ...) {
 	va_list ap;
 
-	fprintf(stderr, "%s: ", progname);
 	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);
 }
 
@@ -99,27 +96,24 @@ initdc(void) {
 	DC *dc;
 
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-		weprintf("no locale support\n");
+		fprintf(stderr, "no locale support\n");
-	if(!(dc = malloc(sizeof *dc)))
+	if(!(dc = calloc(1, sizeof *dc)))
-		eprintf("cannot malloc %u bytes\n", 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);
-	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(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
 		if(fontstr != NULL)
-			weprintf("cannot load font '%s'\n", fontstr);
+			fprintf(stderr, "cannot load font '%s'\n", fontstr);
-		if(fontstr == NULL || !loadfont(dc, DEFFONT))
+		if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
-			eprintf("cannot load font '%s'\n", DEFFONT);
+			eprintf("cannot load font '%s'\n", DEFAULTFN);
 	}
 	dc->font.height = dc->font.ascent + dc->font.descent;
 }
@@ -159,12 +153,11 @@ 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
@@ -182,13 +175,3 @@ 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

@@ -20,18 +20,15 @@ typedef struct {
 	} 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 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);
-void eprintf(const char *fmt, ...);
-void weprintf(const char *fmt, ...);
-
-const char *progname;