X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=4f8594c8701ada00b660f36a40bf157518ea02f8;hb=937cabfa0aad7eef6d25e9d142a478163de200c5;hp=b5d8bd2eed8bfb99af76dc480401129c556bfe81;hpb=dc5d967ee61046f899b3b49daeb9268c8161844a;p=dwm.git

diff --git a/draw.c b/draw.c
index b5d8bd2..4f8594c 100644
--- a/draw.c
+++ b/draw.c
@@ -99,7 +99,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 +107,7 @@ drawall()
 void
 drawstatus()
 {
-	int i;
+	int i, x;
 	Bool istile = arrange == dotile;
 
 	dc.x = dc.y = 0;
@@ -123,15 +123,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);
 }