making tab and shift tab cycle suggestions

.SRCINFO

@@ -0,0 +1,17 @@
+pkgbase = dmenu-tiyn-git
+	pkgdesc = This is the dmenu build of tiyn. It includes the border, center and password patches.
+	pkgver = 4.9
+	pkgrel = 1
+	url = https://github.com/tiyn/dmenu
+	arch = x86_64
+	arch = i686
+	license = MIT
+	makedepends = git
+	provides = dmenu
+	conflicts = dmenu
+	replaces = dmenu
+	source = git+https://github.com/tiyn/dmenu
+	md5sums = SKIP
+
+pkgname = dmenu-tiyn-git
+

.gitignore

@@ -0,0 +1,9 @@
+*.o
+*.orig
+*.1
+dmenu
+dmenu_run
+dmenu_path
+stest
+pkg
+*.pkg.tar.xz

PKGBUILD

@@ -0,0 +1,49 @@
+# This is an example PKGBUILD file. Use this as a start to creating your own,
+# and remove these comments. For more information, see 'man PKGBUILD'.
+# NOTE: Please fill out the license field for your package! If it is unknown,
+# then please put 'unknown'.
+
+# Maintainer: Marten Kante <tiyn@martenkante.eu>
+pkgname=dmenu-tiyn-git
+pkgver=4.9
+pkgrel=1
+epoch=
+pkgdesc="This is the dmenu build of tiyn. It includes the border, center and password patches."
+arch=(x86_64 i686)
+url="https://github.com/tiyn/dmenu"
+license=('MIT')
+groups=()
+depends=()
+makedepends=(git)
+checkdepends=()
+optdepends=()
+provides=(dmenu)
+conflicts=(dmenu)
+replaces=(dmenu)
+backup=()
+options=()
+install=
+changelog=
+source=("git+$url")
+noextract=()
+md5sums=('SKIP')
+validpgpkeys=()
+
+pkgver() {
+    cd "${_pkgname}"
+    printf "4.9.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+build() {
+    cd dmenu
+    make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+}
+
+package() {
+    cd dmenu
+    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.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+}

README.md

@@ -0,0 +1,19 @@
+# dmenu
+
+This is my patched version of dmenu.
+The base version is directly from suckless.org.
+This belongs to my larbs installation script, meaning it's supposed to work in the environment of the larbs-base-installation.
+
+## Patches
+
+The list below shows the currently applied patches to this build.
+- dmenu-border-4.9.diff (adds a border)
+- dmenu-center-20200111-8cd37e1.diff (adds option to center dmenu)
+- dmenu-fuzzymatch-4.9.diff (adds option to fuzzy matching)
+- dmenu-password-4.9.diff (adds option to hide input)
+
+## Installation
+
+The most basic way is to clone the repository and then invoke make.
+- `git clone https://github.com/tiyn/dmenu`
+- `make clean install`

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 */
 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[] = {
@@ -10,9 +12,9 @@ static const char *fonts[] = {
 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" },
+	[SchemeNorm] = { "#dfdfdf", "#0e0f14" },
+	[SchemeSel] = { "#eeeeee", "#282828" },
+	[SchemeOut] = { "#eeeeee", "#282828" },
 };
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
 static unsigned int lines      = 0;
@@ -22,3 +24,6 @@ static unsigned int lines      = 0;
  * for example: " /?\"&[]"
  */
 static const char worddelimiters[] = " ";
+
+/* Size of the window border */
+static const unsigned int border_width = 2;

config.mk

@@ -20,7 +20,7 @@ FREETYPEINC = /usr/include/freetype2
 
 # includes and libs
 INCS = -I$(X11INC) -I$(FREETYPEINC)
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lm
+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
 
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)

dmenu-fuzzymatch-4.9.diff

@@ -1,163 +0,0 @@
-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
-

dmenu.c

@@ -1,7 +1,6 @@
 /* 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>
@@ -33,7 +32,6 @@ struct item {
 	char *text;
 	struct item *left, *right;
 	int out;
-	double distance;
 };
 
 static char text[BUFSIZ] = "";
@@ -212,94 +210,9 @@ 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;
 
@@ -531,7 +444,8 @@ insert:
 		if (lines > 0)
 			return;
 		/* fallthrough */
-	case XK_Up:
+	// case XK_Up:
+	case XK_ISO_Left_Tab:
 		if (sel && sel->left && (sel = sel->left)->right == curr) {
 			curr = prev;
 			calcoffsets();
@@ -559,28 +473,29 @@ insert:
 		if (sel)
 			sel->out = 1;
 		break;
-	case XK_Right:
-		if (text[cursor] != '\0') {
-			cursor = nextrune(+1);
-			break;
-		}
-		if (lines > 0)
-			return;
-		/* fallthrough */
-	case XK_Down:
+	// case XK_Right:
+	// 	if (text[cursor] != '\0') {
+	// 		cursor = nextrune(+1);
+	// 		break;
+	// 	}
+	// 	if (lines > 0)
+	// 		return;
+	// 	/* fallthrough */
+	// case XK_Down:
+	case XK_Tab:
 		if (sel && sel->right && (sel = sel->right) == next) {
 			curr = next;
 			calcoffsets();
 		}
 		break;
-	case XK_Tab:
-		if (!sel)
-			return;
-		strncpy(text, sel->text, sizeof text - 1);
-		text[sizeof text - 1] = '\0';
-		cursor = strlen(text);
-		match();
-		break;
+	// case XK_Tab:
+	// if (!sel)
+	// 	return;
+	// strncpy(text, sel->text, sizeof text - 1);
+	// text[sizeof text - 1] = '\0';
+	// cursor = strlen(text);
+	// match();
+	// break;
 	}
 
 draw:
@@ -796,8 +711,6 @@ 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;

drw.c

@@ -139,11 +139,11 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
 	 * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
 	 * and lots more all over the internet.
 	 */
-	FcBool iscol;
+	/*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;