applied Jukkas hotfix

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 688fabf26a4aa39d5c912f7276d6e29b6911cb59..b5638b62725b4fd557c7c12e99f9798cd26b0331 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -35,13 +35,12 @@ typedef struct {
 typedef struct Item Item;
 struct Item {
        char *text;
-       Bool matched;
        Item *next;             /* traverses all items */
        Item *left, *right;     /* traverses items matching current search pattern */
 };
 
 /* forward declarations */
-Item *appenditem(Item *i, Item *last);
+void appenditem(Item *i, Item **list, Item **last);
 void calcoffsets(void);
 char *cistrstr(const char *s, const char *sub);
 void cleanup(void);
@@ -77,7 +76,6 @@ int ret = 0;
 unsigned int cmdw = 0;
 unsigned int mw, mh;
 unsigned int promptw = 0;
-unsigned int nitem = 0;
 unsigned int numlockmask = 0;
 Bool running = True;
 Display *dpy;
@@ -92,17 +90,15 @@ Window root, win;
 int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
 char *(*fstrstr)(const char *, const char *) = strstr;
 
-Item *
-appenditem(Item *i, Item *last) {
-       if(!last)
-               item = i;
+void
+appenditem(Item *i, Item **list, Item **last) {
+       if(!(*last))
+               *list = i;
        else
-               last->right = i;
-       i->left = last;
+               (*last)->right = i;
+       i->left = *last;
        i->right = NULL;
-       last = i;
-       nitem++;
-       return last;
+       *last = i;
 }
 
 void
@@ -299,7 +295,7 @@ grabkeyboard(void) {
 
        for(len = 1000; len; len--) {
                if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
-                       == GrabSuccess)
+               == GrabSuccess)
                        break;
                usleep(1000);
        }
@@ -357,16 +353,14 @@ kpress(XKeyEvent * e) {
        len = strlen(text);
        buf[0] = 0;
        num = XLookupString(e, buf, sizeof buf, &ksym, 0);
-       if(IsKeypadKey(ksym)) { 
-               if(ksym == XK_KP_Enter) {
+       if(IsKeypadKey(ksym))
+               if(ksym == XK_KP_Enter)
                        ksym = XK_Return;
-               } else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) {
+               else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
                        ksym = (ksym - XK_KP_0) + XK_0;
-               }
-       }
        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
-                       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
-                       || IsPrivateKeypadKey(ksym))
+       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
+       || IsPrivateKeypadKey(ksym))
                return;
        /* first check if a control mask is omitted */
        if(e->state & ControlMask) {
@@ -521,19 +515,40 @@ kpress(XKeyEvent * e) {
 void
 match(char *pattern) {
        unsigned int plen;
-       Item *i, *j;
+       Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
        if(!pattern)
                return;
        plen = strlen(pattern);
-       item = j = NULL;
-       nitem = 0;
+       item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
        for(i = allitems; i; i = i->next)
-               if((i->matched = !fstrncmp(pattern, i->text, plen)))
-                       j = appenditem(i, j);
-       for(i = allitems; i; i = i->next)
-               if(!i->matched && fstrstr(i->text, pattern))
-                       j = appenditem(i, j);
+               if(!fstrncmp(pattern, i->text, plen + 1))
+                       appenditem(i, &lexact, &exactend);
+               else if(!fstrncmp(pattern, i->text, plen))
+                       appenditem(i, &lprefix, &prefixend);
+               else if(fstrstr(i->text, pattern))
+                       appenditem(i, &lsubstr, &substrend);
+       if(lexact) {
+               item = lexact;
+               itemend = exactend;
+       }
+       if(lprefix) {
+               if(itemend) {
+                       itemend->right = lprefix;
+                       lprefix->left = itemend;
+               }
+               else
+                       item = lprefix;
+               itemend = prefixend;
+       }
+       if(lsubstr) {
+               if(itemend) {
+                       itemend->right = lsubstr;
+                       lsubstr->left = itemend;
+               }
+               else
+                       item = lsubstr;
+       }
        curr = prev = next = sel = item;
        calcoffsets();
 }
@@ -692,12 +707,11 @@ main(int argc, char *argv[]) {
                        if(++i < argc) x = atoi(argv[i]);
                }
                else if(!strcmp(argv[i], "-y")) {
-                       if(++i < argc) {
+                       if(++i < argc)
                                if(!strcmp(argv[i], "-0"))
                                        y = (int)(unsigned int)-1;
                                else
                                        y = atoi(argv[i]);
-                       }
                }
                else if(!strcmp(argv[i], "-w")) {
                        if(++i < argc) w = atoi(argv[i]);