changed text in dmenu manpage

.hgtags

@@ -11,3 +11,6 @@ d046c818ea467555cc338751c9bf3024609f1f12 0.9
 e8c1e9733752db12f2dbd1fa93c46f5806242ba9 1.1
 bee7fe6d1189174d0204ca3195b83cdc1bb4f82e 1.2
 2eb9997be51cb1b11a8900728ccc0904f9371157 1.3
+df3fbb050004c544d14e43c36f6a94cca6ed4a69 1.4
+e071fb045bd9e8574947acff7196360bc0270e68 1.5
+dcc5427f99f51a978386a0dd770467cd911ac84b 1.6

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 1.4
+VERSION = 1.7
 
 # Customize below to fit your system
 

dmenu.1

@@ -8,6 +8,7 @@ dmenu \- dynamic menu
 .RB [ \-normfg " <color>"]
 .RB [ \-selbg " <color>"]
 .RB [ \-selfg " <color>"]
+.RB [ \-p " <prompt>"]
 .RB [ \-t " <seconds>"]
 .RB [ \-v ]
 .SH DESCRIPTION
@@ -33,6 +34,9 @@ defines the selected background color (#RGB, #RRGGBB, and color names are suppor
 .B \-selfg <color>
 defines the selected foreground color (#RGB, #RRGGBB, and color names are supported).
 .TP
+.B \-p <prompt>
+defines a prompt to be displayed before the input area.
+.TP
 .B \-t <seconds>
 defines the seconds to wait for standard input, before exiting (default is 3).
 .TP
@@ -40,7 +44,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 +56,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

dmenu.h

@@ -3,14 +3,13 @@
  */
 
 #include <X11/Xlib.h>
-#include <X11/Xlocale.h>
 
-#define FONT			"fixed"
+#define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
 #define NORMBGCOLOR		"#333366"
 #define NORMFGCOLOR		"#cccccc"
 #define SELBGCOLOR		"#666699"
 #define SELFGCOLOR		"#eeeeee"
-#define SPACE		30 /* px */
+#define SPACE			30 /* px */
 
 /* color */
 enum { ColFG, ColBG, ColLast };

draw.c

@@ -4,7 +4,6 @@
 #include "dmenu.h"
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlocale.h>
 
 /* static */
 
@@ -35,8 +34,8 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 		return;
 	w = 0;
 	olen = len = strlen(text);
-	if(len >= sizeof(buf))
+	if(len >= sizeof buf)
-		len = sizeof(buf) - 1;
+		len = sizeof buf - 1;
 	memcpy(buf, text, len);
 	buf[len] = 0;
 	h = dc.font.ascent + dc.font.descent;
@@ -80,21 +79,15 @@ getcolor(const char *colstr) {
 
 void
 setfont(const char *fontstr) {
-	char **missing, *def;
+	char *def, **missing;
 	int i, n;
 
 	missing = NULL;
-	setlocale(LC_ALL, "");
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-	if(missing) {
+	if(missing)
 		XFreeStringList(missing);
-		if(dc.font.set) {
-			XFreeFontSet(dpy, dc.font.set);
-			dc.font.set = NULL;
-		}
-	}
 	if(dc.font.set) {
 		XFontSetExtents *font_extents;
 		XFontStruct **xfonts;
@@ -114,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

@@ -5,6 +5,7 @@
 #include "dmenu.h"
 
 #include <ctype.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -24,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 */
@@ -44,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)
@@ -53,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)
@@ -73,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;
@@ -144,7 +154,7 @@ kpress(XKeyEvent * e) {
 
 	len = strlen(text);
 	buf[0] = 0;
-	num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
+	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
 	if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
 			|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
 			|| IsPrivateKeypadKey(ksym))
@@ -169,6 +179,42 @@ kpress(XKeyEvent * e) {
 		}
 	}
 	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_BackSpace:
+		if((i = len)) {
+			prev_nitem = nitem;
+			do {
+				text[--i] = 0;
+				match(text);
+			} while(i && nitem && prev_nitem == nitem);
+			match(text);
+		}
+		break;
+	case XK_End:
+		while(next) {
+			sel = curr = next;
+			calcoffsets();
+		}
+		while(sel->right)
+			sel = sel->right;
+		break;
+	case XK_Escape:
+		ret = 1;
+		running = False;
+		break;
+	case XK_Home:
+		sel = curr = item;
+		calcoffsets();
+		break;
 	case XK_Left:
 		if(!(sel && sel->left))
 			return;
@@ -178,18 +224,15 @@ kpress(XKeyEvent * e) {
 			calcoffsets();
 		}
 		break;
-	case XK_Tab:
+	case XK_Next:
-		if(!sel)
+		if(next) {
-			return;
+			sel = curr = next;
-		strncpy(text, sel->text, sizeof(text));
+			calcoffsets();
-		match(text);
+		}
 		break;
-	case XK_Right:
+	case XK_Prior:
-		if(!(sel && sel->right))
+		if(prev) {
-			return;
+			sel = curr = prev;
-		sel=sel->right;
-		if(sel == next) {
-			curr = next;
 			calcoffsets();
 		}
 		break;
@@ -203,29 +246,21 @@ kpress(XKeyEvent * e) {
 		fflush(stdout);
 		running = False;
 		break;
-	case XK_Escape:
+	case XK_Right:
-		ret = 1;
+		if(!(sel && sel->right))
-		running = False;
+			return;
-		break;
+		sel=sel->right;
-	case XK_BackSpace:
+		if(sel == next) {
-		if((i = len)) {
+			curr = next;
-			prev_nitem = nitem;
+			calcoffsets();
-			do {
-				text[--i] = 0;
-				match(text);
-			} while(i && nitem && prev_nitem == nitem);
-			match(text);
 		}
 		break;
-	default:
+	case XK_Tab:
-		if(num && !iscntrl((int) buf[0])) {
+		if(!sel)
-			buf[num] = 0;
+			return;
-			if(len > 0)
+		strncpy(text, sel->text, sizeof text);
-				strncat(text, buf, sizeof(text));
+		match(text);
-			else
+		break;
-				strncpy(text, buf, sizeof(text));
-			match(text);
-		}
 	}
 	drawmenu();
 }
@@ -238,7 +273,7 @@ readstdin(void) {
 	Item *i, *new;
 
 	i = 0;
-	while(fgets(buf, sizeof(buf), stdin)) {
+	while(fgets(buf, sizeof buf, stdin)) {
 		len = strlen(buf);
 		if (buf[len - 1] == '\n')
 			buf[len - 1] = 0;
@@ -300,6 +335,9 @@ main(int argc, char *argv[]) {
 		else if(!strncmp(argv[i], "-selfg", 7)) {
 			if(++i < argc) selfg = argv[i];
 		}
+		else if(!strncmp(argv[i], "-p", 3)) {
+			if(++i < argc) prompt = argv[i];
+		}
 		else if(!strncmp(argv[i], "-t", 3)) {
 			if(++i < argc) timeout.tv_sec = atoi(argv[i]);
 		}
@@ -308,7 +346,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 [-font <name>] [-{norm,sel}{bg,fg} <color>] [-p <prompt>] [-t <seconds>] [-v]\n", stdout);
+	setlocale(LC_CTYPE, "");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
 		eprint("dmenu: cannot open display\n");
@@ -353,6 +392,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);