X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=dmenu.c;h=40b220cbd842534f7e85bda034443563c2f0106a;hb=6cc0b0dc086feaf944b166d0b459ac407192ea5e;hp=68fc9ffd2d1ca30911daa37b79994a44268d8a1d;hpb=be9afce03548e8110744064d1c9c67795c13cdb6;p=dmenu.git

diff --git a/dmenu.c b/dmenu.c
index 68fc9ff..40b220c 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -55,8 +55,8 @@ static Atom utf8;
 static Bool topbar = True;
 static DC *dc;
 static Item *items = NULL;
-static Item *matches, *sel;
-static Item *prev, *curr, *next;
+static Item *matches, *matchend;
+static Item *prev, *curr, *next, *sel;
 static Window root, win;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
@@ -66,7 +66,6 @@ main(int argc, char *argv[]) {
 	Bool fast = False;
 	int i;
 
-	progname = "dmenu";
 	for(i = 1; i < argc; i++)
 		/* single flags */
 		if(!strcmp(argv[i], "-v")) {
@@ -308,12 +307,15 @@ keypress(XKeyEvent *ev) {
 			cursor = len;
 			break;
 		}
-		while(next) {
-			sel = curr = next;
+		if(next) {
+			curr = matchend;
 			calcoffsets();
+			curr = prev;
+			calcoffsets();
+			while(next && (curr = curr->right))
+				calcoffsets();
 		}
-		while(sel && sel->right)
-			sel = sel->right;
+		sel = matchend;
 		break;
 	case XK_Escape:
 		exit(EXIT_FAILURE);
@@ -380,11 +382,10 @@ keypress(XKeyEvent *ev) {
 
 void
 match(void) {
-	size_t len;
-	Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+	size_t len = strlen(text);
+	Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
-	len = strlen(text);
-	matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
+	matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL;
 	for(item = items; item && item->text; item++)
 		if(!fstrncmp(text, item->text, len + 1))
 			appenditem(item, &lexact, &exactend);
@@ -395,24 +396,25 @@ match(void) {
 
 	if(lexact) {
 		matches = lexact;
-		itemend = exactend;
+		matchend = exactend;
 	}
 	if(lprefix) {
-		if(itemend) {
-			itemend->right = lprefix;
-			lprefix->left = itemend;
+		if(matchend) {
+			matchend->right = lprefix;
+			lprefix->left = matchend;
 		}
 		else
 			matches = lprefix;
-		itemend = prefixend;
+		matchend = prefixend;
 	}
 	if(lsubstr) {
-		if(itemend) {
-			itemend->right = lsubstr;
-			lsubstr->left = itemend;
+		if(matchend) {
+			matchend->right = lsubstr;
+			lsubstr->left = matchend;
 		}
 		else
 			matches = lsubstr;
+		matchend = substrend;
 	}
 	curr = sel = matches;
 	calcoffsets();
@@ -420,9 +422,8 @@ match(void) {
 
 size_t
 nextrune(int incr) {
-	size_t n, len;
+	size_t n, len = strlen(text);
 
-	len = strlen(text);
 	for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
 	return n;
 }