X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/ac24f132dba7e59d9d9ff98d984f5e0b0d20fd09..d108cfa7fc47000af49e70a49e865b9eb236c57d:/main.c

diff --git a/main.c b/main.c
index c3526aa..ba5e2e0 100644
--- a/main.c
+++ b/main.c
@@ -17,10 +17,10 @@
 
 /* extern */
 
-char stext[1024];
+char stext[1024], mtext[32];
 Bool *seltag;
 int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
-unsigned int master, ntags, numlockmask;
+unsigned int master, nmaster, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
@@ -40,9 +40,9 @@ static Bool otherwm, readin;
 static void
 cleanup(void) {
 	close(STDIN_FILENO);
-	while(clients) {
-		resize(clients, True, TopLeft);
-		unmanage(clients);
+	while(stack) {
+		resize(stack, True, TopLeft);
+		unmanage(stack);
 	}
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
@@ -128,11 +128,12 @@ setup(void) {
 	dc.status[ColFG] = getcolor(STATUSFGCOLOR);
 	setfont(FONT);
 	/* geometry */
-	bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ?  textw(TILESYMBOL) : textw(FLOATSYMBOL);
 	sx = sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	master = MASTER;
+	nmaster = NMASTER;
+	updatemodetext();
 	/* bar */
 	bx = sx;
 	by = sy;