X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=2684c910da7b2eefba720e26fc6984a3969738c2;hb=3c067598fc3070243ae0c784bfea906dce0a6fbb;hp=d8ef88f132866a4c3c7f67a7670218abe15aa9ce;hpb=210b303941e517a9d7df1cba1e3229165fb4037b;p=dmenu.git

diff --git a/dmenu.c b/dmenu.c
index d8ef88f..2684c91 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,4 +1,4 @@
-/* See LICENSE file for copyright and license details. */
+/* See LICENSE file for copynext and license details. */
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -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);
@@ -64,6 +63,7 @@ static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 
 int
 main(int argc, char *argv[]) {
+	Bool fast = False;
 	int i;
 
 	progname = "dmenu";
@@ -75,6 +75,8 @@ main(int argc, char *argv[]) {
 		}
 		else if(!strcmp(argv[i], "-b"))
 			topbar = False;
+		else if(!strcmp(argv[i], "-f"))
+			fast = True;
 		else if(!strcmp(argv[i], "-i"))
 			fstrncmp = strncasecmp;
 		else if(i == argc-1)
@@ -101,13 +103,21 @@ main(int argc, char *argv[]) {
 
 	dc = initdc();
 	initfont(dc, font);
-	readstdin();
-	setup();
+
+	if(fast) {
+		setup();
+		readstdin();
+	}
+	else {
+		readstdin();
+		setup();
+	}
+	match();
 	run();
 	return EXIT_FAILURE;
 
 usage:
-	fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+	fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
 	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
 	return EXIT_FAILURE;
 }
@@ -375,7 +385,7 @@ match(void) {
 
 	len = strlen(text);
 	matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-	for(item = items; item; item = item->next)
+	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))
@@ -434,16 +444,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\n", sizeof *item);
-		if(!(item->text = strdup(buf)))
-			eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
-		inputw = MAX(inputw, textw(dc, item->text));
+		if(!(items[i].text = strdup(buf)))
+			eprintf("cannot strdup %u bytes:", strlen(buf)+1);
+		inputw = MAX(inputw, textw(dc, items[i].text));
 	}
 }
 
@@ -500,7 +511,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;
@@ -530,5 +541,4 @@ setup(void) {
 	inputw = MIN(inputw, mw/3);
 	promptw = prompt ? textw(dc, prompt) : 0;
 	XMapRaised(dc->dpy, win);
-	match();
 }