introduced tile.c, some refactoring of functions

[dwm.git] / view.c

diff --git a/view.c b/view.c
index ffa22a1..72aa04e 100644 (file)
--- a/view.c
+++ b/view.c
@@ -3,37 +3,6 @@
  */
 #include "dwm.h"
 
-/* static */
-
-static Client *
-nexttiled(Client *c) {
-       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
-       return c;
-}
-
-static void
-togglemax(Client *c) {
-       XEvent ev;
-               
-       if(c->isfixed)
-               return;
-
-       if((c->ismax = !c->ismax)) {
-               c->rx = c->x; c->x = wax;
-               c->ry = c->y; c->y = way;
-               c->rw = c->w; c->w = waw - 2 * BORDERPX;
-               c->rh = c->h; c->h = wah - 2 * BORDERPX;
-       }
-       else {
-               c->x = c->rx;
-               c->y = c->ry;
-               c->w = c->rw;
-               c->h = c->rh;
-       }
-       resize(c, True, TopLeft);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
 /* extern */
 
 void (*arrange)(void) = DEFMODE;
@@ -55,61 +24,16 @@ dofloat(void) {
 
        for(c = clients; c; c = c->next) {
                if(isvisible(c)) {
-                       resize(c, True, TopLeft);
+                       if(c->isbanned)
+                               XMoveWindow(dpy, c->win, c->x, c->y);
+                       c->isbanned = False;
+                       resize(c, c->x, c->y, c->w, c->h, True);
                }
-               else
-                       ban(c);
-       }
-       if(!sel || !isvisible(sel)) {
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
-       }
-       restack();
-}
-
-void
-dotile(void) {
-       unsigned int i, n, mw, mh, tw, th;
-       Client *c;
-
-       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;
-       th = (n > nmaster) ? wah / (n - nmaster) : 0;
-
-       for(i = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       if(c->isfloat) {
-                               resize(c, True, TopLeft);
-                               continue;
-                       }
-                       c->ismax = False;
-                       c->x = wax;
-                       c->y = way;
-                       if(i < nmaster) {
-                               c->y += i * mh;
-                               c->w = mw - 2 * BORDERPX;
-                               c->h = mh - 2 * BORDERPX;
-                       }
-                       else {  /* tile window */
-                               c->x += mw;
-                               c->w = tw - 2 * BORDERPX;
-                               if(th > bh) {
-                                       c->y += (i - nmaster) * th;
-                                       c->h = th - 2 * BORDERPX;
-                               }
-                               else /* fallback if th < bh */
-                                       c->h = wah - 2 * BORDERPX;
-                       }
-                       resize(c, False, TopLeft);
-                       i++;
+               else {
+                       c->isbanned = True;
+                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
                }
-               else
-                       ban(c);
-
+       }
        if(!sel || !isvisible(sel)) {
                for(c = stack; c && !isvisible(c); c = c->snext);
                focus(c);
@@ -123,8 +47,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 +62,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);
@@ -147,14 +73,6 @@ focusprev(Arg *arg) {
        }
 }
 
-void
-incnmaster(Arg *arg) {
-       if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
-               return;
-       nmaster += arg->i;
-       arrange();
-}
-
 Bool
 isvisible(Client *c) {
        unsigned int i;
@@ -165,16 +83,10 @@ isvisible(Client *c) {
        return False;
 }
 
-void
-resizemaster(Arg *arg) {
-       if(arg->i == 0)
-               master = MASTER;
-       else {
-               if(master + arg->i > 950 || master + arg->i < 50)
-                       return;
-               master += arg->i;
-       }
-       arrange();
+Client *
+nextmanaged(Client *c) {
+       for(; c && (c->isfloat || !isvisible(c)); c = c->next);
+       return c;
 }
 
 void
@@ -182,34 +94,27 @@ restack(void) {
        Client *c;
        XEvent ev;
 
-       if(!sel) {
-               drawstatus();
+       drawstatus();
+       if(!sel)
                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)) {
+               for(c = nextmanaged(clients); c; c = nextmanaged(c->next)) {
                        if(c == sel)
                                continue;
-                       XLowerWindow(dpy, c->twin);
                        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();
@@ -246,28 +151,3 @@ view(Arg *arg) {
        arrange();
 }
 
-void
-zoom(Arg *arg) {
-       unsigned int n;
-       Client *c;
-
-       if(!sel)
-               return;
-       if(sel->isfloat || (arrange == dofloat)) {
-               togglemax(sel);
-               return;
-       }
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-
-       c = sel;
-       if(arrange != dofloat) {
-               detach(c);
-               if(clients)
-                       clients->prev = c;
-               c->next = clients;
-               clients = c;
-               focus(c);
-               arrange();
-       }
-}