X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/9f35cc52fe27f694ce146356e6c71267ecd19217..bda53ac6ad834824e8e5d5678ccd638a122c173a:/draw.c

diff --git a/draw.c b/draw.c
index 7da24f2..e8ee08d 100644
--- a/draw.c
+++ b/draw.c
@@ -10,8 +10,7 @@
 /* static */
 
 static unsigned int
-textnw(const char *text, unsigned int len)
-{
+textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -22,8 +21,7 @@ textnw(const char *text, unsigned int len)
 }
 
 static void
-drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
-{
+drawtext(const char *text, unsigned long col[ColLast], Bool highlight) {
 	int x, y, w, h;
 	static char buf[256];
 	unsigned int len, olen;
@@ -82,8 +80,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool highlight)
 /* extern */
 
 void
-drawall()
-{
+drawall() {
 	Client *c;
 
 	for(c = clients; c; c = getnext(c->next))
@@ -92,29 +89,24 @@ drawall()
 }
 
 void
-drawstatus()
-{
-	static const char *mode[] = { "~", "|" };
+drawstatus() {
 	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,19 +115,19 @@ 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);
 }
 
 void
-drawtitle(Client *c)
-{
-	int i;
-
+drawtitle(Client *c) {
 	if(c == sel && issel) {
 		drawstatus();
 		XUnmapWindow(dpy, c->twin);
@@ -153,8 +145,7 @@ drawtitle(Client *c)
 }
 
 unsigned long
-getcolor(const char *colstr)
-{
+getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 
@@ -163,8 +154,7 @@ getcolor(const char *colstr)
 }
 
 void
-setfont(const char *fontstr)
-{
+setfont(const char *fontstr) {
 	char **missing, *def;
 	int i, n;
 
@@ -214,7 +204,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
-textw(const char *text)
-{
+textw(const char *text) {
 	return textnw(text, strlen(text)) + dc.font.height;
 }