small changes to dwm.1, rearranged order within main event loop

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index dffb490..0ded26b 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)
 {
@@ -42,25 +22,36 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
-drawtext(const char *text, Bool invert, Bool border)
+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);
-
-       w = 0;
-       if(border)
-               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;
 
-       len = strlen(text);
+       w = 0;
+       olen = len = strlen(text);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
@@ -73,6 +64,14 @@ drawtext(const char *text, Bool invert, Bool border)
        /* 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 */
@@ -111,24 +110,24 @@ drawstatus()
 
        dc.x = dc.y = 0;
        dc.w = bw;
-       drawtext(NULL, !istile, False);
+       drawtext(NULL, !istile);
 
        dc.w = 0;
        for(i = 0; i < ntags; i++) {
                dc.x += dc.w;
                dc.w = textw(tags[i]);
                if(istile)
-                       drawtext(tags[i], (i == tsel), True);
+                       drawtext(tags[i], seltag[i]);
                else
-                       drawtext(tags[i], (i != tsel), True);
+                       drawtext(tags[i], !seltag[i]);
        }
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bx + bw - dc.w;
-       drawtext(stext, !istile, False);
+       drawtext(stext, !istile);
        if(sel && ((dc.w = dc.x - x) >= bh)) {
                dc.x = x;
-               drawtext(sel->name, istile, True);
+               drawtext(sel->name, istile);
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
@@ -140,7 +139,7 @@ drawtitle(Client *c)
        int i;
        Bool istile = arrange == dotile;
 
-       if(c == sel) {
+       if(c == sel && issel) {
                drawstatus();
                XUnmapWindow(dpy, c->title);
                XSetWindowBorder(dpy, c->win, dc.fg);
@@ -157,12 +156,12 @@ drawtitle(Client *c)
                if(c->tags[i]) {
                        dc.x += dc.w;
                        dc.w = textw(tags[i]);
-                       drawtext(tags[i], !istile, True);
+                       drawtext(tags[i], !istile);
                }
        }
        dc.x += dc.w;
-       dc.w = textw(c->name);
-       drawtext(c->name, !istile, True);
+       dc.w = c->tw - dc.x;
+       drawtext(c->name, !istile);
        XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);
 }