updated man page

.hgtags

@@ -1 +1,5 @@
 fcc8a282cb52c6a9343b461026b386825590cd31 0.1
+656be0f47df545dfdd2e1e0663663b8b1b26f031 0.2
+d352e9dc112ee96aa5cad961a0ed880ae9ce7276 0.3
+7acf0dde1120542917bae12e0e42293f9d2cc899 0.4
+4a0ecd881c4fc15de4a0bebd79308b064be020ef 0.5

Makefile

@@ -7,19 +7,19 @@ SRC = draw.c main.c util.c
 OBJ = ${SRC:.c=.o}
 
 all: options dmenu
-	@echo finished
 
 options:
 	@echo dmenu build options:
 	@echo "CFLAGS   = ${CFLAGS}"
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
+	@echo "LD       = ${LD}"
 
 .c.o:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: dmenu.h config.h
+${OBJ}: dmenu.h config.h config.mk
 
 config.h:
 	@echo creating $@ from config.default.h
@@ -27,7 +27,7 @@ config.h:
 
 dmenu: ${OBJ}
 	@echo LD $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@${LD} -o $@ ${OBJ} ${LDFLAGS}
 	@strip $@
 
 clean:
@@ -50,7 +50,7 @@ install: all
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
 	@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:

README

@@ -1,7 +1,6 @@
 dmenu - dynamic menu
 --------------------
-dwm is a generic, highly customizable, and efficient menu for the
-X Window System.
+dmenu is a generic, highly customizable, and efficient menu for X. 
 
 
 Requirements
@@ -11,7 +10,7 @@ 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 dmenu (if

config.arg.h

@@ -3,7 +3,8 @@
  * See LICENSE file for license details.
  */
 
-#define FONT			"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR			"#0a2c2d"
-#define FGCOLOR			"#ddeeee"
-#define BORDERCOLOR		"#176164"
+#define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
+#define SELBGCOLOR		"#333366"
+#define SELFGCOLOR		"#eeeeee"
+#define NORMBGCOLOR		"#333333"
+#define NORMFGCOLOR		"#dddddd"

config.default.h

@@ -4,6 +4,7 @@
  */
 
 #define FONT			"fixed"
-#define BGCOLOR			"#666699"
-#define FGCOLOR			"#eeeeee"
-#define BORDERCOLOR		"#9999CC"
+#define SELBGCOLOR		"#666699"
+#define SELFGCOLOR		"#eeeeee"
+#define NORMBGCOLOR		"#333366"
+#define NORMFGCOLOR		"#cccccc"

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 0.2
+VERSION = 0.6
 
 # Customize below to fit your system
 
@@ -11,7 +11,7 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # includes and libs
-INCS = -I/usr/lib -I${X11INC}
+INCS = -I. -I/usr/include -I${X11INC}
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 
 # flags
@@ -20,5 +20,6 @@ LDFLAGS = ${LIBS}
 #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = -g ${LIBS}
 
-# compiler
+# compiler and linker
 CC = cc
+LD = ${CC}

dmenu.1

@@ -1,4 +1,4 @@
-.TH DMENU 1 d-0.0
+.TH DMENU 1 dmenu-VERSION
 .SH NAME
 dmenu \- dynamic menu
 .SH SYNOPSIS
@@ -7,54 +7,53 @@ dmenu \- dynamic menu
 .SH DESCRIPTION
 .SS Overview
 .B dmenu
-is a generic, highly customizable, and efficient menu for the X Window System,
+is a generic, highly customizable, and efficient menu for X,
 originally designed for
 .BR dwm (1).
 It supports arbitrary, user defined menu contents.
 .SS Options
 .TP
 .B \-v
-prints version information to stdout, then exits.
-.SS Usage
+prints version information to standard output, then exits.
+.SH USAGE
 .B dmenu
-reads a list of newline-separated items from stdin and creates a menu.
-When the user selects an item or enters any text and presses Enter, his choice
-is printed to stdout and
+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, his choice
+is printed to standard output and
 .B dmenu
 terminates.
-.SS Keyboard Control 
 .B dmenu
 is completely controlled by the keyboard.  The following keys are recognized:
-.TP 2
+.TP
 Any printable character
-appends the character to the text in the input field. This works as a filter:
+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
+.TP
+Left/Right
+Select the previous/next item.
+.TP
+Tab
+Copy the selected item to the input field.
+.TP
+Return
+Confirm selection and quit (print the selected item to standard output).
+.TP
+Shift-Return
+Confirm selection and quit (print the text in the input field to standard output).
+.TP
+Escape
+Quit without selecting an item.
+.TP
 Backspace (Control-h)
-remove enough characters from the input field to change its filtering effect.
-.TP 2
+Remove enough characters from the input field to change its filtering effect.
+.TP
 Control-u
-remove all characters from the input field.
-.SS Exit codes
+Remove all characters from the input field.
+.P
 .B dmenu
 returns
 .B 0
-if Enter is pressed on termination,
+if Return is pressed on termination,
 .B 1
 if Escape is pressed.
 .SH CUSTOMIZATION

dmenu.h

@@ -9,7 +9,9 @@
 
 #define SPACE		30 /* px */
 
-typedef struct Brush Brush;
+/* color */
+enum { ColFG, ColBG, ColLast };
+
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 
@@ -23,9 +25,8 @@ struct Fnt {
 
 struct DC { /* draw context */
 	int x, y, w, h;
-	unsigned long bg;
-	unsigned long fg;
-	unsigned long border;
+	unsigned long norm[ColLast];
+	unsigned long sel[ColLast];
 	Drawable drawable;
 	Fnt font;
 	GC gc;
@@ -36,7 +37,7 @@ extern Display *dpy;
 extern DC dc;
 
 /* draw.c */
-extern void drawtext(const char *text, Bool invert, Bool border);
+extern void drawtext(const char *text, unsigned long col[ColLast]);
 extern unsigned long getcolor(const char *colstr);
 extern void setfont(const char *fontstr);
 extern unsigned int textw(const char *text);

draw.c

@@ -9,26 +9,6 @@
 
 /* static */
 
-static void
-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)
 {
@@ -44,25 +24,22 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
-drawtext(const char *text, Bool invert, Bool border)
+drawtext(const char *text, unsigned long col[ColLast])
 {
 	int x, y, w, h;
 	static char buf[256];
-	unsigned int len;
+	unsigned int len, olen;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
-	w = 0;
-	if(border)
-		drawborder();
-
 	if(!text)
 		return;
 
-	len = strlen(text);
+	w = 0;
+	olen = len = strlen(text);
 	if(len >= sizeof(buf))
 		len = sizeof(buf) - 1;
 	memcpy(buf, text, len);
@@ -75,21 +52,28 @@ drawtext(const char *text, Bool invert, Bool border)
 	/* shorten text if necessary */
 	while(len && (w = textnw(buf, len)) > dc.w - h)
 		buf[--len] = 0;
+	if(len < olen) {
+		if(len > 1)
+			buf[len - 1] = '.';
+		if(len > 2)
+			buf[len - 2] = '.';
+		if(len > 3)
+			buf[len - 3] = '.';
+	}
 
 	if(w > dc.w)
 		return; /* too long */
 
-	gcv.foreground = invert ? dc.bg : dc.fg;
-	gcv.background = invert ? dc.fg : dc.bg;
+	gcv.foreground = col[ColFG];
 	if(dc.font.set) {
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-		XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
+		XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc,
 				x, y, buf, len);
 	}
 	else {
 		gcv.font = dc.font.xfont->fid;
-		XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
-		XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+		XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
 }
 

main.c

@@ -29,7 +29,7 @@ static int mx, my, mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
-static Bool done = False;
+static Bool running = True;
 static Item *allitems = NULL;	/* first of all items */
 static Item *item = NULL;	/* first of pattern matching items */
 static Item *sel = NULL;
@@ -77,17 +77,17 @@ drawmenu()
 	dc.y = 0;
 	dc.w = mw;
 	dc.h = mh;
-	drawtext(NULL, False, False);
+	drawtext(NULL, dc.norm);
 
 	/* print command */
 	if(cmdw && item)
 		dc.w = cmdw;
-	drawtext(text[0] ? text : NULL, False, False);
+	drawtext(text[0] ? text : NULL, dc.norm);
 	dc.x += cmdw;
 
 	if(curr) {
 		dc.w = SPACE;
-		drawtext((curr && curr->left) ? "<" : NULL, False, False);
+		drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
 		dc.x += dc.w;
 
 		/* determine maximum items */
@@ -95,13 +95,13 @@ drawmenu()
 			dc.w = textw(i->text);
 			if(dc.w > mw / 3)
 				dc.w = mw / 3;
-			drawtext(i->text, sel == i, sel == i);
+			drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
 			dc.x += dc.w;
 		}
 
 		dc.x = mw - SPACE;
 		dc.w = SPACE;
-		drawtext(next ? ">" : NULL, False, False);
+		drawtext(next ? ">" : NULL, dc.norm);
 	}
 	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
 	XFlush(dpy);
@@ -172,18 +172,16 @@ kpress(XKeyEvent * e)
 			return;
 			break;
 		case XK_h:
+		case XK_H:
 			ksym = XK_BackSpace;
 			break;
-		case XK_U:
 		case XK_u:
+		case XK_U:
 			text[0] = 0;
 			match(text);
 			drawmenu();
 			return;
 			break;
-		case XK_bracketleft:
-			ksym = XK_Escape;
-			break;
 		}
 	}
 	switch(ksym) {
@@ -221,11 +219,11 @@ kpress(XKeyEvent * e)
 		else if(text)
 			fprintf(stdout, "%s", text);
 		fflush(stdout);
-		done = True;
+		running = False;
 		break;
 	case XK_Escape:
 		ret = 1;
-		done = True;
+		running = False;
 		break;
 	case XK_BackSpace:
 		if((i = len)) {
@@ -292,6 +290,7 @@ int
 main(int argc, char *argv[])
 {
 	char *maxname;
+	Item *i;
 	XEvent ev;
 	XSetWindowAttributes wa;
 
@@ -316,9 +315,10 @@ main(int argc, char *argv[])
 		usleep(1000);
 
 	/* style */
-	dc.bg = getcolor(BGCOLOR);
-	dc.fg = getcolor(FGCOLOR);
-	dc.border = getcolor(BORDERCOLOR);
+	dc.sel[ColBG] = getcolor(SELBGCOLOR);
+	dc.sel[ColFG] = getcolor(SELFGCOLOR);
+	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
 	setfont(FONT);
 
 	wa.override_redirect = 1;
@@ -327,7 +327,7 @@ main(int argc, char *argv[])
 
 	mx = my = 0;
 	mw = DisplayWidth(dpy, screen);
-	mh = dc.font.height + 4;
+	mh = dc.font.height + 2;
 
 	win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
@@ -338,6 +338,7 @@ main(int argc, char *argv[])
 	/* pixmap */
 	dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
+	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 
 	if(maxname)
 		cmdw = textw(maxname);
@@ -351,7 +352,7 @@ main(int argc, char *argv[])
 	XSync(dpy, False);
 
 	/* main event loop */
-	while(!done && !XNextEvent(dpy, &ev)) {
+	while(running && !XNextEvent(dpy, &ev)) {
 		switch (ev.type) {
 		case KeyPress:
 			kpress(&ev.xkey);
@@ -366,6 +367,16 @@ main(int argc, char *argv[])
 	}
 
 	XUngrabKeyboard(dpy, CurrentTime);
+	while(allitems) {
+		i = allitems->next;
+		free(allitems->text);
+		free(allitems);
+		allitems = i;
+	}
+	if(dc.font.set)
+		XFreeFontSet(dpy, dc.font.set);
+	else
+		XFreeFont(dpy, dc.font.xfont);
 	XFreePixmap(dpy, dc.drawable);
 	XFreeGC(dpy, dc.gc);
 	XDestroyWindow(dpy, win);

util.c

@@ -13,7 +13,7 @@
 /* static */
 
 static void
-bad_malloc(unsigned int size)
+badmalloc(unsigned int size)
 {
 	eprint("fatal: could not malloc() %u bytes\n", size);
 }
@@ -25,7 +25,7 @@ emalloc(unsigned int size)
 {
 	void *res = malloc(size);
 	if(!res)
-		bad_malloc(size);
+		badmalloc(size);
 	return res;
 }
 
@@ -45,6 +45,6 @@ estrdup(const char *str)
 {
 	void *res = strdup(str);
 	if(!res)
-		bad_malloc(strlen(str));
+		badmalloc(strlen(str));
 	return res;
 }