fixed

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 4ebda12..3bc8b72 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -22,16 +22,15 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
-drawtext(const char *text, Bool invert, Bool underline)
+drawtext(const char *text, unsigned int colidx, Bool highlight)
 {
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
-       XGCValues gcv;
        XPoint points[5];
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XSetForeground(dpy, dc.gc, dc.bg[colidx]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        points[0].x = dc.x;
        points[0].y = dc.y;
@@ -43,7 +42,7 @@ drawtext(const char *text, Bool invert, Bool underline)
        points[3].y = 0;
        points[4].x = 0;
        points[4].y = -(dc.h - 1);
-       XSetForeground(dpy, dc.gc, dc.border);
+       XSetForeground(dpy, dc.gc, dc.fg[colidx]);
        XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 
        if(!text)
@@ -74,23 +73,24 @@ drawtext(const char *text, Bool invert, Bool underline)
 
        if(w > dc.w)
                return; /* too long */
-       gcv.foreground = invert ? dc.bg : dc.fg;
-       gcv.background = invert ? dc.fg : dc.bg;
-       if(dc.font.set) {
-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
+       if(dc.font.set)
                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);
+               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
-       if(underline) {
-               points[0].x = dc.x + (h / 2) - 1;
-               points[0].y = dc.y + dc.h - 3;
-               points[1].x = dc.w - h + 2;
+       if(highlight) {
+               points[0].x = dc.x + 1;
+               points[0].y = dc.y + 1;
+               points[1].x = dc.w - 3;
                points[1].y = 0;
-               XDrawLines(dpy, dc.drawable, dc.gc, points, 2, CoordModePrevious);
+               points[2].x = 0;
+               points[2].y = dc.h - 3;
+               points[3].x = -(dc.w - 3);
+               points[3].y = 0;
+               points[4].x = 0;
+               points[4].y = -(dc.h - 3);
+               XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
        }
 }
 
@@ -114,16 +114,16 @@ drawstatus()
 
        dc.x = dc.y = 0;
        dc.w = bw;
-       drawtext(NULL, !istile, False);
+       drawtext(NULL, istile ? 1 : 0, False);
 
        dc.w = 0;
        for(i = 0; i < ntags; i++) {
                dc.x += dc.w;
                dc.w = textw(tags[i]);
                if(istile)
-                       drawtext(tags[i], seltag[i], sel && sel->tags[i]);
+                       drawtext(tags[i], seltag[i] ? 0 : 1, sel && sel->tags[i]);
                else
-                       drawtext(tags[i], !seltag[i], sel && sel->tags[i]);
+                       drawtext(tags[i], seltag[i] ? 1 : 0, sel && sel->tags[i]);
        }
        x = dc.x + dc.w;
        dc.w = textw(stext);
@@ -132,11 +132,11 @@ drawstatus()
                dc.x = x;
                dc.w = bw - x;
        }
-       drawtext(stext, !istile, False);
+       drawtext(stext, istile ? 1 : 0, False);
 
        if(sel && ((dc.w = dc.x - x) > bh)) {
                dc.x = x;
-               drawtext(sel->name, istile, False);
+               drawtext(sel->name, istile ? 0 : 1, False);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
@@ -151,15 +151,15 @@ drawtitle(Client *c)
        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);
-               XSetWindowBorder(dpy, c->win, dc.fg);
+               XSetWindowBorder(dpy, c->win, dc.fg[1]);
                return;
        }
 
-       XSetWindowBorder(dpy, c->win, dc.bg);
+       XSetWindowBorder(dpy, c->win, dc.bg[0]);
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;
-       drawtext(c->name, !istile, False);
+       drawtext(c->name, istile ? 1 : 0, False);
        XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);
 }