removed drawclient and drawall (they performed useless operations/consumed useless...

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 503f1c2..bc1f4e2 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 */
 
@@ -58,7 +59,7 @@ dofloat(void) {
                        resize(c, True, TopLeft);
                }
                else
-                       ban(c);
+                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        }
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
@@ -75,10 +76,10 @@ dotile(void) {
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
        /* window geoms */
-       mw = (n > nmaster) ? (waw * master) / 1000 : waw;
        mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-       tw = waw - mw;
+       mw = (n > nmaster) ? (waw * master) / 1000 : waw;
        th = (n > nmaster) ? wah / (n - nmaster) : 0;
+       tw = waw - mw;
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
@@ -108,8 +109,7 @@ dotile(void) {
                        i++;
                }
                else
-                       ban(c);
-
+                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);
@@ -149,10 +149,13 @@ 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();
+       if(sel)
+               arrange();
+       else
+               drawstatus();
 }
 
 Bool
@@ -186,23 +189,17 @@ restack(void) {
                drawstatus();
                return;
        }
-       if(sel->isfloat || arrange == dofloat) {
+       if(sel->isfloat || arrange == dofloat)
                XRaiseWindow(dpy, sel->win);
-               XRaiseWindow(dpy, sel->twin);
-       }
        if(arrange != dofloat) {
-               if(!sel->isfloat) {
-                       XLowerWindow(dpy, sel->twin);
+               if(!sel->isfloat)
                        XLowerWindow(dpy, sel->win);
-               }
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
                                continue;
-                       XLowerWindow(dpy, c->twin);
                        XLowerWindow(dpy, c->win);
                }
        }
-       drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
@@ -260,14 +257,14 @@ zoom(Arg *arg) {
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
 
-       c = sel;
-       if((arrange != dofloat) && c != nexttiled(clients)) {
-               detach(c);
-               if(clients)
-                       clients->prev = c;
-               c->next = clients;
-               clients = c;
-               focus(c);
-               arrange();
-       }
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))
+                       return;
+       detach(c);
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+       focus(c);
+       arrange();
 }