implemented right tag drawing in the status bar and titlebars

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 869c2f2..96780f0 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -9,26 +9,6 @@
 
 /* static */
 
-static void
-drawborder(void)
-{
-       XPoint points[5];
-
-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-       XSetForeground(dpy, dc.gc, dc.border);
-       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 unsigned int
 textnw(const char *text, unsigned int len)
 {
@@ -46,19 +26,32 @@ drawtext(const char *text, Bool invert)
 {
        int x, y, w, h;
        static char buf[256];
-       unsigned int len;
+       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);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       drawborder();
+       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+       XSetForeground(dpy, dc.gc, dc.border);
+       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);
 
        if(!text)
                return;
 
        w = 0;
-       len = strlen(text);
+       olen = len = strlen(text);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
@@ -71,6 +64,14 @@ drawtext(const char *text, Bool invert)
        /* shorten text if necessary */
        while(len && (w = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;
+       if(len < olen) {
+               if(len > 1)
+                       buf[len - 1] = '.';
+               if(len > 2)
+                       buf[len - 2] = '.';
+               if(len > 3)
+                       buf[len - 3] = '.';
+       }
 
        if(w > dc.w)
                return; /* too long */
@@ -116,17 +117,29 @@ drawstatus()
                dc.x += dc.w;
                dc.w = textw(tags[i]);
                if(istile)
-                       drawtext(tags[i], (i == tsel));
+                       drawtext(tags[i], seltag[i]);
                else
-                       drawtext(tags[i], (i != tsel));
+                       drawtext(tags[i], !seltag[i]);
        }
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bx + bw - dc.w;
        drawtext(stext, !istile);
-       if(sel && ((dc.w = dc.x - x) >= bh)) {
-               dc.x = x;
-               drawtext(sel->name, istile);
+
+       if(sel) {
+               for(i = 0; i < ntags; i++)
+                       if(sel->tags[i]) {
+                               dc.w = textw(tags[i]);
+                               dc.x -= dc.w;
+                               if(dc.x < x)
+                                       break;
+                               drawtext(tags[i], istile);
+                       }
+               if(dc.x > x && (dc.x - x) > bh) {
+                       dc.w = dc.x - x;
+                       dc.x = x;
+                       drawtext(sel->name, istile);
+               }
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
@@ -148,18 +161,16 @@ drawtitle(Client *c)
        XSetWindowBorder(dpy, c->win, dc.bg);
        XMapWindow(dpy, c->title);
 
-       dc.x = dc.y = 0;
-
-       dc.w = 0;
-       for(i = 0; i < ntags; i++) {
+       dc.y = dc.w = 0;
+       dc.x = c->tw;
+       for(i = 0; i < ntags; i++)
                if(c->tags[i]) {
-                       dc.x += dc.w;
                        dc.w = textw(tags[i]);
+                       dc.x -= dc.w;
                        drawtext(tags[i], !istile);
                }
-       }
-       dc.x += dc.w;
-       dc.w = textw(c->name);
+       dc.w = dc.x;
+       dc.x = 0;
        drawtext(c->name, !istile);
        XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);