added comment to %u in config.default.h, added Button{4.5} support on mode label

[dwm.git] / view.c

diff --git a/view.c b/view.c
index f2e4040..06aed3e 100644 (file)
--- a/view.c
+++ b/view.c
@@ -2,6 +2,7 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

+#include <stdio.h>

 
 /* static */
 
 
 /* static */
 


@@ -149,10 +150,14 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(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;
                return;
        nmaster += arg->i;

-       arrange();
+       updatemodetext();
+       if(sel)
+               arrange();
+       else
+               drawstatus();

 }
 
 Bool
 }
 
 Bool


@@ -218,6 +223,7 @@ togglefloat(Arg *arg) {
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;

+       updatemodetext();

        if(sel)
                arrange();
        else
        if(sel)
                arrange();
        else


@@ -235,6 +241,12 @@ toggleview(Arg *arg) {
        arrange();
 }
 
        arrange();
 }
 

+void
+updatemodetext() {
+       snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+       bmw = textw(mtext);
+}
+

 void
 view(Arg *arg) {
        unsigned int i;
 void
 view(Arg *arg) {
        unsigned int i;