new stuff

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 8eafc11..5dab0db 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,7 +19,7 @@
 
 char stext[1024];
 Bool *seltag;
 
 char stext[1024];
 Bool *seltag;

-int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh;

 unsigned int ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 unsigned int ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;


@@ -121,12 +121,15 @@ setup()
        seltag[0] = True;
 
        /* style */
        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);
 
        setfont(FONT);
 

+       bmw = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL);

        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);


@@ -134,7 +137,7 @@ setup()
 
        bx = by = 0;
        bw = sw;
 
        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;
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask | ExposureMask;