X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=40b220cbd842534f7e85bda034443563c2f0106a;hb=6cc0b0dc086feaf944b166d0b459ac407192ea5e;hp=2193f8229b3eed41eccf3fa041ebbed6803658f9;hpb=e0e6b071c63f960c398b43b2fbf0dec66a9b3ab6;p=dmenu.git

diff --git a/dmenu.c b/dmenu.c
index 2193f82..40b220c 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -19,8 +19,7 @@
 typedef struct Item Item;
 struct Item {
 	char *text;
-	Item *next;          /* traverses all items */
-	Item *left, *right;  /* traverses matching items */
+	Item *left, *right;
 };
 
 static void appenditem(Item *item, Item **list, Item **last);
@@ -56,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;
@@ -67,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")) {
@@ -76,10 +74,10 @@ main(int argc, char *argv[]) {
 		}
 		else if(!strcmp(argv[i], "-b"))
 			topbar = False;
-		else if(!strcmp(argv[i], "-i"))
-			fstrncmp = strncasecmp;
 		else if(!strcmp(argv[i], "-f"))
 			fast = True;
+		else if(!strcmp(argv[i], "-i"))
+			fstrncmp = strncasecmp;
 		else if(i == argc-1)
 			goto usage;
 		/* double flags */
@@ -309,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);
@@ -381,12 +382,11 @@ 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;
-	for(item = items; item; item = item->next)
+	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);
 		else if(!fstrncmp(text, item->text, len))
@@ -396,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();
@@ -421,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;
 }
@@ -445,16 +445,17 @@ paste(void) {
 void
 readstdin(void) {
 	char buf[sizeof text], *p;
-	Item *item, **end;
+	size_t i, size = 0;
 
-	for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
+	for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) {
+		if(i+1 == size / sizeof *items || !items)
+			if(!(items = realloc(items, (size += BUFSIZ))))
+				eprintf("cannot realloc %u bytes:", size);
 		if((p = strchr(buf, '\n')))
 			*p = '\0';
-		if(!(item = calloc(1, sizeof *item)))
-			eprintf("cannot malloc %u bytes:", sizeof *item);
-		if(!(item->text = strdup(buf)))
+		if(!(items[i].text = strdup(buf)))
 			eprintf("cannot strdup %u bytes:", strlen(buf)+1);
-		inputw = MAX(inputw, textw(dc, item->text));
+		inputw = MAX(inputw, textw(dc, items[i].text));
 	}
 }
 
@@ -511,7 +512,7 @@ setup(void) {
 		Window dw;
 
 		XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
-		for(i = 0; i < n; i++)
+		for(i = 0; i < n-1; i++)
 			if((monitor == info[i].screen_number)
 			|| (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
 				break;