applied sanders patch of my config

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 067f383..ed055c2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -17,7 +17,7 @@
 
 /* extern */
 
-char stext[1024], mtext[32];
+char stext[256];
 Bool *seltag;
 int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
 unsigned int master, nmaster, ntags, numlockmask;
@@ -121,12 +121,12 @@ setup(void) {
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;
        /* style */
+       dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
        dc.norm[ColBG] = getcolor(NORMBGCOLOR);
        dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+       dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
        dc.sel[ColBG] = getcolor(SELBGCOLOR);
        dc.sel[ColFG] = getcolor(SELFGCOLOR);
-       dc.status[ColBG] = getcolor(STATUSBGCOLOR);
-       dc.status[ColFG] = getcolor(STATUSFGCOLOR);
        setfont(FONT);
        /* geometry */
        sx = sy = 0;
@@ -134,7 +134,7 @@ setup(void) {
        sh = DisplayHeight(dpy, screen);
        master = MASTER;
        nmaster = NMASTER;
-       updatemodetext();
+       bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
        /* bar */
        bx = sx;
        by = sy;