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

merge token -> default

Browse Source
This commit is contained in:
Connor Lane Smith 2011-09-20 00:11:01 +01:00
commit 5020734408
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dmenu.1
View File

@ -25,13 +25,10 @@ dmenu \- dynamic menu
.BR dmenu_run " ..." .BR dmenu_run " ..."
.SH DESCRIPTION .SH DESCRIPTION
.B dmenu .B dmenu
is a dynamic menu for X, originally designed for is a dynamic menu for X, which reads a list of newline\-separated items from
.IR dwm (1). stdin. When the user selects an item and presses Return, their choice is printed
It manages huge numbers of user\-defined menu items efficiently. to stdout and dmenu terminates. Entering text will narrow the items to those
.P matching the tokens in the input.
dmenu reads a list of newline\-separated items from stdin and creates a menu.
When the user selects an item or enters any text and presses Return, their
choice is printed to stdout and dmenu terminates.
.P .P
.B dmenu_run .B dmenu_run
is a dmenu script used by dwm which lists programs in the user's $PATH and is a dmenu script used by dwm which lists programs in the user's $PATH and
@ -42,8 +39,8 @@ executes the selected item.
dmenu appears at the bottom of the screen. dmenu appears at the bottom of the screen.
.TP .TP
.B \-f .B \-f
dmenu grabs the keyboard before reading stdin. This is faster, but may lock up dmenu grabs the keyboard before reading stdin. This is faster, but will lock up
X if stdin is from a terminal. X until stdin reaches end\-of\-file.
.TP .TP
.B \-i .B \-i
dmenu matches menu items case insensitively. dmenu matches menu items case insensitively.

59
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,33 +355,44 @@ 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(matches) {
matchend->right = lprefix; matchend->right = lprefix;
lprefix->left = matchend; lprefix->left = matchend;
} }
@ -390,7 +401,7 @@ match(Bool sub) {
matchend = prefixend; matchend = prefixend;
} }
if(lsubstr) { if(lsubstr) {
if(matchend) { if(matches) {
matchend->right = lsubstr; matchend->right = lsubstr;
lsubstr->left = matchend; lsubstr->left = matchend;
} }
@ -519,7 +530,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 */
swa.override_redirect = True; swa.override_redirect = True;