Added tag 0.7 for changeset 3fb41412e2492f66476d92ce8f007a8b48fb1d2a

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index b5d8bd2..dffb490 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlocale.h>
@@ -31,7 +30,7 @@ drawborder(void)
 }
 
 static unsigned int
-textnw(char *text, unsigned int len)
+textnw(const char *text, unsigned int len)
 {
        XRectangle r;
 
@@ -99,7 +98,7 @@ drawall()
 {
        Client *c;
 
-       for(c = clients; c; c = getnext(c->next, tsel))
+       for(c = clients; c; c = getnext(c->next))
                drawtitle(c);
        drawstatus();
 }
@@ -107,7 +106,7 @@ drawall()
 void
 drawstatus()
 {
-       int i;
+       int i, x;
        Bool istile = arrange == dotile;
 
        dc.x = dc.y = 0;
@@ -115,7 +114,7 @@ drawstatus()
        drawtext(NULL, !istile, False);
 
        dc.w = 0;
-       for(i = 0; i < TLast; i++) {
+       for(i = 0; i < ntags; i++) {
                dc.x += dc.w;
                dc.w = textw(tags[i]);
                if(istile)
@@ -123,15 +122,14 @@ drawstatus()
                else
                        drawtext(tags[i], (i != tsel), True);
        }
-       if(sel) {
-               dc.x += dc.w;
-               dc.w = textw(sel->name);
-               drawtext(sel->name, istile, True);
-       }
+       x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bx + bw - dc.w;
        drawtext(stext, !istile, False);
-
+       if(sel && ((dc.w = dc.x - x) >= bh)) {
+               dc.x = x;
+               drawtext(sel->name, istile, True);
+       }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
        XSync(dpy, False);
 }
@@ -155,11 +153,11 @@ drawtitle(Client *c)
        dc.x = dc.y = 0;
 
        dc.w = 0;
-       for(i = 0; i < TLast; i++) {
+       for(i = 0; i < ntags; i++) {
                if(c->tags[i]) {
                        dc.x += dc.w;
-                       dc.w = textw(c->tags[i]);
-                       drawtext(c->tags[i], !istile, True);
+                       dc.w = textw(tags[i]);
+                       drawtext(tags[i], !istile, True);
                }
        }
        dc.x += dc.w;
@@ -231,7 +229,7 @@ setfont(const char *fontstr)
 }
 
 unsigned int
-textw(char *text)
+textw(const char *text)
 {
        return textnw(text, strlen(text)) + dc.font.height;
 }