dmenu: complete rebase, add new patches plus fix old ones (no xresources)

14 files changed, 1429 insertions, 146 deletions

diff --git a/patches/dmenu-border-4.9.diff b/patches/dmenu-border-4.9.diff
deleted file mode 100644
index 89b4437..0000000
--- a/patches/dmenu-border-4.9.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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 */
diff --git a/patches/dmenu-borderoption-20200217-bf60a1e.diff b/patches/dmenu-borderoption-20200217-bf60a1e.diff
new file mode 100644
index 0000000..b9b5726
--- /dev/null
+++ b/patches/dmenu-borderoption-20200217-bf60a1e.diff
@@ -0,0 +1,46 @@
+From bf60a1eaf98c7aebae51021914e35bc73dd8c23e Mon Sep 17 00:00:00 2001
+From: 0x1bi <ben@0x1bi.net>
+Date: Mon, 17 Feb 2020 11:02:35 -0500
+Subject: [PATCH] added border with option
+
+
+diff --git a/config.def.h b/config.def.h
+index 1edb647..dd3eb31 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -21,3 +21,6 @@ static unsigned int lines      = 0;
+  * for example: " /?\"&[]"
+  */
+ static const char worddelimiters[] = " ";
++
++/* Size of the window border */
++static unsigned int border_width = 0;
+diff --git a/dmenu.c b/dmenu.c
+index 65f25ce..f0c3c6f 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -659,9 +659,11 @@ 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);
++	if (border_width)
++		XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
+ 	XSetClassHint(dpy, win, &ch);
+ 
+ 
+@@ -733,6 +735,8 @@ main(int argc, char *argv[])
+ 			colors[SchemeSel][ColFg] = argv[++i];
+ 		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
+ 			embed = argv[++i];
++		else if (!strcmp(argv[i], "-bw"))
++			border_width = atoi(argv[++i]); /* border width */
+ 		else
+ 			usage();
+ 
+-- 
+2.24.1
+
diff --git a/patches/dmenu-caseinsensitive-5.0.diff b/patches/dmenu-caseinsensitive-5.0.diff
new file mode 100644
index 0000000..f476bc9
--- /dev/null
+++ b/patches/dmenu-caseinsensitive-5.0.diff
@@ -0,0 +1,53 @@
+diff --git a/dmenu.1 b/dmenu.1
+index 323f93c..3e3b31b 100644
+--- a/dmenu.1
++++ b/dmenu.1
+@@ -3,7 +3,7 @@
+ dmenu \- dynamic menu
+ .SH SYNOPSIS
+ .B dmenu
+-.RB [ \-bfiv ]
++.RB [ \-bfsv ]
+ .RB [ \-l
+ .IR lines ]
+ .RB [ \-m
+@@ -44,8 +44,8 @@ dmenu appears at the bottom of the screen.
+ 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.
++.B \-s
++dmenu matches menu items case sensitively.
+ .TP
+ .BI \-l " lines"
+ dmenu lists items vertically, with the given number of lines.
+diff --git a/dmenu.c b/dmenu.c
+index 65f25ce..855df59 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -55,8 +55,9 @@ static Clr *scheme[SchemeLast];
+ 
+ #include "config.h"
+ 
+-static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+-static char *(*fstrstr)(const char *, const char *) = strstr;
++static char * cistrstr(const char *s, const char *sub);
++static int (*fstrncmp)(const char *, const char *, size_t) = strncasecmp;
++static char *(*fstrstr)(const char *, const char *) = cistrstr;
+ 
+ static void
+ appenditem(struct item *item, struct item **list, struct item **last)
+@@ -709,9 +710,9 @@ 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], "-i")) { /* case-insensitive item matching */
+-			fstrncmp = strncasecmp;
+-			fstrstr = cistrstr;
++		else if (!strcmp(argv[i], "-s")) { /* case-sensitive item matching */
++			fstrncmp = strncmp;
++			fstrstr = strstr;
+ 		} else if (i + 1 == argc)
+ 			usage();
+ 		/* these options take one argument */
diff --git a/patches/dmenu-center-20200111-8cd37e1.diff b/patches/dmenu-center-20200111-8cd37e1.diff
new file mode 100644
index 0000000..af249a6
--- /dev/null
+++ b/patches/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
+
diff --git a/patches/dmenu-emoji-highlight-5.0.diff b/patches/dmenu-emoji-highlight-5.0.diff
new file mode 100644
index 0000000..c52326b
--- /dev/null
+++ b/patches/dmenu-emoji-highlight-5.0.diff
@@ -0,0 +1,297 @@
+diff --git a/config.def.h b/config.def.h
+index 1edb647..ed3b175 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -4,18 +4,33 @@
+ static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */
+ /* -fn option overrides fonts[0]; default X11 font or font set */
+ static const char *fonts[] = {
+-	"monospace:size=10"
++    "monospace:size=10",
++    "FiraCode Nerd Font:size=12",
+ };
++
+ static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
+-static const char *colors[SchemeLast][2] = {
+-	/*     fg         bg       */
+-	[SchemeNorm] = { "#bbbbbb", "#222222" },
+-	[SchemeSel] = { "#eeeeee", "#005577" },
+-	[SchemeOut] = { "#000000", "#00ffff" },
++static const char *colors[SchemeLast][10] = {
++    /*     fg         bg       */
++    [SchemeNorm] = { "#bbbbbb", "#222222", "#222222" },
++    [SchemeSel] = { "#eeeeee", "#005577", "#005577" },
++    [SchemeOut] = { "#000000", "#00ffff", "#00ffff" },
++    [SchemeHighlight] = {"#f1fa8c", "#596377", "#3E485B"},
++    [SchemeHover] = {"#ffffff", "#353D4B", "#3E485B"},
++    [SchemeGreen] = {"#ffffff", "#52E067", "#41b252"},
++    [SchemeRed] = {"#ffffff", "#e05252", "#c24343"},
++    [SchemeYellow] = {"#ffffff", "#e0c452", "#bca33f"},
++    [SchemeBlue] = {"#ffffff", "#5280e0", "#3a62b3"},
++    [SchemePurple] = {"#ffffff", "#9952e0", "#7439b0"},
+ };
+ /* -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     */
++static unsigned int min_lineheight = 8;
++static int sely = 0;
++static int commented = 0;
++static int animated = 0;
++
+ /*
+  * Characters not considered part of a word while deleting words
+  * for example: " /?\"&[]"
+diff --git a/dmenu.c b/dmenu.c
+index 65f25ce..a558fcb 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -26,7 +26,20 @@
+ #define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)
+ 
+ /* enums */
+-enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
++enum {
++  SchemeNorm,
++  SchemeFade,
++  SchemeHighlight,
++  SchemeHover,
++  SchemeSel,
++  SchemeOut,
++  SchemeGreen,
++  SchemeYellow,
++  SchemeBlue,
++  SchemePurple,
++  SchemeRed,
++  SchemeLast
++}; /* color schemes */
+ 
+ struct item {
+ 	char *text;
+@@ -37,6 +50,9 @@ struct item {
+ static char text[BUFSIZ] = "";
+ static char *embed;
+ static int bh, mw, mh;
++static int dmx = 0; /* put dmenu at this x offset */
++static int dmy = 0; /* put dmenu at this y offset (measured from the bottom if topbar is 0) */
++static unsigned int dmw = 0; /* make dmenu this wide */
+ static int inputw = 0, promptw;
+ static int lrpad; /* sum of left and right padding */
+ static size_t cursor;
+@@ -114,16 +130,117 @@ cistrstr(const char *s, const char *sub)
+ }
+ 
+ static int
+-drawitem(struct item *item, int x, int y, int w)
+-{
+-	if (item == sel)
+-		drw_setscheme(drw, scheme[SchemeSel]);
+-	else if (item->out)
+-		drw_setscheme(drw, scheme[SchemeOut]);
+-	else
+-		drw_setscheme(drw, scheme[SchemeNorm]);
+-
+-	return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
++drawitem(struct item *item, int x, int y, int w) {
++  int iscomment = 0;
++  if (item->text[0] == '>') {
++    if (item->text[1] == '>') {
++      iscomment = 3;
++      switch (item->text[2]) {
++      case 'r':
++        drw_setscheme(drw, scheme[SchemeRed]);
++        break;
++      case 'g':
++        drw_setscheme(drw, scheme[SchemeGreen]);
++        break;
++      case 'y':
++        drw_setscheme(drw, scheme[SchemeYellow]);
++        break;
++      case 'b':
++        drw_setscheme(drw, scheme[SchemeBlue]);
++        break;
++      case 'p':
++        drw_setscheme(drw, scheme[SchemePurple]);
++        break;
++      case 'h':
++        drw_setscheme(drw, scheme[SchemeHighlight]);
++        break;
++      case 's':
++        drw_setscheme(drw, scheme[SchemeSel]);
++        break;
++      default:
++        iscomment = 1;
++        drw_setscheme(drw, scheme[SchemeNorm]);
++        break;
++      }
++    } else {
++      drw_setscheme(drw, scheme[SchemeNorm]);
++      iscomment = 1;
++    }
++
++  } else if (item->text[0] == ':') {
++    iscomment = 2;
++    if (item == sel) {
++      switch (item->text[1]) {
++      case 'r':
++        drw_setscheme(drw, scheme[SchemeRed]);
++        break;
++      case 'g':
++        drw_setscheme(drw, scheme[SchemeGreen]);
++        break;
++      case 'y':
++        drw_setscheme(drw, scheme[SchemeYellow]);
++        break;
++      case 'b':
++        drw_setscheme(drw, scheme[SchemeBlue]);
++        break;
++      case 'p':
++        drw_setscheme(drw, scheme[SchemePurple]);
++        break;
++      case 'h':
++        drw_setscheme(drw, scheme[SchemeHighlight]);
++        break;
++      case 's':
++        drw_setscheme(drw, scheme[SchemeSel]);
++        break;
++      default:
++        drw_setscheme(drw, scheme[SchemeSel]);
++        iscomment = 0;
++        break;
++      }
++    } else {
++      drw_setscheme(drw, scheme[SchemeNorm]);
++    }
++  } else {
++    if (item == sel)
++      drw_setscheme(drw, scheme[SchemeSel]);
++    else if (item->out)
++      drw_setscheme(drw, scheme[SchemeOut]);
++    else
++      drw_setscheme(drw, scheme[SchemeNorm]);
++  }
++
++  int temppadding;
++  temppadding = 0;
++  if (iscomment == 2) {
++    if (item->text[2] == ' ') {
++      temppadding = drw->fonts->h * 3;
++      animated = 1;
++      char dest[1000];
++      strcpy(dest, item->text);
++      dest[6] = '\0';
++      drw_text(drw, x, y, temppadding, lineheight, temppadding / 2.6, dest + 3, 0);
++      iscomment = 6;
++      drw_setscheme(drw, sel == item ? scheme[SchemeHover] : scheme[SchemeNorm]);
++    }
++  }
++
++  char *output;
++  if (commented) {
++    static char onestr[2];
++    onestr[0] = item->text[0];
++    onestr[1] = '\0';
++    output = onestr;
++  } else {
++    output = item->text;
++  }
++
++  if (item == sel)
++    sely = y;
++  return drw_text(
++      drw, x + ((iscomment == 6) ? temppadding : 0), y,
++      commented ? bh : (w - ((iscomment == 6) ? temppadding : 0)), bh,
++      commented ? (bh - drw_fontset_getwidth(drw, (output))) / 2 : lrpad / 2,
++      output + iscomment, 0);
+ }
+ 
+ static void
+@@ -131,7 +248,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 +265,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) {
+@@ -609,6 +726,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
+@@ -637,9 +755,9 @@ 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;
++		x = info[i].x_org + dmx;
++		y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy);
++		mw = (dmw>0 ? dmw : info[i].width);
+ 		XFree(info);
+ 	} else
+ #endif
+@@ -647,9 +765,9 @@ 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;
++		x = dmx;
++		y = topbar ? dmy : wa.height - mh - dmy;
++		mw = (dmw>0 ? dmw : wa.width);
+ 	}
+ 	promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
+ 	inputw = MIN(inputw, mw/3);
+@@ -689,7 +807,8 @@ setup(void)
+ static void
+ usage(void)
+ {
+-	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
++	fputs("usage: dmenu [-bfiv] [-l lines] [-h height] [-p prompt] [-fn font] [-m monitor]\n"
++	      "             [-x xoffset] [-y yoffset] [-z width]\n"
+ 	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
+ 	exit(1);
+ }
+@@ -717,6 +836,16 @@ main(int argc, char *argv[])
+ 		/* these options take one argument */
+ 		else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
+ 			lines = atoi(argv[++i]);
++        else if (!strcmp(argv[i], "-x"))   /* window x offset */
++			dmx = atoi(argv[++i]);
++		else if (!strcmp(argv[i], "-y"))   /* window y offset (from bottom up if -b) */
++			dmy = atoi(argv[++i]);
++		else if (!strcmp(argv[i], "-z"))   /* make dmenu this wide */
++			dmw = atoi(argv[++i]);
++        else if (!strcmp(argv[i], "-h")) { /* minimum height of one menu line */
++			lineheight = atoi(argv[++i]);
++			lineheight = MAX(lineheight, min_lineheight);
++		}
+ 		else if (!strcmp(argv[i], "-m"))
+ 			mon = atoi(argv[++i]);
+ 		else if (!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
+@@ -752,6 +881,9 @@ main(int argc, char *argv[])
+ 		die("no fonts could be loaded.");
+ 	lrpad = drw->fonts->h;
+ 
++    if (lineheight == -1)
++        lineheight = drw->fonts->h * 2.5;
++
+ #ifdef __OpenBSD__
+ 	if (pledge("stdio rpath", NULL) == -1)
+ 		die("pledge");
diff --git a/patches/dmenu-fuzzyhighlight-4.9.diff b/patches/dmenu-fuzzyhighlight-4.9.diff
new file mode 100644
index 0000000..58d5c6f
--- /dev/null
+++ b/patches/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
diff --git a/patches/dmenu-fuzzymatch-4.9.diff b/patches/dmenu-fuzzymatch-4.9.diff
new file mode 100644
index 0000000..9fd206d
--- /dev/null
+++ b/patches/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
+
diff --git a/patches/dmenu-highlight-4.9.diff b/patches/dmenu-highlight-4.9.diff
deleted file mode 100644
index 04897ea..0000000
--- a/patches/dmenu-highlight-4.9.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-From 16abaf4bbea01234abab27fbfdfc921aad2fc364 Mon Sep 17 00:00:00 2001
-From: Miles Alan <m@milesalan.com>
-Date: Tue, 14 Jan 2020 21:50:04 -0600
-Subject: [PATCH] Highlight matched text in a different color scheme
-
----
- config.def.h |  2 ++
- dmenu.c      | 42 ++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 42 insertions(+), 2 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 1edb647..64eab2a 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -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 --git a/dmenu.c b/dmenu.c
-index 6b8f51b..c82bb6d 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, SchemeNormHighlight, SchemeSelHighlight, SchemeLast }; /* color schemes */
- 
- struct item {
- 	char *text;
-@@ -113,6 +113,42 @@ cistrstr(const char *s, const char *sub)
- 	return NULL;
- }
- 
-+static void
-+drawhighlights(struct item *item, int x, int y, int maxw)
-+{
-+	char restorechar, tokens[sizeof text], *highlight,  *token;
-+	int indentx, highlightlen;
-+
-+	drw_setscheme(drw, scheme[item == sel ? SchemeSelHighlight : SchemeNormHighlight]);
-+	strcpy(tokens, text);
-+	for (token = strtok(tokens, " "); token; token = strtok(NULL, " ")) {
-+		highlight = fstrstr(item->text, token);
-+		while (highlight) {
-+			// Move item str end, calc width for highlight indent, & restore
-+			highlightlen = highlight - item->text;
-+			restorechar = *highlight;
-+			item->text[highlightlen] = '\0';
-+			indentx = TEXTW(item->text);
-+			item->text[highlightlen] = restorechar;
-+
-+			// Move highlight str end, draw highlight, & restore
-+			restorechar = highlight[strlen(token)];
-+			highlight[strlen(token)] = '\0';
-+			drw_text(
-+				drw,
-+				x + indentx - (lrpad / 2) - 1,
-+				y,
-+				MIN(maxw - indentx, TEXTW(highlight) - lrpad),
-+				bh, 0, highlight, 0
-+			);
-+			highlight[strlen(token)] = restorechar;
-+
-+			if (strlen(highlight) - strlen(token) < strlen(token)) break;
-+			highlight = fstrstr(highlight + strlen(token), token);
-+		}
-+	}
-+}
-+
- static int
- drawitem(struct item *item, int x, int y, int w)
- {
-@@ -123,7 +159,9 @@ drawitem(struct item *item, int x, int y, int w)
- 	else
- 		drw_setscheme(drw, scheme[SchemeNorm]);
- 
--	return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
-+	int r = drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
-+	drawhighlights(item, x, y, w);
-+	return r;
- }
- 
- static void
--- 
-2.23.1
-
diff --git a/patches/dmenu-lineheight-4.9.diff b/patches/dmenu-lineheight-5.0.diff
index d12c77a..3b0df3d 100644
--- a/patches/dmenu-lineheight-4.9.diff
+++ b/patches/dmenu-lineheight-5.0.diff
@@ -1,6 +1,6 @@
-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
+From ba103e38ea4ab07f9a3ee90627714b9bea17c329 Mon Sep 17 00:00:00 2001
+From: pskry <peter@skrypalle.dk>
+Date: Sun, 8 Nov 2020 22:04:22 +0100
 Subject: [PATCH] Add an option which defines the lineheight
 
 Despite both the panel and dmenu using the same font (a Terminus 12),
@@ -9,28 +9,39 @@ 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(-)
+ config.def.h |  3 +++
+ dmenu.1      |  5 +++++
+ dmenu.c      | 11 ++++++++---
+ 3 files changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
-index 1edb647..317fa2f 100644
+index 1edb647..4394dec 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -15,6 +15,7 @@ static const char *colors[SchemeLast][2] = {
+@@ -15,6 +15,9 @@ 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     */
++/* -h option; minimum height of a menu line */
++static unsigned int lineheight = 0;
++static unsigned int min_lineheight = 8;
  
  /*
   * Characters not considered part of a word while deleting words
 diff --git a/dmenu.1 b/dmenu.1
-index 323f93c..7ef34d2 100644
+index 323f93c..f2a82b4 100644
 --- a/dmenu.1
 +++ b/dmenu.1
-@@ -50,6 +50,9 @@ dmenu matches menu items case insensitively.
+@@ -6,6 +6,8 @@ dmenu \- dynamic menu
+ .RB [ \-bfiv ]
+ .RB [ \-l
+ .IR lines ]
++.RB [ \-h
++.IR height ]
+ .RB [ \-m
+ .IR monitor ]
+ .RB [ \-p
+@@ -50,6 +52,9 @@ dmenu matches menu items case insensitively.
  .BI \-l " lines"
  dmenu lists items vertically, with the given number of lines.
  .TP
@@ -41,7 +52,7 @@ index 323f93c..7ef34d2 100644
  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
+index 65f25ce..f2a4047 100644
 --- a/dmenu.c
 +++ b/dmenu.c
 @@ -131,7 +131,7 @@ drawmenu(void)
@@ -58,11 +69,11 @@ index 6b8f51b..45d1946 100644
  	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);
++		drw_rect(drw, x + curpos, 2 + (bh - fh) / 2, 2, fh - 4, 1, 0);
  	}
  
  	if (lines > 0) {
-@@ -604,6 +604,7 @@ setup(void)
+@@ -609,6 +609,7 @@ setup(void)
  
  	/* calculate menu geometry */
  	bh = drw->fonts->h + 2;
@@ -70,25 +81,26 @@ index 6b8f51b..45d1946 100644
  	lines = MAX(lines, 0);
  	mh = (lines + 1) * bh;
  #ifdef XINERAMA
-@@ -683,6 +684,7 @@ static void
+@@ -689,7 +690,7 @@ setup(void)
+ static void
  usage(void)
  {
- 	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
-+	      "             [-h height]\n"
+-	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
++	fputs("usage: dmenu [-bfiv] [-l lines] [-h height] [-p prompt] [-fn font] [-m monitor]\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 */
+@@ -717,6 +718,10 @@ main(int argc, char *argv[])
+ 		/* these options take one argument */
+ 		else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
+ 			lines = atoi(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 */
++			lineheight = MAX(lineheight, min_lineheight);
 +		}
- 		else if (!strcmp(argv[i], "-nb"))  /* normal background color */
- 			colors[SchemeNorm][ColBg] = argv[++i];
- 		else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
+ 		else if (!strcmp(argv[i], "-m"))
+ 			mon = atoi(argv[++i]);
+ 		else if (!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
 -- 
-2.21.0
+2.29.2
 
diff --git a/patches/dmenu-mousesupport-5.0.diff b/patches/dmenu-mousesupport-5.0.diff
new file mode 100644
index 0000000..6a8c4d4
--- /dev/null
+++ b/patches/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);
diff --git a/patches/dmenu-password-5.0.diff b/patches/dmenu-password-5.0.diff
new file mode 100644
index 0000000..7a187b9
--- /dev/null
+++ b/patches/dmenu-password-5.0.diff
@@ -0,0 +1,103 @@
+From c4de1032bd4c247bc20b6ab92a10a8d778966679 Mon Sep 17 00:00:00 2001
+From: Mehrad Mahmoudian <m.mahmoudian@gmail.com>
+Date: Tue, 4 May 2021 12:05:09 +0300
+Subject: [PATCH] patched with password patch
+
+---
+ dmenu.1 |  5 ++++-
+ dmenu.c | 21 +++++++++++++++++----
+ 2 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/dmenu.1 b/dmenu.1
+index 323f93c..762f707 100644
+--- a/dmenu.1
++++ b/dmenu.1
+@@ -3,7 +3,7 @@
+ dmenu \- dynamic menu
+ .SH SYNOPSIS
+ .B dmenu
+-.RB [ \-bfiv ]
++.RB [ \-bfivP ]
+ .RB [ \-l
+ .IR lines ]
+ .RB [ \-m
+@@ -47,6 +47,9 @@ is faster, but will lock up X until stdin reaches end\-of\-file.
+ .B \-i
+ dmenu matches menu items case insensitively.
+ .TP
++.B \-P
++dmenu will not directly display the keyboard input, but instead replace it with dots. All data from stdin will be ignored.
++.TP
+ .BI \-l " lines"
+ dmenu lists items vertically, with the given number of lines.
+ .TP
+diff --git a/dmenu.c b/dmenu.c
+index 65f25ce..ad8f63b 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -37,7 +37,7 @@ struct item {
+ static char text[BUFSIZ] = "";
+ static char *embed;
+ static int bh, mw, mh;
+-static int inputw = 0, promptw;
++static int inputw = 0, promptw, passwd = 0;
+ static int lrpad; /* sum of left and right padding */
+ static size_t cursor;
+ static struct item *items = NULL;
+@@ -132,6 +132,7 @@ drawmenu(void)
+ 	unsigned int curpos;
+ 	struct item *item;
+ 	int x = 0, y = 0, w;
++	char *censort;
+ 
+ 	drw_setscheme(drw, scheme[SchemeNorm]);
+ 	drw_rect(drw, 0, 0, mw, mh, 1, 1);
+@@ -143,7 +144,12 @@ drawmenu(void)
+ 	/* draw input field */
+ 	w = (lines > 0 || !matches) ? mw - x : inputw;
+ 	drw_setscheme(drw, scheme[SchemeNorm]);
+-	drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
++	if (passwd) {
++	        censort = ecalloc(1, sizeof(text));
++		memset(censort, '.', strlen(text));
++		drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0);
++		free(censort);
++	} else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
+ 
+ 	curpos = TEXTW(text) - TEXTW(&text[cursor]);
+ 	if ((curpos += lrpad / 2 - 1) < w) {
+@@ -524,6 +530,11 @@ readstdin(void)
+ 	char buf[sizeof text], *p;
+ 	size_t i, imax = 0, size = 0;
+ 	unsigned int tmpmax = 0;
++	if(passwd){
++    	inputw = lines = 0;
++    	return;
++  	}
++
+ 
+ 	/* read each line from stdin and add it to the item list */
+ 	for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
+@@ -689,7 +700,7 @@ setup(void)
+ static void
+ usage(void)
+ {
+-	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
++	fputs("usage: dmenu [-bfivP] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+ 	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
+ 	exit(1);
+ }
+@@ -712,7 +723,9 @@ main(int argc, char *argv[])
+ 		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
+ 			fstrncmp = strncasecmp;
+ 			fstrstr = cistrstr;
+-		} else if (i + 1 == argc)
++		} else if (!strcmp(argv[i], "-P"))   /* is the input a password */
++			passwd = 1;
++		else if (i + 1 == argc)
+ 			usage();
+ 		/* these options take one argument */
+ 		else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
+-- 
+2.31.1
+
diff --git a/patches/dmenu-rejectnomatch-4.7.diff b/patches/dmenu-rejectnomatch-4.7.diff
new file mode 100644
index 0000000..329ab1d
--- /dev/null
+++ b/patches/dmenu-rejectnomatch-4.7.diff
@@ -0,0 +1,82 @@
+diff --git a/dmenu.1 b/dmenu.1
+index 9eab758..61084ab 100644
+--- a/dmenu.1
++++ b/dmenu.1
+@@ -3,7 +3,7 @@
+ dmenu \- dynamic menu
+ .SH SYNOPSIS
+ .B dmenu
+-.RB [ \-bfiv ]
++.RB [ \-bfirv ]
+ .RB [ \-l
+ .IR lines ]
+ .RB [ \-m
+@@ -47,6 +47,9 @@ X until stdin reaches end\-of\-file.
+ .B \-i
+ dmenu matches menu items case insensitively.
+ .TP
++.B \-r
++dmenu will reject any input which would result in no matching option left.
++.TP
+ .BI \-l " lines"
+ dmenu lists items vertically, with the given number of lines.
+ .TP
+diff --git a/dmenu.c b/dmenu.c
+index d605ab4..7505278 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -38,6 +38,7 @@ static char *embed;
+ static int bh, mw, mh;
+ static int inputw = 0, promptw;
+ static int lrpad; /* sum of left and right padding */
++static int reject_no_match = 0;
+ static size_t cursor;
+ static struct item *items = NULL;
+ static struct item *matches, *matchend;
+@@ -268,12 +269,26 @@ insert(const char *str, ssize_t n)
+ {
+ 	if (strlen(text) + n > sizeof text - 1)
+ 		return;
++
++	static char last[BUFSIZ] = "";
++	if(reject_no_match) {
++		/* store last text value in case we need to revert it */
++		memcpy(last, text, BUFSIZ);
++	}
++
+ 	/* move existing text out of the way, insert new text, and update cursor */
+ 	memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
+ 	if (n > 0)
+ 		memcpy(&text[cursor], str, n);
+ 	cursor += n;
+ 	match();
++
++	if(!matches && reject_no_match) {
++		/* revert to last text value if theres no match */
++		memcpy(text, last, BUFSIZ);
++		cursor -= n;
++		match();
++	}
+ }
+ 
+ static size_t
+@@ -636,7 +651,7 @@ setup(void)
+ static void
+ usage(void)
+ {
+-	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
++	fputs("usage: dmenu [-bfirv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+ 	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
+ 	exit(1);
+ }
+@@ -659,7 +674,9 @@ main(int argc, char *argv[])
+ 		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
+ 			fstrncmp = strncasecmp;
+ 			fstrstr = cistrstr;
+-		} else if (i + 1 == argc)
++		} else if (!strcmp(argv[i], "-r")) /* reject input which results in no match */
++			reject_no_match = 1;
++		else if (i + 1 == argc)
+ 			usage();
+ 		/* these options take one argument */
+ 		else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
diff --git a/patches/dmenu-separator-20210904-d78ff08.diff b/patches/dmenu-separator-20210904-d78ff08.diff
new file mode 100644
index 0000000..25e1fb3
--- /dev/null
+++ b/patches/dmenu-separator-20210904-d78ff08.diff
@@ -0,0 +1,103 @@
+diff --git a/dmenu.1 b/dmenu.1
+index f9e0db7..af3a6f5 100644
+--- a/dmenu.1
++++ b/dmenu.1
+@@ -22,6 +22,10 @@ dmenu \- dynamic menu
+ .IR color ]
+ .RB [ \-w
+ .IR windowid ]
++.RB [ \-d
++.IR separator ]
++.RB [ \-D
++.IR separator ]
+ .P
+ .BR dmenu_run " ..."
+ .SH DESCRIPTION
+@@ -83,6 +87,14 @@ prints version information to stdout, then exits.
+ .TP
+ .BI \-w " windowid"
+ embed into windowid.
++.TP
++.BI \-d " separator"
++separate the input into two halves on the first occurrence of the given charcter.
++Display only the first half in dmenu and print the second half to stdout upon selection.
++Appending '|' to the separator reverses the display/printing order.
++.TP
++.BI \-D " separator"
++same as \-d but separate based on the last occurrence.
+ .SH USAGE
+ dmenu is completely controlled by the keyboard.  Items are selected using the
+ arrow keys, page up, page down, home, and end.
+diff --git a/dmenu.c b/dmenu.c
+index 98507d9..2ac2c9a 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -30,12 +30,16 @@ enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
+ 
+ struct item {
+ 	char *text;
++	char *text_output;
+ 	struct item *left, *right;
+ 	int out;
+ };
+ 
+ static char text[BUFSIZ] = "";
+ static char *embed;
++static char separator;
++static int separator_greedy;
++static int separator_reverse;
+ static int bh, mw, mh;
+ static int inputw = 0, promptw;
+ static int lrpad; /* sum of left and right padding */
+@@ -473,7 +477,7 @@ insert:
+ 		break;
+ 	case XK_Return:
+ 	case XK_KP_Enter:
+-		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
++		puts((sel && !(ev->state & ShiftMask)) ? sel->text_output : text);
+ 		if (!(ev->state & ControlMask)) {
+ 			cleanup();
+ 			exit(0);
+@@ -545,6 +549,18 @@ readstdin(void)
+ 			*p = '\0';
+ 		if (!(items[i].text = strdup(buf)))
+ 			die("cannot strdup %u bytes:", strlen(buf) + 1);
++		if (separator && (p = (separator_greedy) ?
++			strrchr(items[i].text, separator) : strchr(items[i].text, separator))) {
++			*p = '\0';
++			items[i].text_output = ++p;
++		} else {
++			items[i].text_output = items[i].text;
++		}
++		if (separator_reverse) {
++			char *tmp = items[i].text;
++			items[i].text = items[i].text_output;
++			items[i].text_output = tmp;
++		}
+ 		items[i].out = 0;
+ 		drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
+ 		if (tmpmax > inputw) {
+@@ -700,8 +716,9 @@ setup(void)
+ 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);
++	fputs("usage: dmenu [-bfinv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
++	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n"
++	      "             [-d separator] [-D separator]\n", stderr);
+ 	exit(1);
+ }
+ 
+@@ -744,6 +761,11 @@ main(int argc, char *argv[])
+ 			colors[SchemeSel][ColFg] = argv[++i];
+ 		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
+ 			embed = argv[++i];
++		else if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "-D")) { /* field separator */
++			separator_reverse = (*(argv[i+1]+1) == '|');
++			separator_greedy = !strcmp(argv[i], "-D");
++			separator = *argv[++i];
++		}
+ 		else
+ 			usage();
+ 
diff --git a/patches/dmenu-xresources-4.9.diff.1 b/patches/dmenu-xresources-4.9.diff.1
new file mode 100644
index 0000000..267fb0a
--- /dev/null
+++ b/patches/dmenu-xresources-4.9.diff.1
@@ -0,0 +1,126 @@
+diff '--color=auto' -up ../dmenu-4.9/dmenu.c ./dmenu.c
+--- ../dmenu-4.9/dmenu.c	2019-02-02 13:55:02.000000000 +0100
++++ ./dmenu.c	2020-05-24 00:27:58.038586112 +0200
+@@ -15,6 +15,7 @@
+ #include <X11/extensions/Xinerama.h>
+ #endif
+ #include <X11/Xft/Xft.h>
++#include <X11/Xresource.h>
+
+ #include "drw.h"
+ #include "util.h"
+@@ -53,6 +54,10 @@ static XIC xic;
+ static Drw *drw;
+ static Clr *scheme[SchemeLast];
+
++/* Temporary arrays to allow overriding xresources values */
++static char *colortemp[4];
++static char *tempfonts;
++
+ #include "config.h"
+
+ static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
+@@ -596,8 +601,13 @@ setup(void)
+ 	int a, di, n, area = 0;
+ #endif
+ 	/* init appearance */
+-	for (j = 0; j < SchemeLast; j++)
+-		scheme[j] = drw_scm_create(drw, colors[j], 2);
++	for (j = 0; j < SchemeLast; j++) {
++		scheme[j] = drw_scm_create(drw, (const char**)colors[j], 2);
++	}
++	for (j = 0; j < SchemeOut; ++j) {
++		for (i = 0; i < 2; ++i)
++			free(colors[j][i]);
++	}
+
+ 	clip = XInternAtom(dpy, "CLIPBOARD",   False);
+ 	utf8 = XInternAtom(dpy, "UTF8_STRING", False);
+@@ -687,6 +697,41 @@ usage(void)
+ 	exit(1);
+ }
+
++void
++readxresources(void) {
++	XrmInitialize();
++
++	char* xrm;
++	if ((xrm = XResourceManagerString(drw->dpy))) {
++		char *type;
++		XrmDatabase xdb = XrmGetStringDatabase(xrm);
++		XrmValue xval;
++
++		if (XrmGetResource(xdb, "dmenu.font", "*", &type, &xval))
++			fonts[0] = strdup(xval.addr);
++		else
++			fonts[0] = strdup(fonts[0]);
++		if (XrmGetResource(xdb, "dmenu.background", "*", &type, &xval))
++			colors[SchemeNorm][ColBg] = strdup(xval.addr);
++		else
++			colors[SchemeNorm][ColBg] = strdup(colors[SchemeNorm][ColBg]);
++		if (XrmGetResource(xdb, "dmenu.foreground", "*", &type, &xval))
++			colors[SchemeNorm][ColFg] = strdup(xval.addr);
++		else
++			colors[SchemeNorm][ColFg] = strdup(colors[SchemeNorm][ColFg]);
++		if (XrmGetResource(xdb, "dmenu.selbackground", "*", &type, &xval))
++			colors[SchemeSel][ColBg] = strdup(xval.addr);
++		else
++			colors[SchemeSel][ColBg] = strdup(colors[SchemeSel][ColBg]);
++		if (XrmGetResource(xdb, "dmenu.selforeground", "*", &type, &xval))
++			colors[SchemeSel][ColFg] = strdup(xval.addr);
++		else
++			colors[SchemeSel][ColFg] = strdup(colors[SchemeSel][ColFg]);
++
++		XrmDestroyDatabase(xdb);
++	}
++}
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -715,15 +760,15 @@ main(int argc, char *argv[])
+ 		else if (!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
+ 			prompt = argv[++i];
+ 		else if (!strcmp(argv[i], "-fn"))  /* font or font set */
+-			fonts[0] = argv[++i];
++			tempfonts = argv[++i];
+ 		else if (!strcmp(argv[i], "-nb"))  /* normal background color */
+-			colors[SchemeNorm][ColBg] = argv[++i];
++			colortemp[0] = argv[++i];
+ 		else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
+-			colors[SchemeNorm][ColFg] = argv[++i];
++			colortemp[1] = argv[++i];
+ 		else if (!strcmp(argv[i], "-sb"))  /* selected background color */
+-			colors[SchemeSel][ColBg] = argv[++i];
++			colortemp[2] = argv[++i];
+ 		else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
+-			colors[SchemeSel][ColFg] = argv[++i];
++			colortemp[3] = argv[++i];
+ 		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
+ 			embed = argv[++i];
+ 		else
+@@ -743,8 +788,23 @@ main(int argc, char *argv[])
+ 		die("could not get embedding window attributes: 0x%lx",
+ 		    parentwin);
+ 	drw = drw_create(dpy, screen, root, wa.width, wa.height);
+-	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
++	readxresources();
++	/* Now we check whether to override xresources with commandline parameters */
++	if ( tempfonts )
++	   fonts[0] = strdup(tempfonts);
++	if ( colortemp[0])
++	   colors[SchemeNorm][ColBg] = strdup(colortemp[0]);
++	if ( colortemp[1])
++	   colors[SchemeNorm][ColFg] = strdup(colortemp[1]);
++	if ( colortemp[2])
++	   colors[SchemeSel][ColBg]  = strdup(colortemp[2]);
++	if ( colortemp[3])
++	   colors[SchemeSel][ColFg]  = strdup(colortemp[3]);
++
++	if (!drw_fontset_create(drw, (const char**)fonts, LENGTH(fonts)))
+ 		die("no fonts could be loaded.");
++
++	free(fonts[0]);
+ 	lrpad = drw->fonts->h;
+
+ #ifdef __OpenBSD__