X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=6641ba232dcdfe6e905ed15f08eaf08f9aa53e4e;hb=4508fd2c4ee3171bdc1bffb7e53ecda8290292ef;hp=5434eab22e2bd3de80e53f0b1c8cace4ca263b29;hpb=b4e63454e5768d38682405d252a81b1149273c0b;p=dmenu.git

diff --git a/dmenu.c b/dmenu.c
index 5434eab..6641ba2 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -34,10 +34,10 @@ static void calcoffsetsh(void);
 static void calcoffsetsv(void);
 static char *cistrstr(const char *s, const char *sub);
 static void cleanup(void);
+static void dinput(void);
 static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);
-static void eprint(const char *errstr, ...);
 static Bool grabkeyboard(void);
 static void kpress(XKeyEvent * e);
 static void match(char *pattern);
@@ -46,6 +46,7 @@ static void run(void);
 static void setup(Bool topbar);
 
 #include "config.h"
+#include "draw.h"
 
 /* variables */
 static char *maxname = NULL;
@@ -55,9 +56,13 @@ static int cmdw = 0;
 static int promptw = 0;
 static int ret = 0;
 static int screen;
-static unsigned int mw, mh;
+static unsigned int lines = 0;
 static unsigned int numlockmask = 0;
+static unsigned int mw, mh;
+static unsigned long normcol[ColLast];
+static unsigned long selcol[ColLast];
 static Bool running = True;
+static DC dc;
 static Display *dpy;
 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
@@ -65,14 +70,11 @@ static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;
 static Item *curr = NULL;
-static Window parent, win;
+static Window win, parent;
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
-static unsigned int lines = 0;
 static void (*calcoffsets)(void) = calcoffsetsh;
 
-#include "draw.c"
-
 void
 appenditem(Item *i, Item **list, Item **last) {
 	if(!(*last))
@@ -88,28 +90,25 @@ void
 calcoffsetsh(void) {
 	unsigned int w;
 
-	if(!curr)
-		return;
-	w = promptw + cmdw + 2 * spaceitem;
-	for(next = curr; next && w < mw; next=next->right)
-		w += MIN(textw(next->text), mw / 3);
-	w = promptw + cmdw + 2 * spaceitem;
-	for(prev = curr; prev && prev->left && w < mw; prev=prev->left)
-		w += MIN(textw(prev->left->text), mw / 3);
+	w = promptw + cmdw + (2 * spaceitem);
+	for(next = curr; next; next = next->right)
+		if((w += MIN(textw(&dc, next->text), mw / 3)) > mw)
+			break;
+	w = promptw + cmdw + (2 * spaceitem);
+	for(prev = curr; prev && prev->left; prev = prev->left)
+		if((w += MIN(textw(&dc, prev->left->text), mw / 3)) > mw)
+			break;
 }
 
 void
 calcoffsetsv(void) {
-	unsigned int h;
+	unsigned int i;
 
-	if(!curr)
-		return;
-	h = (dc.font.height + 2) * lines;
-	for(next = curr; next && h > 0; next = next->right)
-		h -= dc.font.height + 2;
-	h = (dc.font.height + 2) * lines;
-	for(prev = curr; prev && prev->left && h > 0; prev = prev->left)
-		h -= dc.font.height + 2;
+	next = prev = curr;
+	for(i = 0; i < lines && next; i++)
+		next = next->right;
+	for(i = 0; i < lines && prev && prev->left; i++)
+		prev = prev->left;
 }
 
 char *
@@ -136,29 +135,44 @@ cistrstr(const char *s, const char *sub) {
 
 void
 cleanup(void) {
-	dccleanup();
+	Item *itm;
+
+	while(allitems) {
+		itm = allitems->next;
+		free(allitems->text);
+		free(allitems);
+		allitems = itm;
+	}
+	cleanupdraw(&dc);
 	XDestroyWindow(dpy, win);
 	XUngrabKeyboard(dpy, CurrentTime);
 }
 
+void
+dinput(void) {
+	cleanup();
+	execlp("dinput", "dinput", text, NULL); /* todo: argv */
+	eprint("cannot exec dinput\n");
+}
+
 void
 drawmenu(void) {
 	dc.x = 0;
 	dc.y = 0;
 	dc.w = mw;
 	dc.h = mh;
-	drawtext(NULL, dc.norm);
+	drawtext(&dc, NULL, normcol);
 	/* print prompt? */
 	if(prompt) {
 		dc.w = promptw;
-		drawtext(prompt, dc.sel);
+		drawtext(&dc, prompt, selcol);
 		dc.x += dc.w;
 	}
 	dc.w = mw - dc.x;
 	/* print command */
 	if(cmdw && item && lines == 0)
 		dc.w = cmdw;
-	drawtext(*text ? text : NULL, dc.norm);
+	drawtext(&dc, *text ? text : NULL, normcol);
 	if(curr) {
 		if(lines > 0)
 			drawmenuv();
@@ -175,16 +189,16 @@ drawmenuh(void) {
 
 	dc.x += cmdw;
 	dc.w = spaceitem;
-	drawtext(curr->left ? "<" : NULL, dc.norm);
+	drawtext(&dc, curr->left ? "<" : NULL, normcol);
 	dc.x += dc.w;
 	for(i = curr; i != next; i=i->right) {
-		dc.w = MIN(textw(i->text), mw / 3);
-		drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+		dc.w = MIN(textw(&dc, i->text), mw / 3);
+		drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
 		dc.x += dc.w;
 	}
 	dc.w = spaceitem;
 	dc.x = mw - dc.w;
-	drawtext(next ? ">" : NULL, dc.norm);
+	drawtext(&dc, next ? ">" : NULL, normcol);
 }
 
 void
@@ -195,21 +209,11 @@ drawmenuv(void) {
 	dc.h = dc.font.height + 2;
 	dc.y = dc.h;
 	for(i = curr; i != next; i=i->right) {
-		drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
+		drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
 		dc.y += dc.h;
 	}
 	dc.h = mh - dc.y;
-	drawtext(NULL, dc.norm);
-}
-
-void
-eprint(const char *errstr, ...) {
-	va_list ap;
-
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(EXIT_FAILURE);
+	drawtext(&dc, NULL, normcol);
 }
 
 Bool
@@ -291,8 +295,7 @@ kpress(XKeyEvent * e) {
 			match(text);
 			break;
 		case XK_x:
-			execlp("dinput", "dinput", text, NULL); /* todo: argv */
-			eprint("dmenu: cannot exec dinput:");
+			dinput();
 			break;
 		}
 	}
@@ -370,10 +373,9 @@ kpress(XKeyEvent * e) {
 		}
 		break;
 	case XK_Tab:
-		if(!sel)
-			return;
-		strncpy(text, sel->text, sizeof text);
-		match(text);
+		if(sel)
+			strncpy(text, sel->text, sizeof text);
+		dinput();
 		break;
 	}
 	drawmenu();
@@ -432,11 +434,11 @@ readstdin(void) {
 		if(buf[len-1] == '\n')
 			buf[--len] = '\0';
 		if(!(p = strdup(buf)))
-			eprint("dmenu: cannot strdup %u bytes\n", len);
+			eprint("cannot strdup %u bytes\n", len);
 		if((max = MAX(max, len)) == len)
 			maxname = p;
 		if(!(new = malloc(sizeof *new)))
-			eprint("dmenu: cannot malloc %u bytes\n", sizeof *new);
+			eprint("cannot malloc %u bytes\n", sizeof *new);
 		new->next = new->left = new->right = NULL;
 		new->text = p;
 		if(!i)
@@ -489,12 +491,12 @@ setup(Bool topbar) {
 		}
 	XFreeModifiermap(modmap);
 
-	/* style */
-	dc.norm[ColBG] = getcolor(normbgcolor);
-	dc.norm[ColFG] = getcolor(normfgcolor);
-	dc.sel[ColBG] = getcolor(selbgcolor);
-	dc.sel[ColFG] = getcolor(selfgcolor);
-	initfont(font);
+	dc.dpy = dpy;
+	normcol[ColBG] = getcolor(&dc, normbgcolor);
+	normcol[ColFG] = getcolor(&dc, normfgcolor);
+	selcol[ColBG] = getcolor(&dc, selbgcolor);
+	selcol[ColFG] = getcolor(&dc, selfgcolor);
+	initfont(&dc, font);
 
 	/* menu window */
 	wa.override_redirect = True;
@@ -534,12 +536,11 @@ setup(Bool topbar) {
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
-	/* pixmap */
-	dcsetup();
+	setupdraw(&dc, win);
 	if(maxname)
-		cmdw = MIN(textw(maxname), mw / 3);
+		cmdw = MIN(textw(&dc, maxname), mw / 3);
 	if(prompt)
-		promptw = MIN(textw(prompt), mw / 5);
+		promptw = MIN(textw(&dc, prompt), mw / 5);
 	text[0] = '\0';
 	match(text);
 	XMapRaised(dpy, win);
@@ -551,6 +552,7 @@ main(int argc, char *argv[]) {
 	Bool topbar = True;
 
 	/* command line args */
+	progname = argv[0];
 	for(i = 1; i < argc; i++)
 		if(!strcmp(argv[i], "-i")) {
 			fstrncmp = strncasecmp;
@@ -592,7 +594,7 @@ main(int argc, char *argv[]) {
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		fprintf(stderr, "dmenu: warning: no locale support\n");
 	if(!(dpy = XOpenDisplay(NULL)))
-		eprint("dmenu: cannot open display\n");
+		eprint("cannot open display\n");
 	screen = DefaultScreen(dpy);
 	if(!parent)
 		parent = RootWindow(dpy, screen);