X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=3938e5e6e971c5b507913495c0c610f99ac9b210;hb=2dd5212a795b27422d601df0566ae0d6644bd4c8;hp=3ddc522d1ad0d0e14152037e1a863a8e86e41f22;hpb=03128f78df1fbe1b90eb9b7bcb1953050e8bccea;p=dwm.git

diff --git a/draw.c b/draw.c
index 3ddc522..3938e5e 100644
--- a/draw.c
+++ b/draw.c
@@ -97,19 +97,20 @@ drawstatus()
 	int i, x;
 
 	dc.x = dc.y = 0;
-	dc.w = bw;
 
-	drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
-	dc.w = modew;
 	for(i = 0; i < ntags; i++) {
-		dc.x += dc.w;
 		dc.w = textw(tags[i]);
 		if(seltag[i])
 			drawtext(tags[i], dc.sel, sel && sel->tags[i]);
 		else
 			drawtext(tags[i], dc.norm, sel && sel->tags[i]);
+		dc.x += dc.w;
 	}
-	x = dc.x + dc.w + 1;
+
+	dc.w = bmw;
+	drawtext(arrange == dotile ? TILESYMBOL : FLOATSYMBOL, dc.status, False);
+
+	x = dc.x + dc.w;
 	dc.w = textw(stext);
 	dc.x = bx + bw - dc.w;
 	if(dc.x < x) {
@@ -118,9 +119,12 @@ drawstatus()
 	}
 	drawtext(stext, dc.status, False);
 
-	if(sel && ((dc.w = dc.x - x) > bh)) {
+	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
-		drawtext(sel->name, dc.sel, False);
+		if(sel)
+			drawtext(sel->name, dc.sel, False);
+		else
+			drawtext(NULL, dc.norm, False);
 	}
 	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);