tags appear in the left again

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 3b6967c..c7ef7f5 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -26,7 +26,7 @@ drawtext(const char *text, Bool invert)
 {
        int x, y, w, h;
        static char buf[256];
 {
        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 };
        XGCValues gcv;
        XPoint points[5];
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };


@@ -51,7 +51,7 @@ drawtext(const char *text, Bool invert)
                return;
 
        w = 0;
                return;
 
        w = 0;

-       len = strlen(text);
+       olen = len = strlen(text);

        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);


@@ -64,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;
        /* 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 */
 
        if(w > dc.w)
                return; /* too long */


@@ -142,7 +150,6 @@ drawtitle(Client *c)
        XMapWindow(dpy, c->title);
 
        dc.x = dc.y = 0;
        XMapWindow(dpy, c->title);
 
        dc.x = dc.y = 0;

-

        dc.w = 0;
        for(i = 0; i < ntags; i++) {
                if(c->tags[i]) {
        dc.w = 0;
        for(i = 0; i < ntags; i++) {
                if(c->tags[i]) {


@@ -152,7 +159,7 @@ drawtitle(Client *c)
                }
        }
        dc.x += dc.w;
                }
        }
        dc.x += dc.w;

-       dc.w = textw(c->name);
+       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);
        drawtext(c->name, !istile);
        XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
        XSync(dpy, False);