removed getnext/getprev, redundant

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 29b6b63..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;
 }
 
@@ -56,10 +56,11 @@ dofloat(void) {
 
        for(c = clients; c; c = c->next) {
                if(isvisible(c)) {
+                       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,6 +84,7 @@ dotile(void) {
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
+                       c->isbanned = False;
                        if(c->isfloat) {
                                resize(c, True);
                                continue;
@@ -109,7 +111,7 @@ dotile(void) {
                        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);
@@ -150,7 +154,7 @@ focusprev(Arg *arg) {
 void
 incnmaster(Arg *arg) {
        if((arrange == dofloat) || (nmaster + arg->i < 1)
-               || (wah / (nmaster + arg->i) <= 2 * BORDERPX))
+       || (wah / (nmaster + arg->i) <= 2 * BORDERPX))
                return;
        nmaster += arg->i;
        if(sel)
@@ -175,7 +179,7 @@ resizemaster(Arg *arg) {
                master = MASTER;
        else {
                if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
-                       || waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
+               || waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
                        return;
                master += arg->i;
        }
@@ -207,7 +211,7 @@ restack(void) {
 
 void
 togglefloat(Arg *arg) {
-       if (!sel || arrange == dofloat)
+       if(!sel || arrange == dofloat)
                return;
        sel->isfloat = !sel->isfloat;
        arrange();