implemented new color scheme accordingly to Sanders proposal

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index ba99ee0..19604f3 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -120,7 +120,7 @@ drawstatus(void) {
                dc.x += dc.w;
        }
        dc.w = bmw;
                dc.x += dc.w;
        }
        dc.w = bmw;

-       drawtext(mtext, dc.status, False, False);
+       drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);

        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bw - dc.w;
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bw - dc.w;


@@ -128,7 +128,7 @@ drawstatus(void) {
                dc.x = x;
                dc.w = bw - x;
        }
                dc.x = x;
                dc.w = bw - x;
        }

-       drawtext(stext, dc.status, False, False);
+       drawtext(stext, dc.norm, False, False);

        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);


@@ -141,16 +141,10 @@ void
 drawclient(Client *c) {
        if(c == sel && issel) {
                drawstatus();
 drawclient(Client *c) {
        if(c == sel && issel) {
                drawstatus();

-               XUnmapWindow(dpy, c->twin);
-               XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);

                return;
        }
                return;
        }

-       XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
-       XMapWindow(dpy, c->twin);
-       dc.x = dc.y = 0;
-       dc.w = c->tw;
-       drawtext(c->name, dc.norm, False, False);
-       XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);

        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }