removed getnext/getprev, redundant

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 935525f..6985dc7 100644 (file)
--- a/view.c
+++ b/view.c
@@ -8,7 +8,7 @@
 
 static Client *
 nexttiled(Client *c) {
-       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       for(; c && (c->isfloat || !isvisible(c)); c = c->next);
        return c;
 }
 
@@ -31,7 +31,7 @@ togglemax(Client *c) {
                c->w = c->rw;
                c->h = c->rh;
        }
-       resize(c, True, TopLeft);
+       resize(c, True);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
@@ -56,10 +56,11 @@ dofloat(void) {
 
        for(c = clients; c; c = c->next) {
                if(isvisible(c)) {
-                       resize(c, True, TopLeft);
+                       c->isbanned = False;
+                       resize(c, True);
                }
                else
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+                       ban(c);
        }
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
@@ -83,8 +84,9 @@ dotile(void) {
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
+                       c->isbanned = False;
                        if(c->isfloat) {
-                               resize(c, True, TopLeft);
+                               resize(c, True);
                                continue;
                        }
                        c->ismax = False;
@@ -98,18 +100,18 @@ dotile(void) {
                        else {  /* tile window */
                                c->x += mw;
                                c->w = tw - 2 * BORDERPX;
-                               if(th > bh) {
+                               if(th > 2 * BORDERPX) {
                                        c->y += (i - nmaster) * th;
                                        c->h = th - 2 * BORDERPX;
                                }
-                               else /* fallback if th < bh */
+                               else /* fallback if th <= 2 * BORDERPX */
                                        c->h = wah - 2 * BORDERPX;
                        }
-                       resize(c, False, TopLeft);
+                       resize(c, False);
                        i++;
                }
                else
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+                       ban(c);
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);
@@ -123,8 +125,9 @@ focusnext(Arg *arg) {
    
        if(!sel)
                return;
-       if(!(c = getnext(sel->next)))
-               c = getnext(clients);
+       for(c = sel->next; c && !isvisible(c); c = c->next);
+       if(!c)
+               for(c = clients; c && !isvisible(c); c = c->next);
        if(c) {
                focus(c);
                restack();
@@ -137,9 +140,10 @@ focusprev(Arg *arg) {
 
        if(!sel)
                return;
-       if(!(c = getprev(sel->prev))) {
+       for(c = sel->prev; c && !isvisible(c); c = c->prev);
+       if(!c) {
                for(c = clients; c && c->next; c = c->next);
-               c = getprev(c);
+               for(; c && !isvisible(c); c = c->prev);
        }
        if(c) {
                focus(c);
@@ -149,7 +153,8 @@ focusprev(Arg *arg) {
 
 void
 incnmaster(Arg *arg) {
-       if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+       if((arrange == dofloat) || (nmaster + arg->i < 1)
+       || (wah / (nmaster + arg->i) <= 2 * BORDERPX))
                return;
        nmaster += arg->i;
        if(sel)
@@ -173,7 +178,8 @@ resizemaster(Arg *arg) {
        if(arg->i == 0)
                master = MASTER;
        else {
-               if(master + arg->i > 950 || master + arg->i < 50)
+               if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
+               || waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
                        return;
                master += arg->i;
        }
@@ -185,10 +191,9 @@ restack(void) {
        Client *c;
        XEvent ev;
 
-       if(!sel) {
-               drawstatus();
+       drawstatus();
+       if(!sel)
                return;
-       }
        if(sel->isfloat || arrange == dofloat)
                XRaiseWindow(dpy, sel->win);
        if(arrange != dofloat) {
@@ -200,14 +205,13 @@ restack(void) {
                        XLowerWindow(dpy, c->win);
                }
        }
-       drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
 togglefloat(Arg *arg) {
-       if (!sel || arrange == dofloat)
+       if(!sel || arrange == dofloat)
                return;
        sel->isfloat = !sel->isfloat;
        arrange();