From c9465859a6eac7763d0b9049dca6bd34c163d8f6 Mon Sep 17 00:00:00 2001 From: "arg@wmii.de" Date: Tue, 26 Sep 2006 08:43:41 +0200 Subject: applied a change made by Uriel to dmenu (though I didn't applied everything) --- main.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/main.c b/main.c index 3203014..77a61b9 100644 --- a/main.c +++ b/main.c @@ -120,19 +120,8 @@ match(char *pattern) { nitem = 0; for(i = allitems; i; i=i->next) - if(!plen || !strncmp(pattern, i->text, plen)) { - if(!j) - item = i; - else - j->right = i; - i->left = j; - i->right = NULL; - j = i; - nitem++; - } - for(i = allitems; i; i=i->next) - if(plen && strncmp(pattern, i->text, plen) - && strstr(i->text, pattern)) { + if(plen ? !strncmp(pattern, i->text, plen) : + strncmp(pattern, i->text, plen) && strstr(i->text, pattern)) { if(!j) item = i; else @@ -208,10 +197,8 @@ kpress(XKeyEvent * e) { } break; case XK_Return: - if(e->state & ShiftMask) { - if(text) - fprintf(stdout, "%s", text); - } + if((e->state & ShiftMask) && text) + fprintf(stdout, "%s", text); else if(sel) fprintf(stdout, "%s", sel->text); else if(text) -- cgit v1.2.3-70-g09d2