moved floating to layout.c, kept tile.c outside

[dwm.git] / layout.c

diff --git a/layout.c b/layout.c
index acf0a8e..fe12e1e 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -8,59 +8,6 @@ Layout *lt = NULL;
 /* static */
 
 static unsigned int nlayouts = 0;
-static unsigned int masterw = MASTERWIDTH;
-static unsigned int nmaster = NMASTER;
-
-static void
-tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
-       Client *c;
-
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-       /* window geoms */
-       mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-       mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
-       th = (n > nmaster) ? wah / (n - nmaster) : 0;
-       tw = waw - mw;
-
-       for(i = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       unban(c);
-                       if(c->isfloating)
-                               continue;
-                       c->ismax = False;
-                       nx = wax;
-                       ny = way;
-                       if(i < nmaster) {
-                               ny += i * mh;
-                               nw = mw - 2 * c->border;
-                               nh = mh;
-                               if(i + 1 == (n < nmaster ? n : nmaster)) /* remainder */
-                                       nh = wah - mh * i;
-                               nh -= 2 * c->border;
-                       }
-                       else {  /* tile window */
-                               nx += mw;
-                               nw = tw - 2 * c->border;
-                               if(th > 2 * c->border) {
-                                       ny += (i - nmaster) * th;
-                                       nh = th;
-                                       if(i + 1 == n) /* remainder */
-                                               nh = wah - th * (i - nmaster);
-                                       nh -= 2 * c->border;
-                               }
-                               else /* fallback if th <= 2 * c->border */
-                                       nh = wah - 2 * c->border;
-                       }
-                       resize(c, nx, ny, nw, nh, False);
-                       i++;
-               }
-               else
-                       ban(c);
-       focus(NULL);
-       restack();
-}
 
 LAYOUTS
 
@@ -70,6 +17,9 @@ void
 floating(void) {
        Client *c;
 
+       if(lt->arrange != floating)
+               return;
+
        for(c = clients; c; c = c->next)
                if(isvisible(c)) {
                        unban(c);
@@ -106,42 +56,6 @@ focusclient(const char *arg) {
 }
 
 void
-incmasterw(const char *arg) {
-       int i;
-       if(lt->arrange != tile)
-               return;
-       if(!arg)
-               masterw = MASTERWIDTH;
-       else {
-               i = atoi(arg);
-               if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX 
-               || waw * (masterw + i) / 1000 <= 2 * BORDERPX)
-                       return;
-               masterw += i;
-       }
-       lt->arrange();
-}
-
-void
-incnmaster(const char *arg) {
-       int i;
-
-       if(!arg)
-               nmaster = NMASTER;
-       else {
-               i = atoi(arg);
-               if((lt->arrange != tile) || (nmaster + i < 1)
-               || (wah / (nmaster + i) <= 2 * BORDERPX))
-                       return;
-               nmaster += i;
-       }
-       if(sel)
-               lt->arrange();
-       else
-               drawstatus();
-}
-
-void
 initlayouts(void) {
        unsigned int i, w;
 
@@ -164,6 +78,7 @@ void
 restack(void) {
        Client *c;
        XEvent ev;
+       XWindowChanges wc;
 
        drawstatus();
        if(!sel)
@@ -171,12 +86,17 @@ restack(void) {
        if(sel->isfloating || lt->arrange == floating)
                XRaiseWindow(dpy, sel->win);
        if(lt->arrange != floating) {
-               if(!sel->isfloating)
-                       XLowerWindow(dpy, sel->win);
+               wc.stack_mode = Below;
+               wc.sibling = barwin;
+               if(!sel->isfloating) {
+                       XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = sel->win;
+               }
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
                                continue;
-                       XLowerWindow(dpy, c->win);
+                       XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = c->win;
                }
        }
        XSync(dpy, False);
@@ -232,18 +152,3 @@ togglemax(const char *arg) {
        drawstatus();
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
-
-void
-zoom(const char *arg) {
-       Client *c;
-
-       if(!sel || lt->arrange == floating || sel->isfloating)
-               return;
-       if((c = sel) == nexttiled(clients))
-               if(!(c = nexttiled(c->next)))
-                       return;
-       detach(c);
-       attach(c);
-       focus(c);
-       lt->arrange();
-}