sites

commit dfca1854fed0391d3d214a955941fe1053d48717
parent 99ad41b9f307a6309194423fd2fc471ee2c42092
Author: Felix Van der Jeugt <felix.vanderjeugt@gmail.com>
Date:   Wed,  3 May 2017 10:08:26 +0200

update prefix completion patch for 4.7

Diffstat:
A
tools.suckless.org/dmenu/patches/dmenu-prefixcompletion-4.7.diff
 | 
79
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
tools.suckless.org/dmenu/patches/prefix-completion.md
 | 
1
+

2 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/tools.suckless.org/dmenu/patches/dmenu-prefixcompletion-4.7.diff b/tools.suckless.org/dmenu/patches/dmenu-prefixcompletion-4.7.diff
@@ -0,0 +1,79 @@
+diff --git a/dmenu.c b/dmenu.c
+index d605ab4..826604e 100644
+--- a/dmenu.c
++++ b/dmenu.c
+@@ -218,7 +218,7 @@ match(void)
+ 	char buf[sizeof text], *s;
+ 	int i, tokc = 0;
+ 	size_t len, textsize;
+-	struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
++	struct item *item, *lprefix, *prefixend;
+ 
+ 	strcpy(buf, text);
+ 	/* separate input text into tokens to be matched individually */
+@@ -227,8 +227,8 @@ match(void)
+ 			die("cannot realloc %u bytes:", tokn * sizeof *tokv);
+ 	len = tokc ? strlen(tokv[0]) : 0;
+ 
+-	matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+-	textsize = strlen(text) + 1;
++	matches = lprefix = matchend = prefixend = NULL;
++	textsize = strlen(text);
+ 	for (item = items; item && item->text; item++) {
+ 		for (i = 0; i < tokc; i++)
+ 			if (!fstrstr(item->text, tokv[i]))
+@@ -240,8 +240,6 @@ match(void)
+ 			appenditem(item, &matches, &matchend);
+ 		else if (!fstrncmp(tokv[0], item->text, len))
+ 			appenditem(item, &lprefix, &prefixend);
+-		else
+-			appenditem(item, &lsubstr, &substrend);
+ 	}
+ 	if (lprefix) {
+ 		if (matches) {
+@@ -251,14 +249,6 @@ match(void)
+ 			matches = lprefix;
+ 		matchend = prefixend;
+ 	}
+-	if (lsubstr) {
+-		if (matches) {
+-			matchend->right = lsubstr;
+-			lsubstr->left = matchend;
+-		} else
+-			matches = lsubstr;
+-		matchend = substrend;
+-	}
+ 	curr = sel = matches;
+ 	calcoffsets();
+ }
+@@ -292,6 +282,7 @@ keypress(XKeyEvent *ev)
+ {
+ 	char buf[32];
+ 	int len;
++	struct item * item;
+ 	KeySym ksym = NoSymbol;
+ 	Status status;
+ 
+@@ -447,12 +438,17 @@ keypress(XKeyEvent *ev)
+ 		}
+ 		break;
+ 	case XK_Tab:
+-		if (!sel)
+-			return;
+-		strncpy(text, sel->text, sizeof text - 1);
++		if (!matches) break; /* cannot complete no matches */
++		strncpy(text, matches->text, sizeof text - 1);
+ 		text[sizeof text - 1] = '\0';
+-		cursor = strlen(text);
+-		match();
++		len = cursor = strlen(text); /* length of longest common prefix */
++		for (item = matches; item && item->text; item = item->right) {
++			cursor = 0;
++			while (cursor < len && text[cursor] == item->text[cursor])
++				cursor++;
++			len = cursor;
++		}
++		memset(text + len, '\0', strlen(text) - len);
+ 		break;
+ 	}
+ 	drawmenu();
diff --git a/tools.suckless.org/dmenu/patches/prefix-completion.md b/tools.suckless.org/dmenu/patches/prefix-completion.md
@@ -14,6 +14,7 @@ Download
 --------
 
 * For 4.6: [dmenu-prefixcompletion-20161019-7ef1d5e.diff](dmenu-prefixcompletion-20161019-7ef1d5e.diff)
+* For 4.7: [dmenu-prefixcompletion-4.7.diff](dmenu-prefixcompletion-4.7.diff)
 
 Authors
 -------