init commit

5 years ago · f08126d982
32 changed files with 3316 additions and 0 deletions
--- a/64
+++ b/64
@ -0,0 +1,64 @@
 # dmenu - dynamic menu
 # See LICENSE file for copyright and license details.
 include config.mk
 SRC = drw.c dmenu.c stest.c util.c
 OBJ = $(SRC:.c=.o)
 all: options dmenu stest
 options:
 	@echo dmenu build options:
 	@echo "CFLAGS   = $(CFLAGS)"
 	@echo "LDFLAGS  = $(LDFLAGS)"
 	@echo "CC       = $(CC)"
 .c.o:
 	$(CC) -c $(CFLAGS) $<
 config.h:
 	cp config.def.h $@
 $(OBJ): arg.h config.h config.mk drw.h
 dmenu: dmenu.o drw.o util.o
 	$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
 stest: stest.o
 	$(CC) -o $@ stest.o $(LDFLAGS)
 clean:
 	rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
 dist: clean
 	mkdir -p dmenu-$(VERSION)
 	cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\
 		drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\
 		dmenu-$(VERSION)
 	tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
 	gzip dmenu-$(VERSION).tar
 	rm -rf dmenu-$(VERSION)
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
 	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
 	sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
 	sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
 		$(DESTDIR)$(PREFIX)/bin/dmenu_path\
 		$(DESTDIR)$(PREFIX)/bin/dmenu_run\
 		$(DESTDIR)$(PREFIX)/bin/stest\
 		$(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
 		$(DESTDIR)$(MANPREFIX)/man1/stest.1
 .PHONY: all options clean dist install uninstall
--- a/42
+++ b/42
@ -0,0 +1,42 @@
 pkgname=dmenu-feanor
 pkgver=5.0.r.
 pkgrel=1
 epoch=
 pkgdesc="A build of dmenu patched for centering, borders, grids, numbers, line height, mouse support, fuzzy matching and highlighting."
 arch=(x86_64 i686)
 url="https://git.erunar.com/Feanor306/dmenu-feanor.git"
 groups=()
 depends=(ttf-hack ttf-joypixels)
 makedepends=(git)
 checkdepends=()
 optdepends=()
 provides=(dmenu)
 conflicts=(dmenu)
 replaces=()
 backup=()
 options=()
 install=
 changelog=
 source=("git+$url")
 noextract=()
 md5sums=('SKIP')
 validpgpkeys=()
 pkgver() {
 	cd "${_pkgname}"
    printf "5.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 build() {
 	cd dmenu-feanor
    make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
 }
 package() {
    cd dmenu-feanor  
    mkdir -p ${pkgdir}/opt/${pkgname}
    cp -rf * ${pkgdir}/opt/${pkgname}
    make PREFIX=/usr DESTDIR="${pkgdir}" install
    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
    install -Dm644 README.org "${pkgdir}/usr/share/doc/${pkgname}/README.org"
 }
--- a/README.md
+++ b/README.md
@ -0,0 +1,57 @@
 # DMENU FEANOR CUSTOM BUILD
 ## dmenu is a dynamic menu for X, originally designed for dwm. It manages large numbers of user-defined menu items efficiently.  It is a very powerful tool that allows you to pipe information into it.  This makes dmenu a perfect utility to incorporate into your scripting.
 ## The patches used in this build include:
 - dmenu-border -- adds border around dmenu window
 - dmenu-center -- centers dmenu in the middle of screen (-c)
 - dmenu-fuzzyhighlight -- fuzzy matches gets highlighted
 - dmenu-fuzzymatch -- adds support for fuzzy-matching
 - dmenu-grid -- adds a flag (-g) to specify the number of grid columns
 - dmenu-lineheight -- adds a flag (-h) to set the minimum height of dmenu lines
 - dmenu-morecolor -- creates a color option for use the entries adjacent to the selection
 - dmenu-mousesupport -- basic mouse support
 - dmenu-numbers -- Displays number of matched and total items in top right corner
 - Mouse functionality
 ## Mouse actions supported:
 - Left-mouse click:
  - On prompt and input field: clear input text and selection.
  - In horizontal and vertical mode on item: select and output item (same as pressing enter).
  - In horizontal mode on arrows: change items to show left or right.
 - Ctrl-left-mouse click: multisel modifier.
 - Right-mouse click: close.
 - Middle-mouse click:
  - Paste current selection.
  - While holding shift: paste primary selection.
 - Scroll up:
  - In horizontal mode: same as left-clicking on left arrow.
  - In vertical mode: show items above.
 - Scroll down:
  - In horizontal mode: same as left-clicking on right arrow.
  - In vertical mode: show items below.
 ## Available flags
 - [-l lines]
 - [-g columns]
 - [-p prompt]
 - [-fn font]
 - [-m monitor]
 - [-h height]
 - [-nb color]
 - [-nf color]
 - [-sb color]
 - [-sf color]
 - [-nhb color]
 - [-nhf color]
 - [-shb color]
 - [-shf color]
 - [-w windowid]
 - [-c] for centering
 An example: dmenu_run -c -bw 2 -l 20 -g 4 -p 'Run: '
 This launches dmenu_run with -c (centered), -bw (border width), -l (number of vertical lines) and -g (number of grid columns).
 ## Installing dmenu on Arch Linux
 All you need to do is to download this repository.  Then run the following command:
 ```
 sudo make
 sudo make clean install
 ```
--- a/arg.h
+++ b/arg.h
@ -0,0 +1,49 @@
 /*
 * Copy me if you can.
 * by 20h
 */
 #ifndef ARG_H__
 #define ARG_H__
 extern char *argv0;
 /* use main(int argc, char *argv[]) */
 #define ARGBEGIN	for (argv0 = *argv, argv++, argc--;\
 					argv[0] && argv[0][0] == '-'\
 					&& argv[0][1];\
 					argc--, argv++) {\
 				char argc_;\
 				char **argv_;\
 				int brk_;\
 				if (argv[0][1] == '-' && argv[0][2] == '\0') {\
 					argv++;\
 					argc--;\
 					break;\
 				}\
 				for (brk_ = 0, argv[0]++, argv_ = argv;\
 						argv[0][0] && !brk_;\
 						argv[0]++) {\
 					if (argv_ != argv)\
 						break;\
 					argc_ = argv[0][0];\
 					switch (argc_)
 #define ARGEND			}\
 			}
 #define ARGC()		argc_
 #define EARGF(x)	((argv[0][1] == '\0' && argv[1] == NULL)?\
 				((x), abort(), (char *)0) :\
 				(brk_ = 1, (argv[0][1] != '\0')?\
 					(&argv[0][1]) :\
 					(argc--, argv++, argv[0])))
 #define ARGF()		((argv[0][1] == '\0' && argv[1] == NULL)?\
 				(char *)0 :\
 				(brk_ = 1, (argv[0][1] != '\0')?\
 					(&argv[0][1]) :\
 					(argc--, argv++, argv[0])))
 #endif
--- a/config.def.h
+++ b/config.def.h
@ -0,0 +1,34 @@
 /* Default settings; can be overriden by command line. */
 static int topbar = 1;       /* -b  option; if 0, dmenu appears at bottom     */
 static int centered = 0;     /* -c option; centers dmenu on screen */
 static int min_width = 500;  /* minimum width when centered */
 static int fuzzy = 1;        /* -F  option; if 0, dmenu doesn't use fuzzy matching     */
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
 	"Hack:pixelsize=11:antialias=true:autohint=true",
 	"JoyPixels:pixelsize=8:antialias=true:autohint=true"
 };
 static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
 static const char *colors[SchemeLast][2] = {
 	/*     fg         bg       */
 	[SchemeNorm] = { "#cccccc", "#282a36" },
 	[SchemeSel] = { "#ffffff", "#924441" },
 	[SchemeSelHighlight] = { "#d7d7d7", "#000000" },
 	[SchemeNormHighlight] = { "#e78481", "#000000" },
 	[SchemeOut] = { "#000000", "#00ffff" },
 	[SchemeMid] = { "#d7d7d7", "#1f2026" },
 };
 /* -l and -g options; controls number of lines and columns in grid if > 0 */
 static unsigned int lines      = 0;
 static unsigned int lineheight = 22;  /* -h option; minimum height of a menu line */
 static unsigned int columns    = 0;
 /*
 * Characters not considered part of a word while deleting words
 * for example: " /?\"&[]"
 */
 static const char worddelimiters[] = " ";
 /* Size of the window border */
 static unsigned int border_width = 0;  /* -bw option; to add border width */
--- a/config.h
+++ b/config.h
@ -0,0 +1,34 @@
 /* Default settings; can be overriden by command line. */
 static int topbar = 1;       /* -b  option; if 0, dmenu appears at bottom     */
 static int centered = 0;     /* -c option; centers dmenu on screen */
 static int min_width = 500;  /* minimum width when centered */
 static int fuzzy = 1;        /* -F  option; if 0, dmenu doesn't use fuzzy matching     */
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
 	"Hack:pixelsize=38:antialias=true:autohint=true",
 	"JoyPixels:pixelsize=38:antialias=true:autohint=true"
 };
 static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
 static const char *colors[SchemeLast][2] = {
 	/*     fg         bg       */
 	[SchemeNorm] = { "#cccccc", "#282a36" },
 	[SchemeSel] = { "#ffffff", "#005577" },
 	[SchemeSelHighlight] = { "#d7d7d7", "#000000" },
 	[SchemeNormHighlight] = { "#00ff7f", "#000000" },
 	[SchemeOut] = { "#000000", "#00ffff" },
 	[SchemeMid] = { "#d7d7d7", "#1f2026" },
 };
 /* -l and -g options; controls number of lines and columns in grid if > 0 */
 static unsigned int lines      = 0;
 static unsigned int lineheight = 40;  /* -h option; minimum height of a menu line */
 static unsigned int columns    = 0;
 /*
 * Characters not considered part of a word while deleting words
 * for example: " /?\"&[]"
 */
 static const char worddelimiters[] = " ";
 /* Size of the window border */
 static unsigned int border_width = 2;  /* -bw option; to add border width */
--- a/config.mk
+++ b/config.mk
@ -0,0 +1,31 @@
 # dmenu version
 VERSION = 5.0
 # paths
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 # Xinerama, comment if you don't want it
 XINERAMALIBS  = -lXinerama
 XINERAMAFLAGS = -DXINERAMA
 # freetype
 FREETYPELIBS = -lfontconfig -lXft
 FREETYPEINC = /usr/include/freetype2
 # OpenBSD (uncomment)
 #FREETYPEINC = $(X11INC)/freetype2
 # includes and libs
 INCS = -I$(X11INC) -I$(FREETYPEINC)
 LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lm
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
 CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
 LDFLAGS  = $(LIBS)
 # compiler and linker
 CC = cc
--- a/BIN
+++ b/BIN
--- a/dmenu-border-4.9.diff
+++ b/dmenu-border-4.9.diff
@ -0,0 +1,25 @@
 diff -up dmenu-4.9-b/config.def.h dmenu-4.9-a/config.def.h
 --- dmenu-4.9-b/config.def.h	2019-02-02 13:55:02.000000000 +0100
 +++ dmenu-4.9-a/config.def.h	2019-05-19 02:10:12.740040403 +0200
@@ -21,3 +21,6 @@ static unsigned int lines      = 0;
  * for example: " /?\"&[]"
  */
 static const char worddelimiters[] = " ";
 +
 +/* Size of the window border */
 +static const unsigned int border_width = 5;
 diff -up dmenu-4.9-b/dmenu.c dmenu-4.9-a/dmenu.c
 --- dmenu-4.9-b/dmenu.c	2019-02-02 13:55:02.000000000 +0100
 +++ dmenu-4.9-a/dmenu.c	2019-05-19 02:11:20.966710117 +0200
@@ -654,9 +654,10 @@ setup(void)
 	swa.override_redirect = True;
 	swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
 	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
 -	win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
 +	win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width,
 	                    CopyFromParent, CopyFromParent, CopyFromParent,
 	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
 +	XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
 	XSetClassHint(dpy, win, &ch);
 	/* open input methods */
--- a/dmenu-center-20200111-8cd37e1.diff
+++ b/dmenu-center-20200111-8cd37e1.diff
@ -0,0 +1,120 @@
 From 8cd37e1ab9e7cb025224aeb3543f1a5be8bceb93 Mon Sep 17 00:00:00 2001
 From: Nihal Jere <nihal@nihaljere.xyz>
 Date: Sat, 11 Jan 2020 21:16:08 -0600
 Subject: [PATCH] center patch now has adjustable minimum width
 ---
 config.def.h |  2 ++
 dmenu.1      |  3 +++
 dmenu.c      | 39 ++++++++++++++++++++++++++++++++-------
 3 files changed, 37 insertions(+), 7 deletions(-)
 diff --git a/config.def.h b/config.def.h
 index 1edb647..88ef264 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -2,6 +2,8 @@
 /* Default settings; can be overriden by command line. */
 static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */
 +static int centered = 0;                    /* -c option; centers dmenu on screen */
 +static int min_width = 500;                    /* minimum width when centered */
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
 	"monospace:size=10"
 diff --git a/dmenu.1 b/dmenu.1
 index 323f93c..c036baa 100644
 --- a/dmenu.1
 +++ b/dmenu.1
@@ -40,6 +40,9 @@ which lists programs in the user's $PATH and runs the result in their $SHELL.
 .B \-b
 dmenu appears at the bottom of the screen.
 .TP
 +.B \-c
 +dmenu appears centered on the screen.
 +.TP
 .B \-f
 dmenu grabs the keyboard before reading stdin if not reading from a tty. This
 is faster, but will lock up X until stdin reaches end\-of\-file.
 diff --git a/dmenu.c b/dmenu.c
 index 65f25ce..041c7f8 100644
 --- a/dmenu.c
 +++ b/dmenu.c
@@ -89,6 +89,15 @@ calcoffsets(void)
 			break;
 }
 +static int
 +max_textw(void)
 +{
 +	int len = 0;
 +	for (struct item *item = items; item && item->text; item++)
 +		len = MAX(TEXTW(item->text), len);
 +	return len;
 +}
 +
 static void
 cleanup(void)
 {
@@ -611,6 +620,7 @@ setup(void)
 	bh = drw->fonts->h + 2;
 	lines = MAX(lines, 0);
 	mh = (lines + 1) * bh;
 +	promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
 #ifdef XINERAMA
 	i = 0;
 	if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
@@ -637,9 +647,16 @@ setup(void)
 				if (INTERSECT(x, y, 1, 1, info[i]))
 					break;
 -		x = info[i].x_org;
 -		y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
 -		mw = info[i].width;
 +		if (centered) {
 +			mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width);
 +			x = info[i].x_org + ((info[i].width  - mw) / 2);
 +			y = info[i].y_org + ((info[i].height - mh) / 2);
 +		} else {
 +			x = info[i].x_org;
 +			y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
 +			mw = info[i].width;
 +		}
 +
 		XFree(info);
 	} else
 #endif
@@ -647,11 +664,17 @@ setup(void)
 		if (!XGetWindowAttributes(dpy, parentwin, &wa))
 			die("could not get embedding window attributes: 0x%lx",
 			    parentwin);
 -		x = 0;
 -		y = topbar ? 0 : wa.height - mh;
 -		mw = wa.width;
 +
 +		if (centered) {
 +			mw = MIN(MAX(max_textw() + promptw, min_width), wa.width);
 +			x = (wa.width  - mw) / 2;
 +			y = (wa.height - mh) / 2;
 +		} else {
 +			x = 0;
 +			y = topbar ? 0 : wa.height - mh;
 +			mw = wa.width;
 +		}
 	}
 -	promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
 	inputw = MIN(inputw, mw/3);
 	match();
@@ -709,6 +732,8 @@ main(int argc, char *argv[])
 			topbar = 0;
 		else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
 			fast = 1;
 +		else if (!strcmp(argv[i], "-c"))   /* centers dmenu on screen */
 +			centered = 1;
 		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
 			fstrncmp = strncasecmp;
 			fstrstr = cistrstr;
 -- 
 2.24.1
--- a/dmenu-fuzzyhighlight-4.9.diff
+++ b/dmenu-fuzzyhighlight-4.9.diff
@ -0,0 +1,152 @@
 Author: Chris Noxz <chris@noxz.tech>
 note: This patch is meant to be used together with fuzzymatch
 diff -upN dmenu-4.9/config.def.h dmenu-4.9-fuzzyhighlight/config.def.h
 --- dmenu-4.9/config.def.h	2019-02-02 13:55:02.000000000 +0100
 +++ dmenu-4.9-fuzzyhighlight/config.def.h	2020-04-04 10:26:36.990890854 +0200
@@ -11,6 +11,8 @@ static const char *colors[SchemeLast][2]
 	/*     fg         bg       */
 	[SchemeNorm] = { "#bbbbbb", "#222222" },
 	[SchemeSel] = { "#eeeeee", "#005577" },
 +	[SchemeSelHighlight] = { "#ffc978", "#005577" },
 +	[SchemeNormHighlight] = { "#ffc978", "#222222" },
 	[SchemeOut] = { "#000000", "#00ffff" },
 };
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
 diff -upN dmenu-4.9/dmenu.1 dmenu-4.9-fuzzyhighlight/dmenu.1
 --- dmenu-4.9/dmenu.1	2019-02-02 13:55:02.000000000 +0100
 +++ dmenu-4.9-fuzzyhighlight/dmenu.1	2020-04-04 10:30:16.430054933 +0200
@@ -20,6 +20,14 @@ dmenu \- dynamic menu
 .IR color ]
 .RB [ \-sf
 .IR color ]
 +.RB [ \-nhb
 +.IR color ]
 +.RB [ \-nhf
 +.IR color ]
 +.RB [ \-shb
 +.IR color ]
 +.RB [ \-shf
 +.IR color ]
 .RB [ \-w
 .IR windowid ]
 .P
@@ -75,6 +83,18 @@ defines the selected background color.
 .BI \-sf " color"
 defines the selected foreground color.
 .TP
 +.BI \-nhb " color"
 +defines the normal highlight background color.
 +.TP
 +.BI \-nhf " color"
 +defines the normal highlight foreground color.
 +.TP
 +.BI \-shb " color"
 +defines the selected highlight background color.
 +.TP
 +.BI \-shf " color"
 +defines the selected highlight foreground color.
 +.TP
 .B \-v
 prints version information to stdout, then exits.
 .TP
 diff -upN dmenu-4.9/dmenu.c dmenu-4.9-fuzzyhighlight/dmenu.c
 --- dmenu-4.9/dmenu.c	2019-02-02 13:55:02.000000000 +0100
 +++ dmenu-4.9-fuzzyhighlight/dmenu.c	2020-04-04 10:27:43.888026309 +0200
@@ -26,7 +26,9 @@
 #define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)
 /* enums */
 -enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 +enum { SchemeNorm, SchemeSel, SchemeNormHighlight, SchemeSelHighlight,
 +       SchemeOut, SchemeLast }; /* color schemes */
 +
 struct item {
 	char *text;
@@ -113,9 +115,49 @@ cistrstr(const char *s, const char *sub)
 	return NULL;
 }
 +static void
 +drawhighlights(struct item *item, int x, int y, int maxw)
 +{
 +	int i, indent;
 +	char *highlight;
 +	char c;
 +
 +	if (!(strlen(item->text) && strlen(text)))
 +		return;
 +
 +	drw_setscheme(drw, scheme[item == sel
 +	                   ? SchemeSelHighlight
 +	                   : SchemeNormHighlight]);
 +	for (i = 0, highlight = item->text; *highlight && text[i];) {
 +		if (*highlight == text[i]) {
 +			/* get indentation */
 +			c = *highlight;
 +			*highlight = '\0';
 +			indent = TEXTW(item->text);
 +			*highlight = c;
 +
 +			/* highlight character */
 +			c = highlight[1];
 +			highlight[1] = '\0';
 +			drw_text(
 +				drw,
 +				x + indent - (lrpad / 2),
 +				y,
 +				MIN(maxw - indent, TEXTW(highlight) - lrpad),
 +				bh, 0, highlight, 0
 +			);
 +			highlight[1] = c;
 +			i++;
 +		}
 +		highlight++;
 +	}
 +}
 +
 +
 static int
 drawitem(struct item *item, int x, int y, int w)
 {
 +	int r;
 	if (item == sel)
 		drw_setscheme(drw, scheme[SchemeSel]);
 	else if (item->out)
@@ -123,7 +165,9 @@ drawitem(struct item *item, int x, int y
 	else
 		drw_setscheme(drw, scheme[SchemeNorm]);
 -	return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
 +	r = drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
 +	drawhighlights(item, x, y, w);
 +	return r;
 }
 static void
@@ -683,7 +727,8 @@ static void
 usage(void)
 {
 	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
 -	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
 +	      "             [-nb color] [-nf color] [-sb color] [-sf color]\n"
 +	      "             [-nhb color] [-nhf color] [-shb color] [-shf color] [-w windowid]\n", stderr);
 	exit(1);
 }
@@ -724,6 +769,14 @@ main(int argc, char *argv[])
 			colors[SchemeSel][ColBg] = argv[++i];
 		else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
 			colors[SchemeSel][ColFg] = argv[++i];
 +		else if (!strcmp(argv[i], "-nhb")) /* normal hi background color */
 +			colors[SchemeNormHighlight][ColBg] = argv[++i];
 +		else if (!strcmp(argv[i], "-nhf")) /* normal hi foreground color */
 +			colors[SchemeNormHighlight][ColFg] = argv[++i];
 +		else if (!strcmp(argv[i], "-shb")) /* selected hi background color */
 +			colors[SchemeSelHighlight][ColBg] = argv[++i];
 +		else if (!strcmp(argv[i], "-shf")) /* selected hi foreground color */
 +			colors[SchemeSelHighlight][ColFg] = argv[++i];
 		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
 			embed = argv[++i];
 		else
--- a/dmenu-fuzzymatch-4.9.diff
+++ b/dmenu-fuzzymatch-4.9.diff
@ -0,0 +1,163 @@
 From 94353eb52055927d9079f3d9e33da1c954abf386 Mon Sep 17 00:00:00 2001
 From: aleks <aleks.stier@icloud.com>
 Date: Wed, 26 Jun 2019 13:25:10 +0200
 Subject: [PATCH] Add support for fuzzy-matching
 ---
 config.def.h |  1 +
 config.mk    |  2 +-
 dmenu.c      | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+), 1 deletion(-)
 diff --git a/config.def.h b/config.def.h
 index 1edb647..51612b9 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -2,6 +2,7 @@
 /* Default settings; can be overriden by command line. */
 static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */
 +static int fuzzy = 1;                      /* -F  option; if 0, dmenu doesn't use fuzzy matching     */
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
 	"monospace:size=10"
 diff --git a/config.mk b/config.mk
 index 0929b4a..d14309a 100644
 --- a/config.mk
 +++ b/config.mk
@@ -20,7 +20,7 @@ FREETYPEINC = /usr/include/freetype2
 # includes and libs
 INCS = -I$(X11INC) -I$(FREETYPEINC)
 -LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
 +LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lm
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
 diff --git a/dmenu.c b/dmenu.c
 index 6b8f51b..96ddc98 100644
 --- a/dmenu.c
 +++ b/dmenu.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>
 +#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,6 +33,7 @@ struct item {
 	char *text;
 	struct item *left, *right;
 	int out;
 +	double distance;
 };
 static char text[BUFSIZ] = "";
@@ -210,9 +212,94 @@ grabkeyboard(void)
 	die("cannot grab keyboard");
 }
 +int
 +compare_distance(const void *a, const void *b)
 +{
 +	struct item *da = *(struct item **) a;
 +	struct item *db = *(struct item **) b;
 +
 +	if (!db)
 +		return 1;
 +	if (!da)
 +		return -1;
 +
 +	return da->distance == db->distance ? 0 : da->distance < db->distance ? -1 : 1;
 +}
 +
 +void
 +fuzzymatch(void)
 +{
 +	/* bang - we have so much memory */
 +	struct item *it;
 +	struct item **fuzzymatches = NULL;
 +	char c;
 +	int number_of_matches = 0, i, pidx, sidx, eidx;
 +	int text_len = strlen(text), itext_len;
 +
 +	matches = matchend = NULL;
 +
 +	/* walk through all items */
 +	for (it = items; it && it->text; it++) {
 +		if (text_len) {
 +			itext_len = strlen(it->text);
 +			pidx = 0; /* pointer */
 +			sidx = eidx = -1; /* start of match, end of match */
 +			/* walk through item text */
 +			for (i = 0; i < itext_len && (c = it->text[i]); i++) {
 +				/* fuzzy match pattern */
 +				if (!fstrncmp(&text[pidx], &c, 1)) {
 +					if(sidx == -1)
 +						sidx = i;
 +					pidx++;
 +					if (pidx == text_len) {
 +						eidx = i;
 +						break;
 +					}
 +				}
 +			}
 +			/* build list of matches */
 +			if (eidx != -1) {
 +				/* compute distance */
 +				/* add penalty if match starts late (log(sidx+2))
 +				 * add penalty for long a match without many matching characters */
 +				it->distance = log(sidx + 2) + (double)(eidx - sidx - text_len);
 +				/* fprintf(stderr, "distance %s %f\n", it->text, it->distance); */
 +				appenditem(it, &matches, &matchend);
 +				number_of_matches++;
 +			}
 +		} else {
 +			appenditem(it, &matches, &matchend);
 +		}
 +	}
 +
 +	if (number_of_matches) {
 +		/* initialize array with matches */
 +		if (!(fuzzymatches = realloc(fuzzymatches, number_of_matches * sizeof(struct item*))))
 +			die("cannot realloc %u bytes:", number_of_matches * sizeof(struct item*));
 +		for (i = 0, it = matches; it && i < number_of_matches; i++, it = it->right) {
 +			fuzzymatches[i] = it;
 +		}
 +		/* sort matches according to distance */
 +		qsort(fuzzymatches, number_of_matches, sizeof(struct item*), compare_distance);
 +		/* rebuild list of matches */
 +		matches = matchend = NULL;
 +		for (i = 0, it = fuzzymatches[i];  i < number_of_matches && it && \
 +				it->text; i++, it = fuzzymatches[i]) {
 +			appenditem(it, &matches, &matchend);
 +		}
 +		free(fuzzymatches);
 +	}
 +	curr = sel = matches;
 +	calcoffsets();
 +}
 +
 static void
 match(void)
 {
 +	if (fuzzy) {
 +		fuzzymatch();
 +		return;
 +	}
 	static char **tokv = NULL;
 	static int tokn = 0;
@@ -702,6 +789,8 @@ main(int argc, char *argv[])
 			topbar = 0;
 		else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
 			fast = 1;
 +		else if (!strcmp(argv[i], "-F"))   /* grabs keyboard before reading stdin */
 +			fuzzy = 0;
 		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
 			fstrncmp = strncasecmp;
 			fstrstr = cistrstr;
 -- 
 2.22.0
--- a/dmenu-grid-4.9.diff
+++ b/dmenu-grid-4.9.diff
@ -0,0 +1,107 @@
 From 39ab9676914bd0d8105d0f96bbd7611a53077438 Mon Sep 17 00:00:00 2001
 From: Miles Alan <m@milesalan.com>
 Date: Sat, 4 Jul 2020 11:19:04 -0500
 Subject: [PATCH] Add -g option to display entries in the given number of grid
 columns
 This option can be used in conjunction with -l to format dmenu's options in
 arbitrary size grids. For example, to create a 4 column by 6 line grid, you
 could use: dmenu -g 4 -l 6
 ---
 config.def.h |  3 ++-
 dmenu.1      |  7 ++++++-
 dmenu.c      | 22 ++++++++++++++++------
 3 files changed, 24 insertions(+), 8 deletions(-)
 diff --git a/config.def.h b/config.def.h
 index 1edb647..96cf3c9 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -13,8 +13,9 @@ static const char *colors[SchemeLast][2] = {
 	[SchemeSel] = { "#eeeeee", "#005577" },
 	[SchemeOut] = { "#000000", "#00ffff" },
 };
 -/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
 +/* -l and -g options; controls number of lines and columns in grid if > 0 */
 static unsigned int lines      = 0;
 +static unsigned int columns    = 0;
 /*
  * Characters not considered part of a word while deleting words
 diff --git a/dmenu.1 b/dmenu.1
 index 323f93c..d0a734a 100644
 --- a/dmenu.1
 +++ b/dmenu.1
@@ -4,6 +4,8 @@ dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
 .RB [ \-bfiv ]
 +.RB [ \-g
 +.IR columns ]
 .RB [ \-l
 .IR lines ]
 .RB [ \-m
@@ -47,8 +49,11 @@ is faster, but will lock up X until stdin reaches end\-of\-file.
 .B \-i
 dmenu matches menu items case insensitively.
 .TP
 +.BI \-g " columns"
 +dmenu lists items in a grid with the given number of columns.
 +.TP
 .BI \-l " lines"
 -dmenu lists items vertically, with the given number of lines.
 +dmenu lists items in a grid with the given number of lines.
 .TP
 .BI \-m " monitor"
 dmenu is displayed on the monitor number supplied. Monitor numbers are starting
 diff --git a/dmenu.c b/dmenu.c
 index 6b8f51b..d79b6bb 100644
 --- a/dmenu.c
 +++ b/dmenu.c
@@ -77,7 +77,7 @@ calcoffsets(void)
 	int i, n;
 	if (lines > 0)
 -		n = lines * bh;
 +		n = lines * columns * bh;
 	else
 		n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
 	/* calculate which items will begin the next page and previous page */
@@ -152,9 +152,15 @@ drawmenu(void)
 	}
 	if (lines > 0) {
 -		/* draw vertical list */
 -		for (item = curr; item != next; item = item->right)
 -			drawitem(item, x, y += bh, mw - x);
 +		/* draw grid */
 +		int i = 0;
 +		for (item = curr; item != next; item = item->right, i++)
 +			drawitem(
 +				item,
 +				x + ((i / lines) *  ((mw - x) / columns)),
 +				y + (((i % lines) + 1) * bh),
 +				(mw - x) / columns
 +			);
 	} else if (matches) {
 		/* draw horizontal list */
 		x += inputw;
@@ -708,9 +714,13 @@ main(int argc, char *argv[])
 		} else if (i + 1 == argc)
 			usage();
 		/* these options take one argument */
 -		else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
 +		else if (!strcmp(argv[i], "-g")) {   /* number of columns in grid */
 +			columns = atoi(argv[++i]);
 +			if (lines == 0) lines = 1;
 +		} else if (!strcmp(argv[i], "-l")) { /* number of lines in grid */
 			lines = atoi(argv[++i]);
 -		else if (!strcmp(argv[i], "-m"))
 +			if (columns == 0) columns = 1;
 +		} else if (!strcmp(argv[i], "-m"))
 			mon = atoi(argv[++i]);
 		else if (!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
 			prompt = argv[++i];
 -- 
 2.23.1
--- a/dmenu-lineheight-4.9.diff
+++ b/dmenu-lineheight-4.9.diff
@ -0,0 +1,94 @@
 From 87f92a561c31246f6f9effc0e89ef92677c87746 Mon Sep 17 00:00:00 2001
 From: astier <aleksandrs.stier@uni-bielefeld.de>
 Date: Wed, 27 Feb 2019 21:44:55 +0100
 Subject: [PATCH] Add an option which defines the lineheight
 Despite both the panel and dmenu using the same font (a Terminus 12),
 dmenu is shorter and the panel is visible from under the dmenu bar.
 The appearance can be even more distracting when using similar colors
 for background and selections. With the option added by this patch,
 dmenu can be launched with a '-h 24', thus completely covering the panel.
 ---
 config.def.h |  1 +
 dmenu.1      |  3 +++
 dmenu.c      | 10 ++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)
 diff --git a/config.def.h b/config.def.h
 index 1edb647..317fa2f 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -15,6 +15,7 @@ static const char *colors[SchemeLast][2] = {
 };
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
 static unsigned int lines      = 0;
 +static unsigned int lineheight = 0;         /* -h option; minimum height of a menu line     */
 /*
  * Characters not considered part of a word while deleting words
 diff --git a/dmenu.1 b/dmenu.1
 index 323f93c..7ef34d2 100644
 --- a/dmenu.1
 +++ b/dmenu.1
@@ -50,6 +50,9 @@ dmenu matches menu items case insensitively.
 .BI \-l " lines"
 dmenu lists items vertically, with the given number of lines.
 .TP
 +.BI \-h " height"
 +dmenu uses a menu line of at least 'height' pixels tall, but no less than 8.
 +.TP
 .BI \-m " monitor"
 dmenu is displayed on the monitor number supplied. Monitor numbers are starting
 from 0.
 diff --git a/dmenu.c b/dmenu.c
 index 6b8f51b..45d1946 100644
 --- a/dmenu.c
 +++ b/dmenu.c
@@ -131,7 +131,7 @@ drawmenu(void)
 {
 	unsigned int curpos;
 	struct item *item;
 -	int x = 0, y = 0, w;
 +	int x = 0, y = 0, fh = drw->fonts->h, w;
 	drw_setscheme(drw, scheme[SchemeNorm]);
 	drw_rect(drw, 0, 0, mw, mh, 1, 1);
@@ -148,7 +148,7 @@ drawmenu(void)
 	curpos = TEXTW(text) - TEXTW(&text[cursor]);
 	if ((curpos += lrpad / 2 - 1) < w) {
 		drw_setscheme(drw, scheme[SchemeNorm]);
 -		drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
 +		drw_rect(drw, x + curpos, 2 + (bh-fh)/2, 2, fh - 4, 1, 0);
 	}
 	if (lines > 0) {
@@ -604,6 +604,7 @@ setup(void)
 	/* calculate menu geometry */
 	bh = drw->fonts->h + 2;
 +	bh = MAX(bh,lineheight);	/* make a menu line AT LEAST 'lineheight' tall */
 	lines = MAX(lines, 0);
 	mh = (lines + 1) * bh;
 #ifdef XINERAMA
@@ -683,6 +684,7 @@ static void
 usage(void)
 {
 	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
 +	      "             [-h height]\n"
 	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
 	exit(1);
 }
@@ -716,6 +718,10 @@ main(int argc, char *argv[])
 			prompt = argv[++i];
 		else if (!strcmp(argv[i], "-fn"))  /* font or font set */
 			fonts[0] = argv[++i];
 +		else if(!strcmp(argv[i], "-h")) { /* minimum height of one menu line */
 +			lineheight = atoi(argv[++i]);
 +			lineheight = MAX(lineheight,8); /* reasonable default in case of value too small/negative */
 +		}
 		else if (!strcmp(argv[i], "-nb"))  /* normal background color */
 			colors[SchemeNorm][ColBg] = argv[++i];
 		else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
 -- 
 2.21.0
--- a/dmenu-morecolor-20190922-4bf895b.diff
+++ b/dmenu-morecolor-20190922-4bf895b.diff
@ -0,0 +1,47 @@
 From 4bf895be219ae00394a5cde901dc43ec6dcb3759 Mon Sep 17 00:00:00 2001
 From: Tanner Babcock <babkock@gmail.com>
 Date: Sun, 22 Sep 2019 03:07:26 -0500
 Subject: [PATCH] Additional color scheme, for adjacent entries
 ---
 config.def.h | 1 +
 dmenu.c      | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 diff --git a/config.def.h b/config.def.h
 index 1edb647..767c88f 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -12,6 +12,7 @@ static const char *colors[SchemeLast][2] = {
 	[SchemeNorm] = { "#bbbbbb", "#222222" },
 	[SchemeSel] = { "#eeeeee", "#005577" },
 	[SchemeOut] = { "#000000", "#00ffff" },
 +	[SchemeMid] = { "#eeeeee", "#770000" },
 };
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
 static unsigned int lines      = 0;
 diff --git a/dmenu.c b/dmenu.c
 index 65f25ce..0a5c08d 100644
 --- a/dmenu.c
 +++ b/dmenu.c
@@ -26,7 +26,7 @@
 #define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)
 /* enums */
 -enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 +enum { SchemeNorm, SchemeSel, SchemeOut, SchemeMid, SchemeLast }; /* color schemes */
 struct item {
 	char *text;
@@ -118,6 +118,8 @@ drawitem(struct item *item, int x, int y, int w)
 {
 	if (item == sel)
 		drw_setscheme(drw, scheme[SchemeSel]);
 +	else if (item->left == sel || item->right == sel)
 +		drw_setscheme(drw, scheme[SchemeMid]);
 	else if (item->out)
 		drw_setscheme(drw, scheme[SchemeOut]);
 	else
 -- 
 2.23.0
--- a/dmenu-mousesupport-5.0.diff
+++ b/dmenu-mousesupport-5.0.diff
@ -0,0 +1,144 @@
 diff --git a/dmenu.c b/dmenu.c
 index 65f25ce..dfa59db 100644
 --- a/dmenu.c
 +++ b/dmenu.c
@@ -500,6 +500,119 @@ draw:
 	drawmenu();
 }
 +static void
 +buttonpress(XEvent *e)
 +{
 +	struct item *item;
 +	XButtonPressedEvent *ev = &e->xbutton;
 +	int x = 0, y = 0, h = bh, w;
 +
 +	if (ev->window != win)
 +		return;
 +
 +	/* right-click: exit */
 +	if (ev->button == Button3)
 +		exit(1);
 +
 +	if (prompt && *prompt)
 +		x += promptw;
 +
 +	/* input field */
 +	w = (lines > 0 || !matches) ? mw - x : inputw;
 +
 +	/* left-click on input: clear input,
 +	 * NOTE: if there is no left-arrow the space for < is reserved so
 +	 *       add that to the input width */
 +	if (ev->button == Button1 &&
 +	   ((lines <= 0 && ev->x >= 0 && ev->x <= x + w +
 +	   ((!prev || !curr->left) ? TEXTW("<") : 0)) ||
 +	   (lines > 0 && ev->y >= y && ev->y <= y + h))) {
 +		insert(NULL, -cursor);
 +		drawmenu();
 +		return;
 +	}
 +	/* middle-mouse click: paste selection */
 +	if (ev->button == Button2) {
 +		XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
 +		                  utf8, utf8, win, CurrentTime);
 +		drawmenu();
 +		return;
 +	}
 +	/* scroll up */
 +	if (ev->button == Button4 && prev) {
 +		sel = curr = prev;
 +		calcoffsets();
 +		drawmenu();
 +		return;
 +	}
 +	/* scroll down */
 +	if (ev->button == Button5 && next) {
 +		sel = curr = next;
 +		calcoffsets();
 +		drawmenu();
 +		return;
 +	}
 +	if (ev->button != Button1)
 +		return;
 +	if (ev->state & ~ControlMask)
 +		return;
 +	if (lines > 0) {
 +		/* vertical list: (ctrl)left-click on item */
 +		w = mw - x;
 +		for (item = curr; item != next; item = item->right) {
 +			y += h;
 +			if (ev->y >= y && ev->y <= (y + h)) {
 +				puts(item->text);
 +				if (!(ev->state & ControlMask))
 +					exit(0);
 +				sel = item;
 +				if (sel) {
 +					sel->out = 1;
 +					drawmenu();
 +				}
 +				return;
 +			}
 +		}
 +	} else if (matches) {
 +		/* left-click on left arrow */
 +		x += inputw;
 +		w = TEXTW("<");
 +		if (prev && curr->left) {
 +			if (ev->x >= x && ev->x <= x + w) {
 +				sel = curr = prev;
 +				calcoffsets();
 +				drawmenu();
 +				return;
 +			}
 +		}
 +		/* horizontal list: (ctrl)left-click on item */
 +		for (item = curr; item != next; item = item->right) {
 +			x += w;
 +			w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
 +			if (ev->x >= x && ev->x <= x + w) {
 +				puts(item->text);
 +				if (!(ev->state & ControlMask))
 +					exit(0);
 +				sel = item;
 +				if (sel) {
 +					sel->out = 1;
 +					drawmenu();
 +				}
 +				return;
 +			}
 +		}
 +		/* left-click on right arrow */
 +		w = TEXTW(">");
 +		x = mw - w;
 +		if (next && ev->x >= x && ev->x <= x + w) {
 +			sel = curr = next;
 +			calcoffsets();
 +			drawmenu();
 +			return;
 +		}
 +	}
 +}
 +
 static void
 paste(void)
 {
@@ -561,6 +674,9 @@ run(void)
 				break;
 			cleanup();
 			exit(1);
 +		case ButtonPress:
 +			buttonpress(&ev);
 +			break;
 		case Expose:
 			if (ev.xexpose.count == 0)
 				drw_map(drw, win, 0, 0, mw, mh);
@@ -658,7 +774,8 @@ setup(void)
 	/* create menu window */
 	swa.override_redirect = True;
 	swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
 -	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
 +	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask |
 +	                 ButtonPressMask;
 	win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
 	                    CopyFromParent, CopyFromParent, CopyFromParent,
 	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
--- a/dmenu-numbers-4.9.diff
+++ b/dmenu-numbers-4.9.diff
@ -0,0 +1,81 @@
 From 61abc60dbfaa8ec63fcd176307308aee88a19e32 Mon Sep 17 00:00:00 2001
 From: Miles Alan <m@milesalan.com>
 Date: Sat, 10 Aug 2019 17:20:08 -0500
 Subject: [PATCH] Display number of matched and total items in top right corner
 ---
 dmenu.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)
 diff --git a/dmenu.c b/dmenu.c
 index 6b8f51b..98c5810 100644
 --- a/dmenu.c
 +++ b/dmenu.c
@@ -24,6 +24,8 @@
                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
 #define LENGTH(X)             (sizeof X / sizeof X[0])
 #define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)
 +#define NUMBERSMAXDIGITS      100
 +#define NUMBERSBUFSIZE        (NUMBERSMAXDIGITS * 2) + 1
 /* enums */
 enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
@@ -34,6 +36,7 @@ struct item {
 	int out;
 };
 +static char numbers[NUMBERSBUFSIZE] = "";
 static char text[BUFSIZ] = "";
 static char *embed;
 static int bh, mw, mh;
@@ -126,6 +129,21 @@ drawitem(struct item *item, int x, int y, int w)
 	return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
 }
 +static void
 +recalculatenumbers()
 +{
 +	unsigned int numer = 0, denom = 0;
 +	struct item *item;
 +	if (matchend) {
 +		numer++;
 +		for (item = matchend; item && item->left; item = item->left)
 +			numer++;
 +	}
 +	for (item = items; item && item->text; item++)
 +		denom++;
 +	snprintf(numbers, NUMBERSBUFSIZE, "%d/%d", numer, denom);
 +}
 +
 static void
 drawmenu(void)
 {
@@ -151,6 +169,7 @@ drawmenu(void)
 		drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
 	}
 +	recalculatenumbers();
 	if (lines > 0) {
 		/* draw vertical list */
 		for (item = curr; item != next; item = item->right)
@@ -165,13 +184,15 @@ drawmenu(void)
 		}
 		x += w;
 		for (item = curr; item != next; item = item->right)
 -			x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
 +			x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">") - TEXTW(numbers)));
 		if (next) {
 			w = TEXTW(">");
 			drw_setscheme(drw, scheme[SchemeNorm]);
 -			drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
 +			drw_text(drw, mw - w - TEXTW(numbers), 0, w, bh, lrpad / 2, ">", 0);
 		}
 	}
 +	drw_setscheme(drw, scheme[SchemeNorm]);
 +	drw_text(drw, mw - TEXTW(numbers), 0, TEXTW(numbers), bh, lrpad / 2, numbers, 0);
 	drw_map(drw, win, 0, 0, mw, mh);
 }
 -- 
 2.19.2
--- a/dmenu.1
+++ b/dmenu.1
@ -0,0 +1,225 @@
 .TH DMENU 1 dmenu\-VERSION
 .SH NAME
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
 .RB [ \-bfiv ]
 .RB [ \-g
 .IR columns ]
 .RB [ \-l
 .IR lines ]
 .RB [ \-m
 .IR monitor ]
 .RB [ \-p
 .IR prompt ]
 .RB [ \-fn
 .IR font ]
 .RB [ \-nb
 .IR color ]
 .RB [ \-nf
 .IR color ]
 .RB [ \-sb
 .IR color ]
 .RB [ \-sf
 .IR color ]
 .RB [ \-nhb
 .IR color ]
 .RB [ \-nhf
 .IR color ]
 .RB [ \-shb
 .IR color ]
 .RB [ \-shf
 .IR color ]
 .RB [ \-w
 .IR windowid ]
 .P
 .BR dmenu_run " ..."
 .SH DESCRIPTION
 .B dmenu
 is a dynamic menu for X, which reads a list of newline\-separated items from
 stdin.  When the user selects an item and presses Return, their choice is printed
 to stdout and dmenu terminates.  Entering text will narrow the items to those
 matching the tokens in the input.
 .P
 .B dmenu_run
 is a script used by
 .IR dwm (1)
 which lists programs in the user's $PATH and runs the result in their $SHELL.
 .SH OPTIONS
 .TP
 .B \-b
 dmenu appears at the bottom of the screen.
 .TP
 .B \-c
 dmenu appears centered on the screen.
 .TP
 .B \-f
 dmenu grabs the keyboard before reading stdin if not reading from a tty. This
 is faster, but will lock up X until stdin reaches end\-of\-file.
 .TP
 .B \-i
 dmenu matches menu items case insensitively.
 .TP
 .BI \-g " columns"
 dmenu lists items in a grid with the given number of columns.
 .TP
 .BI \-l " lines"
 dmenu lists items in a grid with the given number of lines.
 .TP
 .BI \-h " height"
 dmenu uses a menu line of at least 'height' pixels tall, but no less than 8.
 .TP
 .BI \-m " monitor"
 dmenu is displayed on the monitor number supplied. Monitor numbers are starting
 from 0.
 .TP
 .BI \-p " prompt"
 defines the prompt to be displayed to the left of the input field.
 .TP
 .BI \-fn " font"
 defines the font or font set used.
 .TP
 .BI \-nb " color"
 defines the normal background color.
 .IR #RGB ,
 .IR #RRGGBB ,
 and X color names are supported.
 .TP
 .BI \-nf " color"
 defines the normal foreground color.
 .TP
 .BI \-sb " color"
 defines the selected background color.
 .TP
 .BI \-sf " color"
 defines the selected foreground color.
 .TP
 .BI \-nhb " color"
 defines the normal highlight background color.
 .TP
 .BI \-nhf " color"
 defines the normal highlight foreground color.
 .TP
 .BI \-shb " color"
 defines the selected highlight background color.
 .TP
 .BI \-shf " color"
 defines the selected highlight foreground color.
 .TP
 .B \-v
 prints version information to stdout, then exits.
 .TP
 .BI \-w " windowid"
 embed into windowid.
 .SH USAGE
 dmenu is completely controlled by the keyboard.  Items are selected using the
 arrow keys, page up, page down, home, and end.
 .TP
 .B Tab
 Copy the selected item to the input field.
 .TP
 .B Return
 Confirm selection.  Prints the selected item to stdout and exits, returning
 success.
 .TP
 .B Ctrl-Return
 Confirm selection.  Prints the selected item to stdout and continues.
 .TP
 .B Shift\-Return
 Confirm input.  Prints the input text to stdout and exits, returning success.
 .TP
 .B Escape
 Exit without selecting an item, returning failure.
 .TP
 .B Ctrl-Left
 Move cursor to the start of the current word
 .TP
 .B Ctrl-Right
 Move cursor to the end of the current word
 .TP
 .B C\-a
 Home
 .TP
 .B C\-b
 Left
 .TP
 .B C\-c
 Escape
 .TP
 .B C\-d
 Delete
 .TP
 .B C\-e
 End
 .TP
 .B C\-f
 Right
 .TP
 .B C\-g
 Escape
 .TP
 .B C\-h
 Backspace
 .TP
 .B C\-i
 Tab
 .TP
 .B C\-j
 Return
 .TP
 .B C\-J
 Shift-Return
 .TP
 .B C\-k
 Delete line right
 .TP
 .B C\-m
 Return
 .TP
 .B C\-M
 Shift-Return
 .TP
 .B C\-n
 Down
 .TP
 .B C\-p
 Up
 .TP
 .B C\-u
 Delete line left
 .TP
 .B C\-w
 Delete word left
 .TP
 .B C\-y
 Paste from primary X selection
 .TP
 .B C\-Y
 Paste from X clipboard
 .TP
 .B M\-b
 Move cursor to the start of the current word
 .TP
 .B M\-f
 Move cursor to the end of the current word
 .TP
 .B M\-g
 Home
 .TP
 .B M\-G
 End
 .TP
 .B M\-h
 Up
 .TP
 .B M\-j
 Page down
 .TP
 .B M\-k
 Page up
 .TP
 .B M\-l
 Down
 .SH SEE ALSO
 .IR dwm (1),
 .IR stest (1)
--- a/dmenu.c
+++ b/dmenu.c
--- a/dmenu.o
+++ b/dmenu.o
--- a/13
+++ b/13
@ -0,0 +1,13 @@
 #!/bin/sh
 cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
 cache="$cachedir/dmenu_run"
 [ ! -e "$cachedir" ] && mkdir -p "$cachedir"
 IFS=:
 if stest -dqr -n "$cache" $PATH; then
 	stest -flx $PATH | sort -u | tee "$cache"
 else
 	cat "$cache"
 fi
--- a/2
+++ b/2
@ -0,0 +1,2 @@
 #!/bin/sh
 dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"} &
--- a/drw.c
+++ b/drw.c
@ -0,0 +1,436 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 #include "drw.h"
 #include "util.h"
 #define UTF_INVALID 0xFFFD
 #define UTF_SIZ     4
 static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
 static const long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
 static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 static long
 utf8decodebyte(const char c, size_t *i)
 {
 	for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
 		if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
 			return (unsigned char)c & ~utfmask[*i];
 	return 0;
 }
 static size_t
 utf8validate(long *u, size_t i)
 {
 	if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
 		*u = UTF_INVALID;
 	for (i = 1; *u > utfmax[i]; ++i)
 		;
 	return i;
 }
 static size_t
 utf8decode(const char *c, long *u, size_t clen)
 {
 	size_t i, j, len, type;
 	long udecoded;
 	*u = UTF_INVALID;
 	if (!clen)
 		return 0;
 	udecoded = utf8decodebyte(c[0], &len);
 	if (!BETWEEN(len, 1, UTF_SIZ))
 		return 1;
 	for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
 		udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
 		if (type)
 			return j;
 	}
 	if (j < len)
 		return 0;
 	*u = udecoded;
 	utf8validate(u, len);
 	return len;
 }
 Drw *
 drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
 {
 	Drw *drw = ecalloc(1, sizeof(Drw));
 	drw->dpy = dpy;
 	drw->screen = screen;
 	drw->root = root;
 	drw->w = w;
 	drw->h = h;
 	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
 	drw->gc = XCreateGC(dpy, root, 0, NULL);
 	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
 	return drw;
 }
 void
 drw_resize(Drw *drw, unsigned int w, unsigned int h)
 {
 	if (!drw)
 		return;
 	drw->w = w;
 	drw->h = h;
 	if (drw->drawable)
 		XFreePixmap(drw->dpy, drw->drawable);
 	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
 }
 void
 drw_free(Drw *drw)
 {
 	XFreePixmap(drw->dpy, drw->drawable);
 	XFreeGC(drw->dpy, drw->gc);
 	drw_fontset_free(drw->fonts);
 	free(drw);
 }
 /* This function is an implementation detail. Library users should use
 * drw_fontset_create instead.
 */
 static Fnt *
 xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
 {
 	Fnt *font;
 	XftFont *xfont = NULL;
 	FcPattern *pattern = NULL;
 	if (fontname) {
 		/* Using the pattern found at font->xfont->pattern does not yield the
 		 * same substitution results as using the pattern returned by
 		 * FcNameParse; using the latter results in the desired fallback
 		 * behaviour whereas the former just results in missing-character
 		 * rectangles being drawn, at least with some fonts. */
 		if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
 			fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
 			return NULL;
 		}
 		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
 			fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
 			XftFontClose(drw->dpy, xfont);
 			return NULL;
 		}
 	} else if (fontpattern) {
 		if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
 			fprintf(stderr, "error, cannot load font from pattern.\n");
 			return NULL;
 		}
 	} else {
 		die("no font specified.");
 	}
 	/* Do not allow using color fonts. This is a workaround for a BadLength
 	 * error from Xft with color glyphs. Modelled on the Xterm workaround. See
 	 * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
 	 * https://lists.suckless.org/dev/1701/30932.html
 	 * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
 	 * and lots more all over the internet.
 	 */
 	FcBool iscol;
 	if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
 		XftFontClose(drw->dpy, xfont);
 		return NULL;
 	}
 	font = ecalloc(1, sizeof(Fnt));
 	font->xfont = xfont;
 	font->pattern = pattern;
 	font->h = xfont->ascent + xfont->descent;
 	font->dpy = drw->dpy;
 	return font;
 }
 static void
 xfont_free(Fnt *font)
 {
 	if (!font)
 		return;
 	if (font->pattern)
 		FcPatternDestroy(font->pattern);
 	XftFontClose(font->dpy, font->xfont);
 	free(font);
 }
 Fnt*
 drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
 {
 	Fnt *cur, *ret = NULL;
 	size_t i;
 	if (!drw || !fonts)
 		return NULL;
 	for (i = 1; i <= fontcount; i++) {
 		if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
 			cur->next = ret;
 			ret = cur;
 		}
 	}
 	return (drw->fonts = ret);
 }
 void
 drw_fontset_free(Fnt *font)
 {
 	if (font) {
 		drw_fontset_free(font->next);
 		xfont_free(font);
 	}
 }
 void
 drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
 {
 	if (!drw || !dest || !clrname)
 		return;
 	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
 	                       DefaultColormap(drw->dpy, drw->screen),
 	                       clrname, dest))
 		die("error, cannot allocate color '%s'", clrname);
 }
 /* Wrapper to create color schemes. The caller has to call free(3) on the
 * returned color scheme when done using it. */
 Clr *
 drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
 {
 	size_t i;
 	Clr *ret;
 	/* need at least two colors for a scheme */
 	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
 		return NULL;
 	for (i = 0; i < clrcount; i++)
 		drw_clr_create(drw, &ret[i], clrnames[i]);
 	return ret;
 }
 void
 drw_setfontset(Drw *drw, Fnt *set)
 {
 	if (drw)
 		drw->fonts = set;
 }
 void
 drw_setscheme(Drw *drw, Clr *scm)
 {
 	if (drw)
 		drw->scheme = scm;
 }
 void
 drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
 {
 	if (!drw || !drw->scheme)
 		return;
 	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
 	if (filled)
 		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
 	else
 		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
 }
 int
 drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
 {
 	char buf[1024];
 	int ty;
 	unsigned int ew;
 	XftDraw *d = NULL;
 	Fnt *usedfont, *curfont, *nextfont;
 	size_t i, len;
 	int utf8strlen, utf8charlen, render = x || y || w || h;
 	long utf8codepoint = 0;
 	const char *utf8str;
 	FcCharSet *fccharset;
 	FcPattern *fcpattern;
 	FcPattern *match;
 	XftResult result;
 	int charexists = 0;
 	if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
 		return 0;
 	if (!render) {
 		w = ~w;
 	} else {
 		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
 		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
 		d = XftDrawCreate(drw->dpy, drw->drawable,
 		                  DefaultVisual(drw->dpy, drw->screen),
 		                  DefaultColormap(drw->dpy, drw->screen));
 		x += lpad;
 		w -= lpad;
 	}
 	usedfont = drw->fonts;
 	while (1) {
 		utf8strlen = 0;
 		utf8str = text;
 		nextfont = NULL;
 		while (*text) {
 			utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
 			for (curfont = drw->fonts; curfont; curfont = curfont->next) {
 				charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
 				if (charexists) {
 					if (curfont == usedfont) {
 						utf8strlen += utf8charlen;
 						text += utf8charlen;
 					} else {
 						nextfont = curfont;
 					}
 					break;
 				}
 			}
 			if (!charexists || nextfont)
 				break;
 			else
 				charexists = 0;
 		}
 		if (utf8strlen) {
 			drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
 			/* shorten text if necessary */
 			for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--)
 				drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
 			if (len) {
 				memcpy(buf, utf8str, len);
 				buf[len] = '\0';
 				if (len < utf8strlen)
 					for (i = len; i && i > len - 3; buf[--i] = '.')
 						; /* NOP */
 				if (render) {
 					ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
 					XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
 					                  usedfont->xfont, x, ty, (XftChar8 *)buf, len);
 				}
 				x += ew;
 				w -= ew;
 			}
 		}
 		if (!*text) {
 			break;
 		} else if (nextfont) {
 			charexists = 0;
 			usedfont = nextfont;
 		} else {
 			/* Regardless of whether or not a fallback font is found, the
 			 * character must be drawn. */
 			charexists = 1;
 			fccharset = FcCharSetCreate();
 			FcCharSetAddChar(fccharset, utf8codepoint);
 			if (!drw->fonts->pattern) {
 				/* Refer to the comment in xfont_create for more information. */
 				die("the first font in the cache must be loaded from a font string.");
 			}
 			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
 			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
 			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
 			FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
 			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
 			FcDefaultSubstitute(fcpattern);
 			match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
 			FcCharSetDestroy(fccharset);
 			FcPatternDestroy(fcpattern);
 			if (match) {
 				usedfont = xfont_create(drw, NULL, match);
 				if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
 					for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
 						; /* NOP */
 					curfont->next = usedfont;
 				} else {
 					xfont_free(usedfont);
 					usedfont = drw->fonts;
 				}
 			}
 		}
 	}
 	if (d)
 		XftDrawDestroy(d);
 	return x + (render ? w : 0);
 }
 void
 drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
 {
 	if (!drw)
 		return;
 	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
 	XSync(drw->dpy, False);
 }
 unsigned int
 drw_fontset_getwidth(Drw *drw, const char *text)
 {
 	if (!drw || !drw->fonts || !text)
 		return 0;
 	return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
 }
 void
 drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
 {
 	XGlyphInfo ext;
 	if (!font || !text)
 		return;
 	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
 	if (w)
 		*w = ext.xOff;
 	if (h)
 		*h = font->h;
 }
 Cur *
 drw_cur_create(Drw *drw, int shape)
 {
 	Cur *cur;
 	if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
 		return NULL;
 	cur->cursor = XCreateFontCursor(drw->dpy, shape);
 	return cur;
 }
 void
 drw_cur_free(Drw *drw, Cur *cursor)
 {
 	if (!cursor)
 		return;
 	XFreeCursor(drw->dpy, cursor->cursor);
 	free(cursor);
 }
--- a/drw.h
+++ b/drw.h
@ -0,0 +1,57 @@
 /* See LICENSE file for copyright and license details. */
 typedef struct {
 	Cursor cursor;
 } Cur;
 typedef struct Fnt {
 	Display *dpy;
 	unsigned int h;
 	XftFont *xfont;
 	FcPattern *pattern;
 	struct Fnt *next;
 } Fnt;
 enum { ColFg, ColBg }; /* Clr scheme index */
 typedef XftColor Clr;
 typedef struct {
 	unsigned int w, h;
 	Display *dpy;
 	int screen;
 	Window root;
 	Drawable drawable;
 	GC gc;
 	Clr *scheme;
 	Fnt *fonts;
 } Drw;
 /* Drawable abstraction */
 Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
 void drw_resize(Drw *drw, unsigned int w, unsigned int h);
 void drw_free(Drw *drw);
 /* Fnt abstraction */
 Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
 void drw_fontset_free(Fnt* set);
 unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
 void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
 /* Colorscheme abstraction */
 void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
 Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
 /* Cursor abstraction */
 Cur *drw_cur_create(Drw *drw, int shape);
 void drw_cur_free(Drw *drw, Cur *cursor);
 /* Drawing context manipulation */
 void drw_setfontset(Drw *drw, Fnt *set);
 void drw_setscheme(Drw *drw, Clr *scm);
 /* Drawing functions */
 void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
 int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
 /* Map functions */
 void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
--- a/drw.o
+++ b/drw.o
--- a/BIN
+++ b/BIN
--- a/stest.1
+++ b/stest.1
@ -0,0 +1,90 @@
 .TH STEST 1 dmenu\-VERSION
 .SH NAME
 stest \- filter a list of files by properties
 .SH SYNOPSIS
 .B stest
 .RB [ -abcdefghlpqrsuwx ]
 .RB [ -n
 .IR file ]
 .RB [ -o
 .IR file ]
 .RI [ file ...]
 .SH DESCRIPTION
 .B stest
 takes a list of files and filters by the files' properties, analogous to
 .IR test (1).
 Files which pass all tests are printed to stdout. If no files are given, stest
 reads files from stdin.
 .SH OPTIONS
 .TP
 .B \-a
 Test hidden files.
 .TP
 .B \-b
 Test that files are block specials.
 .TP
 .B \-c
 Test that files are character specials.
 .TP
 .B \-d
 Test that files are directories.
 .TP
 .B \-e
 Test that files exist.
 .TP
 .B \-f
 Test that files are regular files.
 .TP
 .B \-g
 Test that files have their set-group-ID flag set.
 .TP
 .B \-h
 Test that files are symbolic links.
 .TP
 .B \-l
 Test the contents of a directory given as an argument.
 .TP
 .BI \-n " file"
 Test that files are newer than
 .IR file .
 .TP
 .BI \-o " file"
 Test that files are older than
 .IR file .
 .TP
 .B \-p
 Test that files are named pipes.
 .TP
 .B \-q
 No files are printed, only the exit status is returned.
 .TP
 .B \-r
 Test that files are readable.
 .TP
 .B \-s
 Test that files are not empty.
 .TP
 .B \-u
 Test that files have their set-user-ID flag set.
 .TP
 .B \-v
 Invert the sense of tests, only failing files pass.
 .TP
 .B \-w
 Test that files are writable.
 .TP
 .B \-x
 Test that files are executable.
 .SH EXIT STATUS
 .TP
 .B 0
 At least one file passed all tests.
 .TP
 .B 1
 No files passed all tests.
 .TP
 .B 2
 An error occurred.
 .SH SEE ALSO
 .IR dmenu (1),
 .IR test (1)
--- a/stest.c
+++ b/stest.c
@ -0,0 +1,109 @@
 /* See LICENSE file for copyright and license details. */
 #include <sys/stat.h>
 #include <dirent.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "arg.h"
 char *argv0;
 #define FLAG(x)  (flag[(x)-'a'])
 static void test(const char *, const char *);
 static void usage(void);
 static int match = 0;
 static int flag[26];
 static struct stat old, new;
 static void
 test(const char *path, const char *name)
 {
 	struct stat st, ln;
 	if ((!stat(path, &st) && (FLAG('a') || name[0] != '.')        /* hidden files      */
 	&& (!FLAG('b') || S_ISBLK(st.st_mode))                        /* block special     */
 	&& (!FLAG('c') || S_ISCHR(st.st_mode))                        /* character special */
 	&& (!FLAG('d') || S_ISDIR(st.st_mode))                        /* directory         */
 	&& (!FLAG('e') || access(path, F_OK) == 0)                    /* exists            */
 	&& (!FLAG('f') || S_ISREG(st.st_mode))                        /* regular file      */
 	&& (!FLAG('g') || st.st_mode & S_ISGID)                       /* set-group-id flag */
 	&& (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link     */
 	&& (!FLAG('n') || st.st_mtime > new.st_mtime)                 /* newer than file   */
 	&& (!FLAG('o') || st.st_mtime < old.st_mtime)                 /* older than file   */
 	&& (!FLAG('p') || S_ISFIFO(st.st_mode))                       /* named pipe        */
 	&& (!FLAG('r') || access(path, R_OK) == 0)                    /* readable          */
 	&& (!FLAG('s') || st.st_size > 0)                             /* not empty         */
 	&& (!FLAG('u') || st.st_mode & S_ISUID)                       /* set-user-id flag  */
 	&& (!FLAG('w') || access(path, W_OK) == 0)                    /* writable          */
 	&& (!FLAG('x') || access(path, X_OK) == 0)) != FLAG('v')) {   /* executable        */
 		if (FLAG('q'))
 			exit(0);
 		match = 1;
 		puts(name);
 	}
 }
 static void
 usage(void)
 {
 	fprintf(stderr, "usage: %s [-abcdefghlpqrsuvwx] "
 	        "[-n file] [-o file] [file...]\n", argv0);
 	exit(2); /* like test(1) return > 1 on error */
 }
 int
 main(int argc, char *argv[])
 {
 	struct dirent *d;
 	char path[PATH_MAX], *line = NULL, *file;
 	size_t linesiz = 0;
 	ssize_t n;
 	DIR *dir;
 	int r;
 	ARGBEGIN {
 	case 'n': /* newer than file */
 	case 'o': /* older than file */
 		file = EARGF(usage());
 		if (!(FLAG(ARGC()) = !stat(file, (ARGC() == 'n' ? &new : &old))))
 			perror(file);
 		break;
 	default:
 		/* miscellaneous operators */
 		if (strchr("abcdefghlpqrsuvwx", ARGC()))
 			FLAG(ARGC()) = 1;
 		else
 			usage(); /* unknown flag */
 	} ARGEND;
 	if (!argc) {
 		/* read list from stdin */
 		while ((n = getline(&line, &linesiz, stdin)) > 0) {
 			if (n && line[n - 1] == '\n')
 				line[n - 1] = '\0';
 			test(line, line);
 		}
 		free(line);
 	} else {
 		for (; argc; argc--, argv++) {
 			if (FLAG('l') && (dir = opendir(*argv))) {
 				/* test directory contents */
 				while ((d = readdir(dir))) {
 					r = snprintf(path, sizeof path, "%s/%s",
 					             *argv, d->d_name);
 					if (r >= 0 && (size_t)r < sizeof path)
 						test(path, d->d_name);
 				}
 				closedir(dir);
 			} else {
 				test(*argv, *argv);
 			}
 		}
 	}
 	return match ? 0 : 1;
 }
--- a/stest.o
+++ b/stest.o
--- a/util.c
+++ b/util.c
@ -0,0 +1,35 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "util.h"
 void *
 ecalloc(size_t nmemb, size_t size)
 {
 	void *p;
 	if (!(p = calloc(nmemb, size)))
 		die("calloc:");
 	return p;
 }
 void
 die(const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
 	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
 		fputc(' ', stderr);
 		perror(NULL);
 	} else {
 		fputc('\n', stderr);
 	}
 	exit(1);
 }
--- a/util.h
+++ b/util.h
@ -0,0 +1,8 @@
 /* See LICENSE file for copyright and license details. */
 #define MAX(A, B)               ((A) > (B) ? (A) : (B))
 #define MIN(A, B)               ((A) < (B) ? (A) : (B))
 #define BETWEEN(X, A, B)        ((A) <= (X) && (X) <= (B))
 void die(const char *fmt, ...);
 void *ecalloc(size_t nmemb, size_t size);
--- a/util.o
+++ b/util.o
	`@ -0,0 +1,2 @@`
					`#!/bin/sh`
					`dmenu_path \| dmenu "$@" \| ${SHELL:-"/bin/sh"} &`