implemented nmaster appearance in mode label (using %u)

diff --git a/config.arg.h b/config.arg.h
index aa3c0c9148d140d47bcbc1151fb38104bc8ccaa6..b87c9dc4de794016fb3725866a61b339ac80a32d 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -7,7 +7,7 @@ const char *tags[] = { "home", "net", "www", "mon", "fnord", NULL };
 
 #define DEFMODE                        dotile          /* dofloat */
 #define FLOATSYMBOL            "><>"
-#define TILESYMBOL             "[]="
+#define TILESYMBOL             "[%u]="
 
 #define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
 #define NORMBGCOLOR            "#111111"

diff --git a/config.default.h b/config.default.h
index 348ab613ff330722ca4fbf1d11c94279ba51aaf2..174be3fee9519789465fedff8359b13606d1729c 100644 (file)
--- a/config.default.h
+++ b/config.default.h
@@ -7,7 +7,7 @@ const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 
 #define DEFMODE                        dotile /* dofloat */
 #define FLOATSYMBOL            "><>"
-#define TILESYMBOL             "[]="
+#define TILESYMBOL             "[%u]="
 
 #define FONT                   "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
 #define NORMBGCOLOR            "#333366"

diff --git a/config.mk b/config.mk
index 1d73f2be90eb5773fd82cba579892876158c9364..4a498ca9f2f5cec71ca4f5b284b447e183b34e44 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 2.9
+VERSION = 3.0
 
 # Customize below to fit your system
 

diff --git a/draw.c b/draw.c
index 9a469f9e755381b3a508cb2457cdf5c1d450ae0a..fe73867a1d39ced4f3f656c8a22b48bb5df60d2c 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -120,7 +120,7 @@ drawstatus(void) {
                dc.x += dc.w;
        }
        dc.w = bmw;
-       drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False, False);
+       drawtext(mtext, dc.status, False, False);
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = bw - dc.w;

diff --git a/dwm.h b/dwm.h
index f9291816687fde91ad65c6342e089615fa72e78a..68b3e366a28e42bb3053fec9669c09c955fa55c7 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -93,6 +93,7 @@ struct Client {
 
 extern const char *tags[];                     /* all tags */
 extern char stext[1024];                       /* status text */
+extern char mtext[32];                         /* mode text */
 extern int bx, by, bw, bh, bmw;                        /* bar geometry, bar mode label width */
 extern int screen, sx, sy, sw, sh;             /* screen geometry */
 extern int wax, way, wah, waw;                 /* windowarea geometry */

diff --git a/main.c b/main.c
index da209a9640ab18ef90a987cf7922aebc529f1af0..c080adae930e99bd37c6f59cf60eddc95ca80dbc 100644 (file)
--- a/main.c
+++ b/main.c
@@ -17,7 +17,7 @@
 
 /* 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, nmaster, ntags, numlockmask;
@@ -128,12 +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;

diff --git a/view.c b/view.c
index f2e4040ddb3e37099cd3a25d4047a18a9c3406a1..2f2d42a2cde19d27946491e210d8b12b49f11157 100644 (file)
--- a/view.c
+++ b/view.c
@@ -2,6 +2,7 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
+#include <stdio.h>
 
 /* static */
 
@@ -149,10 +150,15 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-       if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+       if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
                return;
        nmaster += arg->i;
-       arrange();
+       snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+       bmw = textw(mtext);
+       if(sel)
+               arrange();
+       else
+               drawstatus();
 }
 
 Bool
@@ -218,6 +224,8 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
+       snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+       bmw = textw(mtext);
        if(sel)
                arrange();
        else