applied next patch of Sander

.hgtags

@@ -33,3 +33,4 @@ dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8
 8f0f917ac988164e1b4446236e3a6ab6cfcb8c67 3.1
 e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2
 709df5a4bad7015a346b2b44b1b3b573ea3088ff 3.3
+9ab649b3b3e5bfccf1c8f352c59e5361e070a25f 3.4

LICENSE

@@ -1,7 +1,7 @@
 MIT/X Consortium License
 
-© 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+© 2006-2008 Anselm R. Garbe <garbeam at gmail dot com>
-© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+© 2006-2008 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 © 2006-2007 Michał Janeczek <janeczek at gmail dot com>
 
 Permission is hereby granted, free of charge, to any person obtaining a

Makefile

@@ -31,7 +31,7 @@ clean:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p dmenu-${VERSION}
-	@cp -R LICENSE Makefile README config.mk dmenu.1 config.h dmenu_path ${SRC} dmenu-${VERSION}
+	@cp -R LICENSE Makefile README config.mk dmenu.1 config.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
 	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
 	@gzip dmenu-${VERSION}.tar
 	@rm -rf dmenu-${VERSION}
@@ -39,9 +39,10 @@ dist: clean
 install: all
 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dmenu dmenu_path ${DESTDIR}${PREFIX}/bin
+	@cp -f dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
 	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
@@ -50,6 +51,7 @@ install: all
 uninstall:
 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
 	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
+	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_run
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
 	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 

config.h

@@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-#define FONT			"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"
+#define FONT			"-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
 #define NORMBGCOLOR             "#cccccc"
 #define NORMFGCOLOR             "#000000"
 #define SELBGCOLOR              "#0066ff"

config.mk

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

dmenu.1

@@ -3,8 +3,10 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
-.RB [ \-b ]
 .RB [ \-i ]
+.RB [ \-x " <x>"]
+.RB [ \-y " <y>"]
+.RB [ \-w " <width>"]
 .RB [ \-fn " <font>"]
 .RB [ \-nb " <color>"]
 .RB [ \-nf " <color>"]
@@ -20,11 +22,17 @@ It manages huge amounts (up to 10.000 and more) of user defined menu items
 efficiently.
 .SS Options
 .TP
-.B \-b
+.B \-x
-makes dmenu appear at the screen bottom (by default it appears at the screen top).
+defines the x coordinate dmenu appears at (0 by default).
+.TP
+.B \-y
+defines the y coordinate dmenu appears at (0 by default).
+.TP
+.B \-w
+defines the width of the dmenu window (screen width by default).
 .TP
 .B \-i
-makes dmenu match menu entries with ignoring intermediate characters.
+makes dmenu match menu entries case insensitively.
 .TP
 .B \-fn <font>
 defines the font.

dmenu.c

@@ -37,7 +37,6 @@ struct Item {
 	Item *next;		/* traverses all items */
 	Item *left, *right;	/* traverses items matching current search pattern */
 	char *text;
-	Bool matched;
 };
 
 /* forward declarations */
@@ -56,8 +55,7 @@ void kpress(XKeyEvent * e);
 void match(char *pattern);
 void readstdin(void);
 void run(void);
-void setup(Bool bottom);
+void setup(int x, int y, int w);
-int strcaseido(const char *text, const char *pattern);
 char *cistrstr(const char *s, const char *sub);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
@@ -80,7 +78,6 @@ unsigned int mw, mh;
 unsigned int promptw = 0;
 unsigned int nitem = 0;
 unsigned int numlockmask = 0;
-Bool idomatch = False;
 Bool running = True;
 Display *dpy;
 DC dc = {0};
@@ -91,6 +88,8 @@ Item *next = NULL;
 Item *prev = NULL;
 Item *curr = NULL;
 Window root, win;
+int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
+char *(*fstrstr)(const char *, const char *) = strstr;
 
 Item *
 appenditem(Item *i, Item *last) {
@@ -98,7 +97,6 @@ appenditem(Item *i, Item *last) {
 		item = i;
 	else
 		last->right = i;
-	i->matched = True;
 	i->left = last;
 	i->right = NULL;
 	last = i;
@@ -507,16 +505,8 @@ match(char *pattern) {
 	item = j = NULL;
 	nitem = 0;
 	for(i = allitems; i; i = i->next)
-		i->matched = False;
+		if(!fstrncmp(pattern, i->text, plen)
-	for(i = allitems; i; i = i->next)
+				|| fstrstr(i->text, pattern))
-		if(!i->matched && !strncasecmp(pattern, i->text, plen))
-			j = appenditem(i, j);
-	for(i = allitems; i; i = i->next)
-		if(!i->matched && cistrstr(i->text, pattern))
-			j = appenditem(i, j);
-	if(idomatch)
-		for(i = allitems; i; i = i->next)
-			if(!i->matched && strcaseido(i->text, pattern))
 			j = appenditem(i, j);
 	curr = prev = next = sel = item;
 	calcoffsets();
@@ -569,7 +559,7 @@ run(void) {
 }
 
 void
-setup(Bool bottom) {
+setup(int x, int y, int w) {
 	unsigned int i, j;
 	XModifierKeymap *modmap;
 	XSetWindowAttributes wa;
@@ -595,10 +585,9 @@ setup(Bool bottom) {
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
-	mw = DisplayWidth(dpy, screen);
+	mw = w ? w : DisplayWidth(dpy, screen);
 	mh = dc.font.height + 2;
-	win = XCreateWindow(dpy, root, 0,
+	win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
-			bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
@@ -622,14 +611,6 @@ setup(Bool bottom) {
 	XMapRaised(dpy, win);
 }
 
-int
-strcaseido(const char *text, const char *pattern) {
-	for(; *text && *pattern; text++)
-		if(tolower((int)*text) == tolower((int)*pattern))
-			pattern++;
-	return !*pattern;
-}                                  
-
 char *
 cistrstr(const char *s, const char *sub) {
 	int c, csub;
@@ -671,16 +652,15 @@ textw(const char *text) {
 
 int
 main(int argc, char *argv[]) {
-	Bool bottom = False;
+	int x = 0, y = 0, w = 0;
 	unsigned int i;
 
 	/* command line args */
 	for(i = 1; i < argc; i++)
-		if(!strcmp(argv[i], "-b")) {
+		if(!strcmp(argv[i], "-i")) {
-			bottom = True;
+			fstrncmp = strncasecmp;
+			fstrstr = cistrstr;
 		}
-		else if(!strcmp(argv[i], "-i"))
-			idomatch = True;
 		else if(!strcmp(argv[i], "-fn")) {
 			if(++i < argc) font = argv[i];
 		}
@@ -699,11 +679,21 @@ main(int argc, char *argv[]) {
 		else if(!strcmp(argv[i], "-sf")) {
 			if(++i < argc) selfg = argv[i];
 		}
+		else if(!strcmp(argv[i], "-x")) {
+			if(++i < argc) x = atoi(argv[i]);
+		}
+		else if(!strcmp(argv[i], "-y")) {
+			if(++i < argc) y = atoi(argv[i]);
+		}
+		else if(!strcmp(argv[i], "-w")) {
+			if(++i < argc) w = atoi(argv[i]);
+		}
 		else if(!strcmp(argv[i], "-v"))
-			eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, Michał Janeczek\n");
+			eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
 		else
-			eprint("usage: dmenu [-b] [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+			eprint("usage: dmenu [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-			"             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+			       "             [-p <prompt>] [-sb <color>] [-sf <color>]\n"
+			       "             [-x <x>] [-y <y>] [-w <w>] [-v]\n");
 	setlocale(LC_CTYPE, "");
 	dpy = XOpenDisplay(0);
 	if(!dpy)
@@ -720,7 +710,7 @@ main(int argc, char *argv[]) {
 		readstdin();
 	}
 
-	setup(bottom);
+	setup(x, y, w);
 	drawmenu();
 	XSync(dpy, False);
 	run();

dmenu_run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exe=`dmenu_path | dmenu $*` && exec $exe