removed finished message

.hgtags

@@ -1 +1,3 @@
 fcc8a282cb52c6a9343b461026b386825590cd31 0.1
+656be0f47df545dfdd2e1e0663663b8b1b26f031 0.2
+d352e9dc112ee96aa5cad961a0ed880ae9ce7276 0.3

Makefile

@@ -7,13 +7,13 @@ 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 $<
@@ -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,6 +1,6 @@
 dmenu - dynamic menu
 --------------------
-dwm is a generic, highly customizable, and efficient menu for the
+dmenu is a generic, highly customizable, and efficient menu for the
 X Window System.
 
 
@@ -11,7 +11,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,7 @@
  * See LICENSE file for license details.
  */
 
-#define FONT			"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
+#define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
-#define BGCOLOR			"#0a2c2d"
+#define BGCOLOR			"#0d121d"
-#define FGCOLOR			"#ddeeee"
+#define FGCOLOR			"#eeeeee"
-#define BORDERCOLOR		"#176164"
+#define BORDERCOLOR		"#3f484d"

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 0.2
+VERSION = 0.4
 
 # Customize below to fit your system
 
@@ -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
@@ -15,46 +15,45 @@ It supports arbitrary, user defined menu contents.
 .TP
 .B \-v
 prints version information to stdout, then exits.
-.SS Usage
+.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
+When the user selects an item or enters any text and presses Return, his choice
 is printed to stdout 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
+.TP
-Left/Right (Control-p/Control-n)
+Left/Right
-select the previous/next item.
+Select the previous/next item.
-.TP 2
+.TP
-Tab (Control-i)
+Tab
-copy the selected item to the input field.
+Copy the selected item to the input field.
-.TP 2
+.TP
-Enter (Control-j)
+Return
-confirm selection and quit (print the selected item to stdout).
+Confirm selection and quit (print the selected item to stdout).
-.TP 2
+.TP
-Shift-Enter (Shift-Control-j)
+Shift-Return
-confirm selection and quit (print the text in the input field to stdout).
+Confirm selection and quit (print the text in the input field to stdout).
-.TP 2
+.TP
-Escape (Control-[)
+Escape
-quit without selecting an item.
+Quit without selecting an item.
-.TP 2
+.TP
 Backspace (Control-h)
-remove enough characters from the input field to change its filtering effect.
+Remove enough characters from the input field to change its filtering effect.
-.TP 2
+.TP
 Control-u
-remove all characters from the input field.
+Remove all characters from the input field.
-.SS Exit codes
+.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,6 @@
 
 #define SPACE		30 /* px */
 
-typedef struct Brush Brush;
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 

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)
 {
@@ -48,21 +28,35 @@ drawtext(const char *text, Bool invert, Bool border)
 {
 	int x, y, w, h;
 	static char buf[256];
-	unsigned int len;
+	unsigned int len, olen;
 	XGCValues gcv;
+	XPoint points[5];
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
 	w = 0;
-	if(border)
+	if(border) {
-		drawborder();
+		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);
+	}
 
 	if(!text)
 		return;
 
-	len = strlen(text);
+	olen = len = strlen(text);
 	if(len >= sizeof(buf))
 		len = sizeof(buf) - 1;
 	memcpy(buf, text, len);
@@ -75,6 +69,14 @@ 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 */

main.c

@@ -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) {