em/dmenu
1
0
Fork 0
Code Releases Activity

add token matching

Browse Source
This commit is contained in:
Connor Lane Smith 2011-09-19 10:40:56 +01:00
parent 3af80cd7d8
commit b26d3f54ee
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dmenu.c
View File

@ -30,7 +30,7 @@ static void drawmenu(void);
static void grabkeyboard(void); static void grabkeyboard(void);
static void insert(const char *str, 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(Bool sub); static void match(void);
static size_t nextrune(int inc); static size_t nextrune(int inc);
static void paste(void); static void paste(void);
static void readstdin(void); static void readstdin(void);
@ -120,10 +120,10 @@ main(int argc, char *argv[]) {
void void
appenditem(Item *item, Item **list, Item **last) { appenditem(Item *item, Item **list, Item **last) {
if(!*last) if(*last)
*list = item;
else
(*last)->right = item; (*last)->right = item;
else
*list = item;
item->left = *last; item->left = *last;
item->right = NULL; item->right = NULL;
@ -223,7 +223,7 @@ insert(const char *str, ssize_t n) {
if(n > 0) if(n > 0)
memcpy(&text[cursor], str, n); memcpy(&text[cursor], str, n);
cursor += n; cursor += n;
match(n > 0 && text[cursor] == '\0'); match();
} }
void void
@ -252,7 +252,7 @@ keypress(XKeyEvent *ev) {
case XK_k: /* delete right */ case XK_k: /* delete right */
text[cursor] = '\0'; text[cursor] = '\0';
match(False); match();
break; break;
case XK_u: /* delete left */ case XK_u: /* delete left */
insert(NULL, 0 - cursor); insert(NULL, 0 - cursor);
@ -355,31 +355,42 @@ keypress(XKeyEvent *ev) {
return; return;
strncpy(text, sel->text, sizeof text); strncpy(text, sel->text, sizeof text);
cursor = strlen(text); cursor = strlen(text);
match(True); match();
break; break;
} }
drawmenu(); drawmenu();
} }
void void
match(Bool sub) { match(void) {
size_t len = strlen(text); static char **tokv = NULL;
Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; static int tokn = 0;
Item *item, *lnext;
lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL; char buf[sizeof text], *s;
for(item = sub ? matches : items; item && item->text; item = lnext) { int i, tokc = 0;
lnext = sub ? item->right : item + 1; size_t len;
if(!fstrncmp(text, item->text, len + 1)) Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
appenditem(item, &lexact, &exactend);
else if(!fstrncmp(text, item->text, len)) 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); appenditem(item, &lprefix, &prefixend);
else if(fstrstr(item->text, text)) else
appenditem(item, &lsubstr, &substrend); appenditem(item, &lsubstr, &substrend);
} }
matches = lexact;
matchend = exactend;
if(lprefix) { if(lprefix) {
if(matchend) { if(matchend) {
matchend->right = lprefix; matchend->right = lprefix;
@ -514,7 +525,7 @@ setup(void) {
} }
promptw = prompt ? textw(dc, prompt) : 0; promptw = prompt ? textw(dc, prompt) : 0;
inputw = MIN(inputw, mw/3); inputw = MIN(inputw, mw/3);
match(False); match();
/* menu window */ /* menu window */
wa.override_redirect = True; wa.override_redirect = True;