Apply fuzzy matching patches

diff --git a/config.def.h b/config.def.h
index 1edb647789c7befe9e98a046a78260e4b580a30a..0103bdab6d7820c2b84c0b34f4247df0658e1b2b 100644 (file)
--- 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"
@@ -11,6 +12,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/config.mk b/config.mk
index 05d5a3e801e838c6a8a5e02834d63dd880bd66da..0c841215c8d62fab300f6b46a33645ac95a829aa 100644 (file)
--- 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.1 b/dmenu.1
index 323f93cf88eee5bd4878cf78cf40d9677277916c..472b179a5abd9746ee7c0bcf6862e206ddc57ebb 100644 (file)
--- a/dmenu.1
+++ b/dmenu.1
@@ -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 --git a/dmenu.c b/dmenu.c
index 65f25ce576e819421da9320afd7808c730e84ab4..9ecbd8608a2b6c952160fdef6e2871ad107cad7c 100644 (file)
--- 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>
@@ -26,12 +27,15 @@
 #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;
        struct item *left, *right;
        int out;
+       double distance;
 };
 
 static char text[BUFSIZ] = "";
@@ -113,9 +117,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 +167,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);
+       r = drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
+       drawhighlights(item, x, y, w);
+       return r;
 }
 
 static void
@@ -210,9 +256,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;
 
@@ -690,7 +821,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);
 }
 
@@ -709,6 +841,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;
@@ -731,6 +865,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