JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
applied Jukka Salmi's setmwfact patch
[dwm.git] / layout.c
index eeeb628..46e82c2 100644 (file)
--- a/layout.c
+++ b/layout.c
 /* See LICENSE file for copyright and license details. */
 #include "dwm.h"
-#include <stdio.h>
 #include <stdlib.h>
 
-unsigned int blw = 0;
-Layout *lt = NULL;
-
 /* static */
 
-static double ratio = RATIO;
-static unsigned int nlayouts = 0;
-static unsigned int nmaster = NMASTER;
+typedef struct {
+       const char *symbol;
+       void (*arrange)(void);
+} Layout;
 
-static double // simple pow()
-spow(double x, double y)
-{
-       if(y == 0)
-               return 1;
-       while(--y)
-               x *= x;
-       return x;
-}
+unsigned int blw = 0;
+static Layout *lt = NULL;
 
 static void
-tile(void) {
-       double mscale = 0, tscale = 0, sum = 0;
-       unsigned int i, n, nx, ny, nw, nh, mw, tw;
+floating(void) { /* default floating layout */
        Client *c;
 
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-
-       mw = (n <= nmaster) ? waw :  waw / (1 + ratio);
-       tw = waw - mw;
-
-       if(n > 0) {
-               if(n < nmaster) {
-                       for(i = 0; i < n; i++)
-                               sum += spow(ratio, i);
-                       mscale = wah / sum;
-               }
-               else {
-                       for(i = 0; i < nmaster; i++)
-                               sum += spow(ratio, i);
-                       mscale = wah / sum;
-                       for(sum = 0, i = 0; i < (n - nmaster); i++)
-                               sum += spow(ratio, 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(ratio, 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(ratio, 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();
+       for(c = clients; c; c = c->next)
+               if(isvisible(c))
+                       resize(c, c->x, c->y, c->w, c->h, True);
 }
 
+static unsigned int nlayouts = 0;
+
 LAYOUTS
 
 /* extern */
 
 void
-floating(void) {
+arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
-               if(isvisible(c)) {
+               if(isvisible(c))
                        unban(c);
-                       resize(c, c->x, c->y, c->w, c->h, True);
-               }
                else
                        ban(c);
+       lt->arrange();
        focus(NULL);
        restack();
 }
 
 void
-focusclient(const char *arg) {
+focusnext(const char *arg) {
        Client *c;
-   
-       if(!sel || !arg)
+
+       if(!sel)
                return;
-       if(atoi(arg) < 0) {
-               for(c = sel->prev; c && !isvisible(c); c = c->prev);
-               if(!c) {
-                       for(c = clients; c && c->next; c = c->next);
-                       for(; c && !isvisible(c); c = c->prev);
-               }
-       }
-       else {
-               for(c = sel->next; c && !isvisible(c); c = c->next);
-               if(!c)
-                       for(c = clients; c && !isvisible(c); c = c->next);
-       }
+       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();
@@ -133,50 +57,47 @@ focusclient(const char *arg) {
 }
 
 void
-incratio(const char *arg) {
-       double delta;
+focusprev(const char *arg) {
+       Client *c;
 
-       if(lt->arrange != tile)
+       if(!sel)
                return;
-       if(!arg)
-               ratio = RATIO;
-       else {
-               if(1 == sscanf(arg, "%lf", &delta)) {
-                       if(delta + ratio < .1 || delta + ratio > 1.9)
-                               return;
-                       ratio += delta;
-               }
+       for(c = sel->prev; c && !isvisible(c); c = c->prev);
+       if(!c) {
+               for(c = clients; c && c->next; c = c->next);
+               for(; c && !isvisible(c); c = c->prev);
+       }
+       if(c) {
+               focus(c);
+               restack();
        }
-       lt->arrange();
 }
 
-void
-incnmaster(const char *arg) {
-       int i;
+const char *
+getsymbol(void)
+{
+       return lt->symbol;
+}
 
-       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();
+Bool
+isfloating(void) {
+       return lt->arrange == floating;
+}
+
+Bool
+isarrange(void (*func)())
+{
+       return func == lt->arrange;
 }
 
 void
 initlayouts(void) {
        unsigned int i, w;
 
-       lt = &layout[0];
-       nlayouts = sizeof layout / sizeof layout[0];
+       lt = &layouts[0];
+       nlayouts = sizeof layouts / sizeof layouts[0];
        for(blw = i = 0; i < nlayouts; i++) {
-               w = textw(layout[i].symbol);
+               w = textw(layouts[i].symbol);
                if(w > blw)
                        blw = w;
        }
@@ -223,17 +144,17 @@ setlayout(const char *arg) {
 
        if(!arg) {
                lt++;
-               if(lt == layout + nlayouts)
-                       lt = layout;
+               if(lt == layouts + nlayouts)
+                       lt = layouts;
        }
        else {
                i = atoi(arg);
                if(i < 0 || i >= nlayouts)
                        return;
-               lt = &layout[i];
+               lt = &layouts[i];
        }
        if(sel)
-               lt->arrange();
+               arrange();
        else
                drawstatus();
 }
@@ -245,7 +166,7 @@ togglebar(const char *arg) {
        else
                bpos = BarOff;
        updatebarpos();
-       lt->arrange();
+       arrange();
 }
 
 void
@@ -266,18 +187,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();
-}