[hackers] [dmenu] add token matching || Connor Lane Smith

changeset: 435:381195be7a80
branch: token
user: Connor Lane Smith <cls_AT_lubutu.com>
date: Mon Sep 19 10:40:56 2011 +0100
files: dmenu.c
description:
add token matching

diff -r d007288ed923 -r 381195be7a80 dmenu.c
--- a/dmenu.c Mon Sep 19 10:40:07 2011 +0100
+++ b/dmenu.c Mon Sep 19 10:40:56 2011 +0100
@@ -30,7 +30,7 @@
 static void grabkeyboard(void);
 static void insert(const char *str, ssize_t n);
 static void keypress(XKeyEvent *ev);
-static void match(Bool sub);
+static void match(void);
 static size_t nextrune(int inc);
 static void paste(void);
 static void readstdin(void);
@@ -120,10 +120,10 @@
 
 void
 appenditem(Item *item, Item **list, Item **last) {
- if(!*last)
+ if(*last)
+ (*last)->right = item;
+ else
                 *list = item;
- else
- (*last)->right = item;
 
         item->left = *last;
         item->right = NULL;
@@ -223,7 +223,7 @@
         if(n > 0)
                 memcpy(&text[cursor], str, n);
         cursor += n;
- match(n > 0 && text[cursor] == '\0');
+ match();
 }
 
 void
@@ -252,7 +252,7 @@
 
                 case XK_k: /* delete right */
                         text[cursor] = '\0';
- match(False);
+ match();
                         break;
                 case XK_u: /* delete left */
                         insert(NULL, 0 - cursor);
@@ -355,31 +355,42 @@
                         return;
                 strncpy(text, sel->text, sizeof text);
                 cursor = strlen(text);
- match(True);
+ match();
                 break;
         }
         drawmenu();
 }
 
 void
-match(Bool sub) {
- size_t len = strlen(text);
- Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
- Item *item, *lnext;
+match(void) {
+ static char **tokv = NULL;
+ static int tokn = 0;
 
- lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
- for(item = sub ? matches : items; item && item->text; item = lnext) {
- lnext = sub ? item->right : item + 1;
- if(!fstrncmp(text, item->text, len + 1))
- appenditem(item, &lexact, &exactend);
- else if(!fstrncmp(text, item->text, len))
+ char buf[sizeof text], *s;
+ int i, tokc = 0;
+ size_t len;
+ Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+
+ strcpy(buf, text);
+ for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " "))
+ if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
+ eprintf("cannot realloc %u bytes\n", tokn * sizeof *tokv);
+ len = tokc ? strlen(tokv[0]) : 0;
+
+ matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+ for(item = items; item && item->text; item++) {
+ for(i = 0; i < tokc; i++)
+ if(!fstrstr(item->text, tokv[i]))
+ break;
+ if(i != tokc)
+ continue;
+ if(!tokc || !fstrncmp(tokv[0], item->text, len+1))
+ appenditem(item, &matches, &matchend);
+ else if(!fstrncmp(tokv[0], item->text, len))
                         appenditem(item, &lprefix, &prefixend);
- else if(fstrstr(item->text, text))
+ else
                         appenditem(item, &lsubstr, &substrend);
         }
- matches = lexact;
- matchend = exactend;
-
         if(lprefix) {
                 if(matchend) {
                         matchend->right = lprefix;
@@ -514,7 +525,7 @@
         }
         promptw = prompt ? textw(dc, prompt) : 0;
         inputw = MIN(inputw, mw/3);
- match(False);
+ match();
 
         /* menu window */
         wa.override_redirect = True;
Received on Mon Sep 19 2011 - 11:50:38 CEST