X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=b8b6c1db6378ff145693506edfb6bfd76f445142;hb=7b6d5ff29863e4bc7ba787357133ffb9bc5157e6;hp=7da24f25f83890313f36b9986dba986f282af259;hpb=9f35cc52fe27f694ce146356e6c71267ecd19217;p=dwm.git

diff --git a/draw.c b/draw.c
index 7da24f2..b8b6c1d 100644
--- a/draw.c
+++ b/draw.c
@@ -94,27 +94,23 @@ drawall()
 void
 drawstatus()
 {
-	static const char *mode[] = { "~", "|" };
 	int i, x;
 
 	dc.x = dc.y = 0;
-	dc.w = bw;
 
-	if(!modew)
-		modew = textw(mode[0]) > textw(mode[1]) ? textw(mode[0]) : textw(mode[1]);
-	drawtext(mode[arrange == dotile ? 1 : 0], dc.status, False);
-
-	dc.w = 0;
-	dc.x = 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) {
@@ -123,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);
@@ -134,8 +133,6 @@ drawstatus()
 void
 drawtitle(Client *c)
 {
-	int i;
-
 	if(c == sel && issel) {
 		drawstatus();
 		XUnmapWindow(dpy, c->twin);