[hackers] [dmenu] efficient incremental search || Connor Lane Smith

changeset: 406:1ce845e311df
tag: tip
user: Connor Lane Smith <cls_AT_lubutu.com>
date: Sun May 15 16:05:32 2011 +0100
files: dmenu.c
description:
efficient incremental search

diff -r db708f8b425f -r 1ce845e311df dmenu.c
--- a/dmenu.c Sun May 15 14:21:00 2011 +0100
+++ b/dmenu.c Sun May 15 16:05:32 2011 +0100
@@ -27,9 +27,9 @@
 static void drawmenu(void);
 static char *fstrstr(const char *s, const char *sub);
 static void grabkeyboard(void);
-static void insert(const char *s, ssize_t n);
+static void insert(const char *str, ssize_t n);
 static void keypress(XKeyEvent *ev);
-static void match(void);
+static void match(Bool sub);
 static size_t nextrune(int incr);
 static void paste(void);
 static void readstdin(void);
@@ -218,14 +218,14 @@
 }
 
 void
-insert(const char *s, ssize_t n) {
+insert(const char *str, ssize_t n) {
         if(strlen(text) + n > sizeof text - 1)
                 return;
         memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
         if(n > 0)
- memcpy(&text[cursor], s, n);
+ memcpy(&text[cursor], str, n);
         cursor += n;
- match();
+ match(n > 0);
 }
 
 void
@@ -269,7 +269,7 @@
                         break;
                 case XK_k: /* delete right */
                         text[cursor] = '\0';
- match();
+ match(False);
                         break;
                 case XK_n:
                         ksym = XK_Down;
@@ -375,30 +375,31 @@
                         return;
                 strncpy(text, sel->text, sizeof text);
                 cursor = strlen(text);
- match();
+ match(True);
                 break;
         }
         drawmenu();
 }
 
 void
-match(void) {
+match(Bool sub) {
         size_t len = strlen(text);
- Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+ Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+ Item *item, *next = NULL;
 
- matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL;
- for(item = items; item && item->text; item++)
+ lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
+ for(item = sub ? matches : items; item && item->text; item = next) {
+ next = sub ? item->right : item + 1;
                 if(!fstrncmp(text, item->text, len + 1))
                         appenditem(item, &lexact, &exactend);
                 else if(!fstrncmp(text, item->text, len))
                         appenditem(item, &lprefix, &prefixend);
                 else if(fstrstr(item->text, text))
                         appenditem(item, &lsubstr, &substrend);
+ }
+ matches = lexact;
+ matchend = exactend;
 
- if(lexact) {
- matches = lexact;
- matchend = exactend;
- }
         if(lprefix) {
                 if(matchend) {
                         matchend->right = lprefix;
@@ -498,8 +499,8 @@
 
         normcol[ColBG] = getcolor(dc, normbgcolor);
         normcol[ColFG] = getcolor(dc, normfgcolor);
- selcol[ColBG] = getcolor(dc, selbgcolor);
- selcol[ColFG] = getcolor(dc, selfgcolor);
+ selcol[ColBG] = getcolor(dc, selbgcolor);
+ selcol[ColFG] = getcolor(dc, selfgcolor);
 
         utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
 
@@ -532,7 +533,7 @@
         }
         inputw = MIN(inputw, mw/3);
         promptw = prompt ? textw(dc, prompt) : 0;
- match();
+ match(False);
 
         /* menu window */
         wa.override_redirect = True;
Received on Sun May 15 2011 - 17:46:06 CEST