BitHeaven
/
dmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efficient incremental search

This commit is contained in:
Connor Lane Smith 2011-05-15 16:05:32 +01:00
parent 4776d6dc61
commit 4354074607
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dmenu.c
View File

@ -27,9 +27,9 @@ static void calcoffsets(void);
static void drawmenu(void); static void drawmenu(void);
static char *fstrstr(const char *s, const char *sub); static char *fstrstr(const char *s, const char *sub);
static void grabkeyboard(void); 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 keypress(XKeyEvent *ev);
static void match(void); static void match(Bool sub);
static size_t nextrune(int incr); static size_t nextrune(int incr);
static void paste(void); static void paste(void);
static void readstdin(void); static void readstdin(void);
@ -218,14 +218,14 @@ grabkeyboard(void) {
} }
void void
insert(const char *s, ssize_t n) { insert(const char *str, ssize_t n) {
if(strlen(text) + n > sizeof text - 1) if(strlen(text) + n > sizeof text - 1)
return; return;
memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0)); memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
if(n > 0) if(n > 0)
memcpy(&text[cursor], s, n); memcpy(&text[cursor], str, n);
cursor += n; cursor += n;
match(); match(n > 0);
} }
void void
@ -269,7 +269,7 @@ keypress(XKeyEvent *ev) {
break; break;
case XK_k: /* delete right */ case XK_k: /* delete right */
text[cursor] = '\0'; text[cursor] = '\0';
match(); match(False);
break; break;
case XK_n: case XK_n:
ksym = XK_Down; ksym = XK_Down;
@ -375,30 +375,31 @@ keypress(XKeyEvent *ev) {
return; return;
strncpy(text, sel->text, sizeof text); strncpy(text, sel->text, sizeof text);
cursor = strlen(text); cursor = strlen(text);
match(); match(True);
break; break;
} }
drawmenu(); drawmenu();
} }
void void
match(void) { match(Bool sub) {
size_t len = strlen(text); 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; lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
for(item = items; item && item->text; item++) for(item = sub ? matches : items; item && item->text; item = next) {
next = sub ? item->right : item + 1;
if(!fstrncmp(text, item->text, len + 1)) if(!fstrncmp(text, item->text, len + 1))
appenditem(item, &lexact, &exactend); appenditem(item, &lexact, &exactend);
else if(!fstrncmp(text, item->text, len)) else if(!fstrncmp(text, item->text, len))
appenditem(item, &lprefix, &prefixend); appenditem(item, &lprefix, &prefixend);
else if(fstrstr(item->text, text)) else if(fstrstr(item->text, text))
appenditem(item, &lsubstr, &substrend); appenditem(item, &lsubstr, &substrend);
if(lexact) {
matches = lexact;
matchend = exactend;
} }
matches = lexact;
matchend = exactend;
if(lprefix) { if(lprefix) {
if(matchend) { if(matchend) {
matchend->right = lprefix; matchend->right = lprefix;
@ -498,8 +499,8 @@ setup(void) {
normcol[ColBG] = getcolor(dc, normbgcolor); normcol[ColBG] = getcolor(dc, normbgcolor);
normcol[ColFG] = getcolor(dc, normfgcolor); normcol[ColFG] = getcolor(dc, normfgcolor);
selcol[ColBG] = getcolor(dc, selbgcolor); selcol[ColBG] = getcolor(dc, selbgcolor);
selcol[ColFG] = getcolor(dc, selfgcolor); selcol[ColFG] = getcolor(dc, selfgcolor);
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
@ -532,7 +533,7 @@ setup(void) {
} }
inputw = MIN(inputw, mw/3); inputw = MIN(inputw, mw/3);
promptw = prompt ? textw(dc, prompt) : 0; promptw = prompt ? textw(dc, prompt) : 0;
match(); match(False);
/* menu window */ /* menu window */
wa.override_redirect = True; wa.override_redirect = True;