fixed a typo in dmenu.1

.hgtags

@@ -13,3 +13,6 @@ bee7fe6d1189174d0204ca3195b83cdc1bb4f82e 1.2
 2eb9997be51cb1b11a8900728ccc0904f9371157 1.3
 df3fbb050004c544d14e43c36f6a94cca6ed4a69 1.4
 e071fb045bd9e8574947acff7196360bc0270e68 1.5
+dcc5427f99f51a978386a0dd770467cd911ac84b 1.6
+58dbef4aef3d45c7a3da6945e53c9667c0f02d5b 1.7
+3696d77aaf02f5d15728dde3b9e35abcaf291496 1.7.1

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 1.6
+VERSION = 1.8
 
 # Customize below to fit your system
 
@@ -20,6 +20,11 @@ LDFLAGS = ${LIBS}
 #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = -g ${LIBS}
 
+# Solaris
+#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+#LDFLAGS = ${LIBS}
+#CFLAGS += -xtarget=ultra
+
 # compiler and linker
 CC = cc
 LD = ${CC}

dmenu.1

@@ -3,11 +3,13 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
-.RB [ \-font " <name>"]
+.RB [ \-b ]
-.RB [ \-normbg " <color>"]
+.RB [ \-fn " <font>"]
-.RB [ \-normfg " <color>"]
+.RB [ \-nb " <color>"]
-.RB [ \-selbg " <color>"]
+.RB [ \-nf " <color>"]
-.RB [ \-selfg " <color>"]
+.RB [ \-p " <prompt>"]
+.RB [ \-sb " <color>"]
+.RB [ \-sf " <color>"]
 .RB [ \-t " <seconds>"]
 .RB [ \-v ]
 .SH DESCRIPTION
@@ -18,19 +20,25 @@ It manages huge amounts (up to 10.000 and more) of user defined menu items
 efficiently.
 .SS Options
 .TP
-.B \-font <name>
+.B \-b
+makes dmenu appear at the screen bottom (by default it appears at the screen top).
+.TP
+.B \-fn <font>
 defines the font.
 .TP
-.B \-normbg <color>
+.B \-nb <color>
 defines the normal background color (#RGB, #RRGGBB, and color names are supported).
 .TP
-.B \-normfg <color>
+.B \-nf <color>
 defines the normal foreground color (#RGB, #RRGGBB, and color names are supported).
 .TP
-.B \-selbg <color>
+.B \-p <prompt>
+defines a prompt to be displayed before the input area.
+.TP
+.B \-sb <color>
 defines the selected background color (#RGB, #RRGGBB, and color names are supported).
 .TP
-.B \-selfg <color>
+.B \-sf <color>
 defines the selected foreground color (#RGB, #RRGGBB, and color names are supported).
 .TP
 .B \-t <seconds>
@@ -40,7 +48,7 @@ defines the seconds to wait for standard input, before exiting (default is 3).
 prints version information to standard output, then exits.
 .SH USAGE
 dmenu 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
+menu.  When the user selects an item or enters any text and presses Return, his/her
 choice is printed to standard output and dmenu terminates.
 .P
 dmenu is completely controlled by the keyboard. The following keys are recognized:
@@ -52,6 +60,12 @@ only items containing this text will be displayed.
 .B Left/Right
 Select the previous/next item.
 .TP
+.B PageUp/PageDown
+Select the first item of the previous/next 'page' of items.
+.TP
+.B Home/End
+Select the first/last item.
+.TP
 .B Tab
 Copy the selected item to the input field.
 .TP
@@ -77,4 +91,5 @@ Remove enough characters from the input field to change its filtering effect.
 .B Control-u
 Remove all characters from the input field.
 .SH SEE ALSO
-.BR dwm (1)
+.BR dwm (1),
+.BR wmii (1) .

draw.c

@@ -107,11 +107,8 @@ setfont(const char *fontstr) {
 		if(dc.font.xfont)
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
-		dc.font.xfont = XLoadQueryFont(dpy, fontstr);
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
-		if (!dc.font.xfont)
+			eprint("error, cannot load font: '%s'\n", fontstr);
-			dc.font.xfont = XLoadQueryFont(dpy, "fixed");
-		if (!dc.font.xfont)
-			eprint("error, cannot init 'fixed' font\n");
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
 	}

main.c

@@ -25,10 +25,12 @@ struct Item {
 /* static */
 
 static char text[4096];
+static char *prompt = NULL;
 static int mx, my, mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
+static unsigned int promptw = 0;
 static Bool running = True;
 static Item *allitems = NULL;	/* first of all items */
 static Item *item = NULL;	/* first of pattern matching items */
@@ -45,7 +47,7 @@ calcoffsets(void) {
 
 	if(!curr)
 		return;
-	w = cmdw + 2 * SPACE;
+	w = promptw + cmdw + 2 * SPACE;
 	for(next = curr; next; next=next->right) {
 		tw = textw(next->text);
 		if(tw > mw / 3)
@@ -54,7 +56,7 @@ calcoffsets(void) {
 		if(w > mw)
 			break;
 	}
-	w = cmdw + 2 * SPACE;
+	w = promptw + cmdw + 2 * SPACE;
 	for(prev = curr; prev && prev->left; prev=prev->left) {
 		tw = textw(prev->left->text);
 		if(tw > mw / 3)
@@ -74,6 +76,13 @@ drawmenu(void) {
 	dc.w = mw;
 	dc.h = mh;
 	drawtext(NULL, dc.norm);
+	/* print prompt? */
+	if(promptw) {
+		dc.w = promptw;
+		drawtext(prompt, dc.sel);
+	}
+	dc.x += promptw;
+	dc.w = mw - promptw;
 	/* print command */
 	if(cmdw && item)
 		dc.w = cmdw;
@@ -169,45 +178,40 @@ kpress(XKeyEvent * e) {
 			break;
 		}
 	}
+	if(e->state & Mod1Mask) {
 		switch(ksym) {
-	case XK_Left:
+		default: return;
-		if(!(sel && sel->left))
+		case XK_h:
-			return;
+			ksym = XK_Left;
-		sel=sel->left;
-		if(sel->right == curr) {
-			curr = prev;
-			calcoffsets();
-		}
 			break;
-	case XK_Tab:
+		case XK_l:
-		if(!sel)
+			ksym = XK_Right;
-			return;
+			break;
-		strncpy(text, sel->text, sizeof text);
+		case XK_j:
+			ksym = XK_Next;
+			break;
+		case XK_k:
+			ksym = XK_Prior;
+			break;
+		case XK_g:
+			ksym = XK_Home;
+			break;
+		case XK_G:
+			ksym = XK_End;
+			break;
+		}
+	}
+	switch(ksym) {
+	default:
+		if(num && !iscntrl((int) buf[0])) {
+			buf[num] = 0;
+			if(len > 0)
+				strncat(text, buf, sizeof text);
+			else
+				strncpy(text, buf, sizeof text);
 			match(text);
-		break;
-	case XK_Right:
-		if(!(sel && sel->right))
-			return;
-		sel=sel->right;
-		if(sel == next) {
-			curr = next;
-			calcoffsets();
 		}
 		break;
-	case XK_Return:
-		if((e->state & ShiftMask) && text)
-			fprintf(stdout, "%s", text);
-		else if(sel)
-			fprintf(stdout, "%s", sel->text);
-		else if(text)
-			fprintf(stdout, "%s", text);
-		fflush(stdout);
-		running = False;
-		break;
-	case XK_Escape:
-		ret = 1;
-		running = False;
-		break;
 	case XK_BackSpace:
 		if((i = len)) {
 			prev_nitem = nitem;
@@ -218,15 +222,72 @@ kpress(XKeyEvent * e) {
 			match(text);
 		}
 		break;
-	default:
+	case XK_End:
-		if(num && !iscntrl((int) buf[0])) {
+		if(!item)
-			buf[num] = 0;
+			return;
-			if(len > 0)
+		while(next) {
-				strncat(text, buf, sizeof text);
+			sel = curr = next;
-			else
+			calcoffsets();
-				strncpy(text, buf, sizeof text);
-			match(text);
 		}
+		while(sel && sel->right)
+			sel = sel->right;
+		break;
+	case XK_Escape:
+		ret = 1;
+		running = False;
+		break;
+	case XK_Home:
+		if(!item)
+			return;
+		sel = curr = item;
+		calcoffsets();
+		break;
+	case XK_Left:
+		if(!(sel && sel->left))
+			return;
+		sel=sel->left;
+		if(sel->right == curr) {
+			curr = prev;
+			calcoffsets();
+		}
+		break;
+	case XK_Next:
+		if(!next)
+			return;
+		sel = curr = next;
+		calcoffsets();
+		break;
+	case XK_Prior:
+		if(!prev)
+			return;
+		sel = curr = prev;
+		calcoffsets();
+		break;
+	case XK_Return:
+		if((e->state & ShiftMask) && text)
+			fprintf(stdout, "%s", text);
+		else if(sel)
+			fprintf(stdout, "%s", sel->text);
+		else if(text)
+			fprintf(stdout, "%s", text);
+		fflush(stdout);
+		running = False;
+		break;
+	case XK_Right:
+		if(!(sel && sel->right))
+			return;
+		sel=sel->right;
+		if(sel == next) {
+			curr = next;
+			calcoffsets();
+		}
+		break;
+	case XK_Tab:
+		if(!sel)
+			return;
+		strncpy(text, sel->text, sizeof text);
+		match(text);
+		break;
 	}
 	drawmenu();
 }
@@ -269,6 +330,7 @@ DC dc = {0};
 
 int
 main(int argc, char *argv[]) {
+	Bool bottom = False;
 	char *font = FONT;
 	char *maxname;
 	char *normbg = NORMBGCOLOR;
@@ -286,19 +348,25 @@ main(int argc, char *argv[]) {
 	timeout.tv_sec = 3;
 	/* command line args */
 	for(i = 1; i < argc; i++)
-		if(!strncmp(argv[i], "-font", 6)) {
+		if(!strncmp(argv[i], "-b", 3)) {
+			bottom = True;
+		}
+		else if(!strncmp(argv[i], "-fn", 4)) {
 			if(++i < argc) font = argv[i];
 		}
-		else if(!strncmp(argv[i], "-normbg", 8)) {
+		else if(!strncmp(argv[i], "-nb", 4)) {
 			if(++i < argc) normbg = argv[i];
 		}
-		else if(!strncmp(argv[i], "-normfg", 8)) {
+		else if(!strncmp(argv[i], "-nf", 4)) {
 			if(++i < argc) normfg = argv[i];
 		}
-		else if(!strncmp(argv[i], "-selbg", 7)) {
+		else if(!strncmp(argv[i], "-p", 3)) {
+			if(++i < argc) prompt = argv[i];
+		}
+		else if(!strncmp(argv[i], "-sb", 4)) {
 			if(++i < argc) selbg = argv[i];
 		}
-		else if(!strncmp(argv[i], "-selfg", 7)) {
+		else if(!strncmp(argv[i], "-sf", 4)) {
 			if(++i < argc) selfg = argv[i];
 		}
 		else if(!strncmp(argv[i], "-t", 3)) {
@@ -309,7 +377,8 @@ main(int argc, char *argv[]) {
 			exit(EXIT_SUCCESS);
 		}
 		else
-			eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);
+			eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>] [-p <prompt>]\n"
+				"             [-sb <color>] [-sf <color>] [-t <seconds>] [-v]\n", stdout);
 	setlocale(LC_CTYPE, "");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
@@ -343,6 +412,8 @@ main(int argc, char *argv[]) {
 	mx = my = 0;
 	mw = DisplayWidth(dpy, screen);
 	mh = dc.font.height + 2;
+	if(bottom)
+		my += DisplayHeight(dpy, screen) - mh;
 	win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
@@ -355,6 +426,10 @@ main(int argc, char *argv[]) {
 		cmdw = textw(maxname);
 	if(cmdw > mw / 3)
 		cmdw = mw / 3;
+	if(prompt)
+		promptw = textw(prompt);
+	if(promptw > mw / 5)
+		promptw = mw / 5;
 	text[0] = 0;
 	match(text);
 	XMapRaised(dpy, win);