commit ea4dd26890207e743d12bffc364c758c06dd80df
Author: Jan Christoph Ebersbach <[email protected]>
Date: Sat Jun 3 17:12:47 2017 +0200
[dmenu] Update fuzzymatch patch
diff --git
a/tools.suckless.org/dmenu/patches/dmenu-fuzzymatch-20170603-f428f3e.diff
b/tools.suckless.org/dmenu/patches/dmenu-fuzzymatch-20170603-f428f3e.diff
new file mode 100644
index 0000000..9a7b4cf
--- /dev/null
+++ b/tools.suckless.org/dmenu/patches/dmenu-fuzzymatch-20170603-f428f3e.diff
@@ -0,0 +1,153 @@
+Author: Jan Christoph Ebersbach <[email protected]>
+URL: http://tools.suckless.org/dmenu/patches/fuzzymatch
+Add add fuzzy matching to dmenu
+
+Index: dmenu-patches/dmenu/dmenu.c
+===================================================================
+--- dmenu-patches.orig/dmenu/dmenu.c
++++ dmenu-patches/dmenu/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>
+@@ -31,6 +32,7 @@ struct item {
+ char *text;
+ struct item *left, *right;
+ int out;
++ double distance;
+ };
+
+ static char text[BUFSIZ] = "";
+@@ -209,9 +211,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
", 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;
+
+@@ -656,6 +743,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;
+Index: dmenu-patches/dmenu/config.def.h
+===================================================================
+--- dmenu-patches.orig/dmenu/config.def.h
++++ dmenu-patches/dmenu/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"
+Index: dmenu-patches/dmenu/config.mk
+===================================================================
+--- dmenu-patches.orig/dmenu/config.mk
++++ dmenu-patches/dmenu/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/tools.suckless.org/dmenu/patches/fuzzymatch.md
b/tools.suckless.org/dmenu/patches/fuzzymatch.md
index 256473e..1defeb7 100644
--- a/tools.suckless.org/dmenu/patches/fuzzymatch.md
+++ b/tools.suckless.org/dmenu/patches/fuzzymatch.md
@@ -7,9 +7,15 @@ Description
This patch adds support for fuzzy matching to dmenu, allowing users to type
non-consecutive portions of the string to be matched.
+Notes
+-----
+
+* Supports dmenu's case insensitive switch (`-i`)
+
Download
--------
+*
[dmenu-fuzzymatch-20170603-f428f3e.diff](dmenu-fuzzymatch-20170603-f428f3e.diff)
* [dmenu-fuzzymatch-4.6.diff](dmenu-fuzzymatch-4.6.diff)
Authors
