X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=0c920e5d1c063d3b63b0874d309e8cd2c1416b50;hb=4688ad181da14be36e034918580ec0ce5968ffdb;hp=1c6613f3249009eebf0c3256b8a2fca8de5f4924;hpb=c09bf8da071e05e2c1d714f0d31d41fe944bc11b;p=dwm.git

diff --git a/draw.c b/draw.c
index 1c6613f..0c920e5 100644
--- a/draw.c
+++ b/draw.c
@@ -8,12 +8,13 @@
 #include <string.h>
 #include <X11/Xlocale.h>
 
-/* static functions */
+/* 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;
@@ -33,6 +34,7 @@ static unsigned int
 textnw(char *text, unsigned int len)
 {
 	XRectangle r;
+
 	if(dc.font.set) {
 		XmbTextExtents(dc.font.set, text, len, NULL, &r);
 		return r.width;
@@ -44,8 +46,8 @@ static void
 drawtext(const char *text, Bool invert, Bool border)
 {
 	int x, y, w, h;
-	unsigned int len;
 	static char buf[256];
+	unsigned int len;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
@@ -90,14 +92,14 @@ drawtext(const char *text, Bool invert, Bool border)
 	}
 }
 
-/* extern functions */
+/* extern */
 
 void
 drawall()
 {
 	Client *c;
 
-	for(c = clients; c; c = getnext(c->next))
+	for(c = clients; c; c = getnext(c->next, tsel))
 		drawtitle(c);
 	drawstatus();
 }
@@ -105,7 +107,7 @@ drawall()
 void
 drawstatus()
 {
-	int i;
+	int i, x;
 	Bool istile = arrange == dotile;
 
 	dc.x = dc.y = 0;
@@ -121,17 +123,16 @@ 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);
-	XFlush(dpy);
+	XSync(dpy, False);
 }
 
 void
@@ -163,16 +164,15 @@ drawtitle(Client *c)
 	dc.x += dc.w;
 	dc.w = textw(c->name);
 	drawtext(c->name, !istile, True);
-	XCopyArea(dpy, dc.drawable, c->title, dc.gc,
-			0, 0, c->tw, c->th, 0, 0);
-	XFlush(dpy);
+	XCopyArea(dpy, dc.drawable, c->title, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+	XSync(dpy, False);
 }
 
 unsigned long
 getcolor(const char *colstr)
 {
-	XColor color;
 	Colormap cmap = DefaultColormap(dpy, screen);
+	XColor color;
 
 	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
 	return color.pixel;