X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=51fa20fa0079aeb251f50c3f6408d83edcd54399;hb=d4a4cc1ab8c316c22f3d6f2a47b287a6db6fa1d7;hp=c3cad1d85c5909d29856fab7402965b68bf454b0;hpb=e980c7ff1814b533f674eec535af6c5658b1bc62;p=dmenu.git

diff --git a/main.c b/main.c
index c3cad1d..51fa20f 100644
--- a/main.c
+++ b/main.c
@@ -77,17 +77,17 @@ drawmenu()
 	dc.y = 0;
 	dc.w = mw;
 	dc.h = mh;
-	drawtext(NULL, 0, False);
+	drawtext(NULL, dc.norm);
 
 	/* print command */
 	if(cmdw && item)
 		dc.w = cmdw;
-	drawtext(text[0] ? text : NULL, 0, False);
+	drawtext(text[0] ? text : NULL, dc.norm);
 	dc.x += cmdw;
 
 	if(curr) {
 		dc.w = SPACE;
-		drawtext((curr && curr->left) ? "<" : NULL, 0, False);
+		drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
 		dc.x += dc.w;
 
 		/* determine maximum items */
@@ -95,13 +95,13 @@ drawmenu()
 			dc.w = textw(i->text);
 			if(dc.w > mw / 3)
 				dc.w = mw / 3;
-			drawtext(i->text, sel == i ? 1 : 0, sel == i);
+			drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
 			dc.x += dc.w;
 		}
 
 		dc.x = mw - SPACE;
 		dc.w = SPACE;
-		drawtext(next ? ">" : NULL, 0, False);
+		drawtext(next ? ">" : NULL, dc.norm);
 	}
 	XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
 	XFlush(dpy);
@@ -315,10 +315,10 @@ main(int argc, char *argv[])
 		usleep(1000);
 
 	/* style */
-	dc.bg[0] = getcolor(NORMBGCOLOR);
-	dc.fg[0] = getcolor(NORMFGCOLOR);
-	dc.bg[1] = getcolor(SELBGCOLOR);
-	dc.fg[1] = getcolor(SELFGCOLOR);
+	dc.sel[ColBG] = getcolor(SELBGCOLOR);
+	dc.sel[ColFG] = getcolor(SELFGCOLOR);
+	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
 	setfont(FONT);
 
 	wa.override_redirect = 1;
@@ -327,7 +327,7 @@ main(int argc, char *argv[])
 
 	mx = my = 0;
 	mw = DisplayWidth(dpy, screen);
-	mh = dc.font.height + 4;
+	mh = dc.font.height + 2;
 
 	win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent,