removed the stack position stuff

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 3bc8b72..c5cd35b 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -10,8 +10,7 @@
 /* static */
 
 static unsigned int
-textnw(const char *text, unsigned int len)
-{
+textnw(const char *text, unsigned int len) {
        XRectangle r;
 
        if(dc.font.set) {
@@ -22,28 +21,15 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
-drawtext(const char *text, unsigned int colidx, 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;
-       XPoint points[5];
+       XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
-       XSetForeground(dpy, dc.gc, dc.bg[colidx]);
+       XSetForeground(dpy, dc.gc, col[ColBG]);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       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);
-       XSetForeground(dpy, dc.gc, dc.fg[colidx]);
-       XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 
        if(!text)
                return;
@@ -73,32 +59,28 @@ drawtext(const char *text, unsigned int colidx, Bool highlight)
 
        if(w > dc.w)
                return; /* too long */
-       if(dc.font.set)
+       gcv.foreground = col[ColFG];
+       if(dc.font.set) {
+               XChangeGC(dpy, dc.gc, GCForeground, &gcv);
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+       }
        else {
-               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+               gcv.font = dc.font.xfont->fid;
+               XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
        if(highlight) {
-               points[0].x = dc.x + 1;
-               points[0].y = dc.y + 1;
-               points[1].x = dc.w - 3;
-               points[1].y = 0;
-               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);
+               r.x = dc.x + 2;
+               r.y = dc.y + 2;
+               r.width = r.height = (h + 2) / 4;
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        }
 }
 
 /* extern */
 
 void
-drawall()
-{
+drawall(void) {
        Client *c;
 
        for(c = clients; c; c = getnext(c->next))
@@ -107,24 +89,23 @@ drawall()
 }
 
 void
-drawstatus()
-{
+drawstatus(void) {
        int i, x;
-       Bool istile = arrange == dotile;
 
        dc.x = dc.y = 0;
-       dc.w = bw;
-       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] ? 0 : 1, sel && sel->tags[i]);
+               if(seltag[i])
+                       drawtext(tags[i], dc.sel, sel && sel->tags[i]);
                else
-                       drawtext(tags[i], seltag[i] ? 1 : 0, sel && sel->tags[i]);
+                       drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+               dc.x += dc.w;
        }
+
+       dc.w = bmw;
+       drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False);
+
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bx + bw - dc.w;
@@ -132,51 +113,49 @@ drawstatus()
                dc.x = x;
                dc.w = bw - x;
        }
-       drawtext(stext, istile ? 1 : 0, False);
+       drawtext(stext, dc.status, False);
 
-       if(sel && ((dc.w = dc.x - x) > bh)) {
+       if((dc.w = dc.x - x) > bh) {
                dc.x = x;
-               drawtext(sel->name, istile ? 0 : 1, False);
+               if(sel)
+                       drawtext(sel->name, dc.sel, False);
+               else
+                       drawtext(NULL, dc.norm, False);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
 }
 
 void
-drawtitle(Client *c)
-{
-       int i;
-       Bool istile = arrange == dotile;
-
+drawtitle(Client *c) {
        if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->twin);
-               XSetWindowBorder(dpy, c->win, dc.fg[1]);
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
                return;
        }
 
-       XSetWindowBorder(dpy, c->win, dc.bg[0]);
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
        XMapWindow(dpy, c->twin);
        dc.x = dc.y = 0;
        dc.w = c->tw;
-       drawtext(c->name, istile ? 1 : 0, 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);
 }
 
 unsigned long
-getcolor(const char *colstr)
-{
+getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
-       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+               eprint("error, cannot allocate color '%s'\n", colstr);
        return color.pixel;
 }
 
 void
-setfont(const char *fontstr)
-{
+setfont(const char *fontstr) {
        char **missing, *def;
        int i, n;
 
@@ -226,7 +205,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
-textw(const char *text)
-{
+textw(const char *text) {
        return textnw(text, strlen(text)) + dc.font.height;
 }