fuzzymatch: Add support for fuzzy-matching

This version of the patch updates the manpage.

diff --git a/config.def.h b/config.def.h
index 97be685b7443a7b3ce3b4f697d9e6fd7e5a4e4de..b0adc55c2d6ea8ef58654f19044254fc9d40ab26 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=16"

diff --git a/config.mk b/config.mk
index dcc5bb3dc320e673b87ea5a4309cc9ebdf74d2be..27416f0e49d2b82dda6d12e80eaf018f62e417b0 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -21,7 +21,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 ed0e4428f87bc4a9fe96669c4b4d701d899bc585..5a7b0e18b45fa60e637fbe8aa844403a9d89be51 100644 (file)
--- a/dmenu.1
+++ b/dmenu.1
@@ -3,7 +3,7 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
-.RB [ \-bfiv ]
+.RB [ \-bFfiv ]
 .RB [ \-l
 .IR lines ]
 .RB [ \-m
@@ -44,6 +44,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 \-F
+disables fuzzy matching.
+.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.
@@ -84,6 +87,17 @@ defines the outline background color (for multiple selection).
 .TP
 .BI \-of " color"
 defines the outline foreground color (for multiple selection).
+.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.

diff --git a/dmenu.c b/dmenu.c
index 363d19fd4b6f58c4d650fdf155554ef5a4d678be..08c020373c87f79b8ddae6399f3ff52fa165f9f3 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>
@@ -31,6 +32,7 @@ struct item {
        char *text;
        struct item *left, *right;
        int out;
+       double distance;
 };
 
 static char text[BUFSIZ] = "";
@@ -226,9 +228,93 @@ 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;
 
@@ -714,7 +800,7 @@ setup(void)
 static void
 usage(void)
 {
-       die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+       die("usage: dmenu [-bFfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
            "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]");
 }
 
@@ -731,6 +817,8 @@ main(int argc, char *argv[])
                        exit(0);
                } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
                        topbar = 0;
+               else if (!strcmp(argv[i], "-F"))   /* disables fuzzy matching */
+                       fuzzy = 0;
                else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
                        fast = 1;
                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */