implemented nmaster appearance in mode label (using %u)

[dwm.git] / main.c

diff --git a/main.c b/main.c
index c3526aa..c080ada 100644 (file)
--- 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,13 @@ 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;
+       snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+       bmw = textw(mtext);
        /* bar */
        bx = sx;
        by = sy;