X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=7ada11467bb8e4688c68a2aa4d18ba0490a25c20;hb=aa471f2d65688f8cf4944c073ff05224bfac8a9c;hp=8eafc110f2dc7b9e251bdcec5a40ddc5314ce91f;hpb=2e0c767d74da024c3cd4dbd524e1364039704451;p=dwm.git

diff --git a/main.c b/main.c
index 8eafc11..7ada114 100644
--- a/main.c
+++ b/main.c
@@ -20,7 +20,7 @@
 char stext[1024];
 Bool *seltag;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-unsigned int ntags, numlockmask;
+unsigned int ntags, numlockmask, modew;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
@@ -121,12 +121,15 @@ setup()
 	seltag[0] = True;
 
 	/* style */
-	dc.bg[0] = getcolor(NORMBGCOLOR);
-	dc.fg[0] = getcolor(NORMFGCOLOR);
-	dc.bg[1] = getcolor(SELBGCOLOR);
-	dc.fg[1] = getcolor(SELFGCOLOR);
+	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+	dc.sel[ColBG] = getcolor(SELBGCOLOR);
+	dc.sel[ColFG] = getcolor(SELFGCOLOR);
+	dc.status[ColBG] = getcolor(STATUSBGCOLOR);
+	dc.status[ColFG] = getcolor(STATUSFGCOLOR);
 	setfont(FONT);
 
+	modew = textw(FLOATSYMBOL) > textw(TILEDSYMBOL) ? textw(FLOATSYMBOL) : textw(TILEDSYMBOL);
 	sx = sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
@@ -134,7 +137,7 @@ setup()
 
 	bx = by = 0;
 	bw = sw;
-	dc.h = bh = dc.font.height + 4;
+	dc.h = bh = dc.font.height + 2;
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ButtonPressMask | ExposureMask;