Added tag 3.5 for changeset 05e5bd706b3b

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 864c8f0..5f81d25 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -37,7 +37,6 @@ struct Item {
        Item *next;             /* traverses all items */
        Item *left, *right;     /* traverses items matching current search pattern */
        char *text;
        Item *next;             /* traverses all items */
        Item *left, *right;     /* traverses items matching current search pattern */
        char *text;

-       Bool matched;

 };
 
 /* forward declarations */
 };
 
 /* forward declarations */


@@ -89,6 +88,7 @@ Item *next = NULL;
 Item *prev = NULL;
 Item *curr = NULL;
 Window root, win;
 Item *prev = NULL;
 Item *curr = NULL;
 Window root, win;

+int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;

 char *(*fstrstr)(const char *, const char *) = strstr;
 
 Item *
 char *(*fstrstr)(const char *, const char *) = strstr;
 
 Item *


@@ -97,7 +97,6 @@ appenditem(Item *i, Item *last) {
                item = i;
        else
                last->right = i;
                item = i;
        else
                last->right = i;

-       i->matched = True;

        i->left = last;
        i->right = NULL;
        last = i;
        i->left = last;
        i->right = NULL;
        last = i;


@@ -505,13 +504,9 @@ match(char *pattern) {
        plen = strlen(pattern);
        item = j = NULL;
        nitem = 0;
        plen = strlen(pattern);
        item = j = NULL;
        nitem = 0;

-       for(i = allitems; i; i=i->next)
-               i->matched = False;

        for(i = allitems; i; i = i->next)
        for(i = allitems; i; i = i->next)

-               if(!i->matched && !strncasecmp(pattern, i->text, plen))
-                       j = appenditem(i, j);
-       for(i = allitems; i; i = i->next)
-               if(!i->matched && fstrstr(i->text, pattern))
+               if(!fstrncmp(pattern, i->text, plen)
+                               || fstrstr(i->text, pattern))

                        j = appenditem(i, j);
        curr = prev = next = sel = item;
        calcoffsets();
                        j = appenditem(i, j);
        curr = prev = next = sel = item;
        calcoffsets();


@@ -662,8 +657,10 @@ main(int argc, char *argv[]) {
 
        /* command line args */
        for(i = 1; i < argc; i++)
 
        /* command line args */
        for(i = 1; i < argc; i++)

-               if(!strcmp(argv[i], "-i"))
+               if(!strcmp(argv[i], "-i")) {
+                       fstrncmp = strncasecmp;

                        fstrstr = cistrstr;
                        fstrstr = cistrstr;

+               }

                else if(!strcmp(argv[i], "-fn")) {
                        if(++i < argc) font = argv[i];
                }
                else if(!strcmp(argv[i], "-fn")) {
                        if(++i < argc) font = argv[i];
                }