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

[dwm.git] / layout.c

diff --git a/layout.c b/layout.c
index fa7b4eb..fe12e1e 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -1,6 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include "dwm.h"
-#include <stdio.h>
 #include <stdlib.h>
 
 unsigned int blw = 0;
@@ -8,105 +7,7 @@ Layout *lt = NULL;
 
 /* static */
 
-static double hratio = HRATIO;
-static double vratio = VRATIO;
 static unsigned int nlayouts = 0;
-static unsigned int nmaster = NMASTER;
-
-static void
-incratio(const char *arg, double *ratio, double def) {
-       double delta;
-
-       if(lt->arrange != tile)
-               return;
-       if(!arg)
-               *ratio = def;
-       else {
-               if(1 == sscanf(arg, "%lf", &delta)) {
-                       if(delta + (*ratio) < .1 || delta + (*ratio) > 1.9)
-                               return;
-                       *ratio += delta;
-               }
-       }
-       lt->arrange();
-}
-
-static double /* simple pow() */
-spow(double x, double y)
-{
-       if(y == 0)
-               return 1;
-       while(--y)
-               x *= x;
-       return x;
-}
-
-static void
-tile(void) {
-       double mscale = 0, tscale = 0, sum = 0;
-       unsigned int i, n, nx, ny, nw, nh, mw, tw;
-       Client *c;
-
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-
-       mw = (n <= nmaster) ? waw :  waw / (1 + hratio);
-       tw = waw - mw;
-
-       if(n > 0) {
-               if(n < nmaster) {
-                       for(i = 0; i < n; i++)
-                               sum += spow(vratio, i);
-                       mscale = wah / sum;
-               }
-               else {
-                       for(i = 0; i < nmaster; i++)
-                               sum += spow(vratio, i);
-                       mscale = wah / sum;
-                       for(sum = 0, i = 0; i < (n - nmaster); i++)
-                               sum += spow(vratio, i);
-                       tscale = wah / sum;
-               }
-       }
-       nx = wax;
-       ny = way;
-       for(i = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       unban(c);
-                       if(c->isfloating)
-                               continue;
-                       c->ismax = False;
-                       if(i < nmaster) { /* master window */
-                               nw = mw - 2 * c->border;
-                               if(i + 1 == n || i + 1 == nmaster)
-                                       nh = (way + wah) - ny - (2 * c->border);
-                               else
-                                       nh = (mscale * spow(vratio, i)) - (2 * c->border);
-                       }
-                       else { /* tile window */
-                               if(i == nmaster) {
-                                       ny = way;
-                                       nx = wax + mw;
-                               }
-                               nw = tw - 2 * c->border;
-                               if(i + 1 == n)
-                                       nh = (way + wah) - ny - (2 * c->border);
-                               else
-                                       nh = (tscale * spow(vratio, i - nmaster)) - (2 * c->border);
-                       }
-                       if(nh < bh) {
-                               nh = bh;
-                               ny = way + wah - nh;
-                       }
-                       resize(c, nx, ny, nw, nh, False);
-                       ny += nh;
-                       i++;
-               }
-               else
-                       ban(c);
-       focus(NULL);
-       restack();
-}
 
 LAYOUTS
 
@@ -116,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);
@@ -152,35 +56,6 @@ focusclient(const char *arg) {
 }
 
 void
-inchratio(const char *arg) {
-       incratio(arg, &hratio, HRATIO);
-}
-
-void
-incvratio(const char *arg) {
-       incratio(arg, &vratio, VRATIO);
-}
-
-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;
 
@@ -277,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();
-}