X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=cf5e4a6755c35c15e3e5feae5ac014de1077f05c;hb=fb67bd666ed22a28caff505f3319184735e05311;hp=f0be02a0fa6837a8d87b58830026a36764c12530;hpb=7cf66b443ad1cc9a698db477401b843f3c14184b;p=dmenu.git

diff --git a/dmenu.c b/dmenu.c
index f0be02a..cf5e4a6 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -10,7 +10,7 @@
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#include <dc.h>
+#include "draw.h"
 
 #define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
 #define MIN(a,b)                ((a) < (b) ? (a) : (b))
@@ -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);
@@ -36,11 +35,10 @@ static void paste(void);
 static void readstdin(void);
 static void run(void);
 static void setup(void);
-static void usage(void);
 
-static char text[BUFSIZ];
+static char text[BUFSIZ] = "";
 static int bh, mw, mh;
-static int inputw = 0;
+static int inputw;
 static int lines = 0;
 static int monitor = -1;
 static int promptw;
@@ -57,12 +55,72 @@ 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;
 
+int
+main(int argc, char *argv[]) {
+	Bool fast = False;
+	int i;
+
+	for(i = 1; i < argc; i++)
+		/* single flags */
+		if(!strcmp(argv[i], "-v")) {
+			fputs("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details\n", stdout);
+			exit(EXIT_SUCCESS);
+		}
+		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+1 == argc)
+			goto usage;
+		/* double flags */
+		else if(!strcmp(argv[i], "-l"))
+			lines = atoi(argv[++i]);
+		else if(!strcmp(argv[i], "-m"))
+			monitor = atoi(argv[++i]);
+		else if(!strcmp(argv[i], "-p"))
+			prompt = argv[++i];
+		else if(!strcmp(argv[i], "-fn"))
+			font = argv[++i];
+		else if(!strcmp(argv[i], "-nb"))
+			normbgcolor = argv[++i];
+		else if(!strcmp(argv[i], "-nf"))
+			normfgcolor = argv[++i];
+		else if(!strcmp(argv[i], "-sb"))
+			selbgcolor = argv[++i];
+		else if(!strcmp(argv[i], "-sf"))
+			selfgcolor = argv[++i];
+		else
+			goto usage;
+
+	dc = initdc();
+	initfont(dc, font);
+
+	if(fast) {
+		setup();
+		readstdin();
+	}
+	else {
+		readstdin();
+		setup();
+	}
+	match();
+	run();
+	return EXIT_FAILURE;
+
+usage:
+	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;
+}
+
 void
 appenditem(Item *item, Item **list, Item **last) {
 	if(!*last)
@@ -81,13 +139,13 @@ calcoffsets(void) {
 	if(lines > 0)
 		n = lines * bh;
 	else
-		n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">"));
+		n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
 
 	for(i = 0, next = curr; next; next = next->right)
-		if((i += (lines > 0) ? bh : MIN(dc_textw(dc, next->text), n)) > n)
+		if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
 			break;
 	for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
-		if((i += (lines > 0) ? bh : MIN(dc_textw(dc, prev->left->text), n)) > n)
+		if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n)
 			break;
 }
 
@@ -99,41 +157,41 @@ drawmenu(void) {
 	dc->x = 0;
 	dc->y = 0;
 	dc->h = bh;
-	dc_drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
+	drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
 
 	if(prompt) {
 		dc->w = promptw;
-		dc_drawtext(dc, prompt, selcol);
+		drawtext(dc, prompt, selcol);
 		dc->x = dc->w;
 	}
 	dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
-	dc_drawtext(dc, text, normcol);
-	if((curpos = dc_textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
-		dc_drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
+	drawtext(dc, text, normcol);
+	if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+		drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
 
 	if(lines > 0) {
 		dc->w = mw - dc->x;
 		for(item = curr; item != next; item = item->right) {
 			dc->y += dc->h;
-			dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+			drawtext(dc, item->text, (item == sel) ? selcol : normcol);
 		}
 	}
 	else if(matches) {
 		dc->x += inputw;
-		dc->w = dc_textw(dc, "<");
+		dc->w = textw(dc, "<");
 		if(curr->left)
-			dc_drawtext(dc, "<", normcol);
+			drawtext(dc, "<", normcol);
 		for(item = curr; item != next; item = item->right) {
 			dc->x += dc->w;
-			dc->w = MIN(dc_textw(dc, item->text), mw - dc->x - dc_textw(dc, ">"));
-			dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol);
+			dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">"));
+			drawtext(dc, item->text, (item == sel) ? selcol : normcol);
 		}
-		dc->w = dc_textw(dc, ">");
+		dc->w = textw(dc, ">");
 		dc->x = mw - dc->w;
 		if(next)
-			dc_drawtext(dc, ">", normcol);
+			drawtext(dc, ">", normcol);
 	}
-	dc_map(dc, win, mw, mh);
+	mapdc(dc, win, mw, mh);
 }
 
 char *
@@ -162,9 +220,9 @@ void
 insert(const char *s, ssize_t n) {
 	if(strlen(text) + n > sizeof text - 1)
 		return;
-	memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 0));
+	memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
 	if(n > 0)
-		memcpy(text + cursor, s, n);
+		memcpy(&text[cursor], s, n);
 	cursor += n;
 	match();
 }
@@ -177,7 +235,7 @@ keypress(XKeyEvent *ev) {
 
 	len = strlen(text);
 	XLookupString(ev, buf, sizeof buf, &ksym, NULL);
-	if(ev->state & ControlMask) {
+	if(ev->state & ControlMask)
 		switch(tolower(ksym)) {
 		default:
 			return;
@@ -227,8 +285,10 @@ keypress(XKeyEvent *ev) {
 			while(cursor > 0 && text[nextrune(-1)] != ' ')
 				insert(NULL, nextrune(-1) - cursor);
 			break;
+		case XK_y:  /* paste selection */
+			XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+			return;
 		}
-	}
 	switch(ksym) {
 	default:
 		if(!iscntrl(*buf))
@@ -247,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);
@@ -264,10 +327,6 @@ keypress(XKeyEvent *ev) {
 		sel = curr = matches;
 		calcoffsets();
 		break;
-	case XK_Insert:  /* paste selection */
-		if(ev->state & ShiftMask)
-			XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
-		return;
 	case XK_Left:
 		if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
 			cursor = nextrune(-1);
@@ -296,7 +355,6 @@ keypress(XKeyEvent *ev) {
 	case XK_Return:
 	case XK_KP_Enter:
 		fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
-		fflush(stdout);
 		exit(EXIT_SUCCESS);
 	case XK_Right:
 		if(cursor < len) {
@@ -324,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))
@@ -339,34 +396,34 @@ 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 = prev = next = sel = matches;
+	curr = sel = matches;
 	calcoffsets();
 }
 
 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;
 }
@@ -387,19 +444,21 @@ paste(void) {
 
 void
 readstdin(void) {
-	char buf[sizeof text], *p;
-	Item *item, **end;
+	char buf[sizeof text], *p, *maxstr = NULL;
+	size_t i, max = 0, 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)
+			if(!(items = realloc(items, (size += BUFSIZ))))
+				eprintf("cannot realloc %u bytes:", size);
 		if((p = strchr(buf, '\n')))
 			*p = '\0';
-		if(!(item = malloc(sizeof *item)))
-			eprintf("cannot malloc %u bytes\n", sizeof *item);
-		if(!(item->text = strdup(buf)))
-			eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
-		item->next = item->left = item->right = NULL;
-		inputw = MAX(inputw, dc_textw(dc, item->text));
+		if(!(items[i].text = strdup(buf)))
+			eprintf("cannot strdup %u bytes:", strlen(buf)+1);
+		if(strlen(items[i].text) > max)
+			max = strlen(maxstr = items[i].text);
 	}
+	inputw = maxstr ? textw(dc, maxstr) : 0;
 }
 
 void
@@ -439,10 +498,10 @@ setup(void) {
 	root = RootWindow(dc->dpy, screen);
 	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
 
-	normcol[ColBG] = dc_color(dc, normbgcolor);
-	normcol[ColFG] = dc_color(dc, normfgcolor);
-	selcol[ColBG] = dc_color(dc, selbgcolor);
-	selcol[ColFG] = dc_color(dc, selfgcolor);
+	normcol[ColBG] = getcolor(dc, normbgcolor);
+	normcol[ColFG] = getcolor(dc, normfgcolor);
+	selcol[ColBG] = getcolor(dc, selbgcolor);
+	selcol[ColFG] = getcolor(dc, selfgcolor);
 
 	/* menu geometry */
 	bh = dc->font.height + 2;
@@ -455,7 +514,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;
@@ -481,63 +540,8 @@ setup(void) {
 	                    CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
 	grabkeyboard();
-	dc_resize(dc, mw, mh);
+	resizedc(dc, mw, mh);
 	inputw = MIN(inputw, mw/3);
-	promptw = prompt ? dc_textw(dc, prompt) : 0;
+	promptw = prompt ? textw(dc, prompt) : 0;
 	XMapRaised(dc->dpy, win);
-	text[0] = '\0';
-	match();
-}
-
-void
-usage(void) {
-	fputs("usage: dmenu [-b] [-i] [-l lines] [-p prompt] [-fn font] [-nb color]\n"
-	      "             [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
-	exit(EXIT_FAILURE);
-}
-
-int
-main(int argc, char *argv[]) {
-	int i;
-
-	progname = "dmenu";
-	for(i = 1; i < argc; i++)
-		/* single flags */
-		if(!strcmp(argv[i], "-v")) {
-			fputs("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n", stdout);
-			exit(EXIT_SUCCESS);
-		}
-		else if(!strcmp(argv[i], "-b"))
-			topbar = False;
-		else if(!strcmp(argv[i], "-i"))
-			fstrncmp = strncasecmp;
-		else if(i == argc-1)
-			usage();
-		/* double flags */
-		else if(!strcmp(argv[i], "-l"))
-			lines = atoi(argv[++i]);
-		else if(!strcmp(argv[i], "-m"))
-			monitor = atoi(argv[++i]);
-		else if(!strcmp(argv[i], "-p"))
-			prompt = argv[++i];
-		else if(!strcmp(argv[i], "-fn"))
-			font = argv[++i];
-		else if(!strcmp(argv[i], "-nb"))
-			normbgcolor = argv[++i];
-		else if(!strcmp(argv[i], "-nf"))
-			normfgcolor = argv[++i];
-		else if(!strcmp(argv[i], "-sb"))
-			selbgcolor = argv[++i];
-		else if(!strcmp(argv[i], "-sf"))
-			selfgcolor = argv[++i];
-		else
-			usage();
-
-	dc = dc_init();
-	dc_font(dc, font);
-	readstdin();
-	setup();
-	run();
-
-	return EXIT_FAILURE;  /* should not reach */
 }