new stuff

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index cbf6502..64b11af 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -22,37 +22,16 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
 }
 
 static void

-drawborder()
-{
-       XPoint points[5];
-       points[0].x = dc.x;
-       points[0].y = dc.y;
-       points[1].x = dc.w - 1;
-       points[1].y = 0;
-       points[2].x = 0;
-       points[2].y = dc.h - 1;
-       points[3].x = -(dc.w - 1);
-       points[3].y = 0;
-       points[4].x = 0;
-       points[4].y = -(dc.h - 1);
-       XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-}
-
-static void
-drawtext(const char *text, Bool invert, Bool highlight)
+drawtext(const char *text, unsigned long col[ColLast], Bool highlight)

 {
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
 {
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;

-       DC tmp;

        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 

-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XSetForeground(dpy, dc.gc, col[ColBG]);

        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-       XSetForeground(dpy, dc.gc, dc.border);
-       drawborder();

 
        if(!text)
                return;
 
        if(!text)
                return;


@@ -82,25 +61,21 @@ drawtext(const char *text, Bool invert, Bool highlight)
 
        if(w > dc.w)
                return; /* too long */
 
        if(w > dc.w)
                return; /* too long */

-       gcv.foreground = invert ? dc.bg : dc.fg;
-       gcv.background = invert ? dc.fg : dc.bg;
+       gcv.foreground = col[ColFG];

        if(dc.font.set) {
        if(dc.font.set) {

-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
+               XChangeGC(dpy, dc.gc, GCForeground, &gcv);

                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
        }
        else {
                gcv.font = dc.font.xfont->fid;
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
        }
        else {
                gcv.font = dc.font.xfont->fid;

-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
+               XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);

                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
        if(highlight) {
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
        if(highlight) {

-               tmp = dc;
-               dc.x += 2;
-               dc.y += 2;
-               dc.w -= 4;
-               dc.h -= 4;
-               drawborder();
-               dc = tmp;
+               r.x = dc.x + 2;
+               r.y = dc.y + 2;
+               r.width = r.height = 3;
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        }
 }
 
        }
 }
 


@@ -120,21 +95,23 @@ void
 drawstatus()
 {
        int i, x;
 drawstatus()
 {
        int i, x;

-       Bool istile = arrange == dotile;

 
        dc.x = dc.y = 0;
        dc.w = bw;
 
        dc.x = dc.y = 0;
        dc.w = bw;

-       drawtext(NULL, !istile, False);

 
 

-       dc.w = 0;
+       drawtext(NULL, dc.status, False);

        for(i = 0; i < ntags; i++) {
        for(i = 0; i < ntags; i++) {

-               dc.x += dc.w;

                dc.w = textw(tags[i]);
                dc.w = textw(tags[i]);

-               if(istile)
-                       drawtext(tags[i], seltag[i], sel && sel->tags[i]);
+               if(seltag[i])
+                       drawtext(tags[i], dc.sel, sel && sel->tags[i]);

                else
                else

-                       drawtext(tags[i], !seltag[i], sel && sel->tags[i]);
+                       drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+               dc.x += dc.w;

        }
        }

+
+       dc.w = bmw;
+       drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
+

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


@@ -142,11 +119,11 @@ drawstatus()
                dc.x = x;
                dc.w = bw - x;
        }
                dc.x = x;
                dc.w = bw - x;
        }

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

 
        if(sel && ((dc.w = dc.x - x) > bh)) {
                dc.x = x;
 
        if(sel && ((dc.w = dc.x - x) > bh)) {
                dc.x = x;

-               drawtext(sel->name, istile, False);
+               drawtext(sel->name, dc.sel, False);

        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);


@@ -156,20 +133,19 @@ void
 drawtitle(Client *c)
 {
        int i;
 drawtitle(Client *c)
 {
        int i;

-       Bool istile = arrange == dotile;

 
        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);
 
        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);

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

                return;
        }
 
                return;
        }
 

-       XSetWindowBorder(dpy, c->win, dc.bg);
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);

        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;

-       drawtext(c->name, !istile, False);
+       drawtext(c->name, dc.norm, False);

        XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);
 }
        XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);
 }