Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
removed spow(x, 0); calls, I did them for consistency's sake, but it should be rather...
[dwm.git] / layout.c
diff --git a/layout.c b/layout.c
index 259f489..7a7abae 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -1,7 +1,6 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include "dwm.h"
+#include <stdio.h>
 #include <stdlib.h>
 
 unsigned int blw = 0;
 #include <stdlib.h>
 
 unsigned int blw = 0;
@@ -9,89 +8,139 @@ Layout *lt = NULL;
 
 /* static */
 
 
 /* static */
 
+static double hratio = HRATIO;
+static double vratio = VRATIO;
 static unsigned int nlayouts = 0;
 static unsigned int nlayouts = 0;
-static unsigned int masterw = MASTERWIDTH;
 static unsigned int nmaster = NMASTER;
 
 static unsigned int nmaster = NMASTER;
 
+static double /* simple pow() */
+spow(double x, double y)
+{
+       if(y == 0)
+               return 1;
+       while(--y)
+               x *= x;
+       return x;
+}
+
 static void
 tile(void) {
 static void
 tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th, remainder;
+       Bool mmaxtile = False, smaxtile = False; /* fallback tiling */
+       double mscale = 0, sscale = 0, sum = 0;
+       unsigned int i, n, nx, ny, nw, nh, mw, tw;
        Client *c;
 
        Client *c;
 
+       /* preparation */
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
        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;
-       remainder = (n > nmaster) ? wah - th * (n - nmaster) : 0;
+       nx = wax;
+       ny = way;
+       mw = (n <= nmaster) ? waw :  waw / (1 + hratio);
        tw = waw - mw;
        tw = waw - mw;
-
+       if(n > 0) {
+               if(n <= nmaster) {
+                       for(i = 0; i < n; i++)
+                               sum += spow(vratio, i);
+                       mscale = wah / sum;
+                       if(vratio >= 1)
+                               mmaxtile = bh > mscale;
+                       else
+                               mmaxtile = bh > (mscale * spow(vratio, n - 1));
+               }
+               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);
+                       sscale = wah / sum;
+                       if(vratio >= 1) {
+                               mmaxtile = bh > mscale;
+                               smaxtile = bh > sscale;
+                       }
+                       else {
+                               mmaxtile = bh > (mscale * spow(vratio, nmaster - 1));
+                               smaxtile = bh > (sscale * spow(vratio, n - nmaster - 1));
+                       }
+               }
+       }
+       /* tiling */
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
-                       if(c->isbanned)
-                               XMoveWindow(dpy, c->win, c->x, c->y);
-                       c->isbanned = False;
+                       unban(c);
                        if(c->isfloating)
                                continue;
                        c->ismax = False;
                        if(c->isfloating)
                                continue;
                        c->ismax = False;
-                       nx = wax;
-                       ny = way;
-                       if(i < nmaster) {
-                               ny += i * mh;
+                       if(i < nmaster) { /* master window */
                                nw = mw - 2 * c->border;
                                nw = mw - 2 * c->border;
-                               nh = mh - 2 * c->border;
+                               if(mmaxtile) {
+                                       ny = way;
+                                       nh = wah - 2 * c->border;
+                               }
+                               else if(i + 1 == (n < nmaster ? n : nmaster))
+                                       nh = (way + wah) - ny - 2 * c->border;
+                               else
+                                       nh = (mscale * spow(vratio, i)) - 2 * c->border;
                        }
                        }
-                       else {  /* tile window */
-                               nx += mw;
+                       else { /* tile window */
                                nw = tw - 2 * c->border;
                                nw = tw - 2 * c->border;
-                               if(th > 2 * c->border) {
-                                       ny += (i - nmaster) * th;
-                                       nh = th - 2 * c->border;
-                                       if (i == n - 1)
-                                               nh += remainder;
+                               if(i == nmaster) {
+                                       ny = way;
+                                       nx = wax + mw;
                                }
                                }
-                               else /* fallback if th <= 2 * c->border */
+                               if(smaxtile) {
+                                       ny = way;
                                        nh = wah - 2 * c->border;
                                        nh = wah - 2 * c->border;
+                               }
+                               else if(i + 1 == n)
+                                       nh = (way + wah) - ny - 2 * c->border;
+                               else
+                                       nh = (sscale * spow(vratio, i - nmaster)) - 2 * c->border;
                        }
                        resize(c, nx, ny, nw, nh, False);
                        }
                        resize(c, nx, ny, nw, nh, False);
+                       ny += nh;
                        i++;
                }
                        i++;
                }
-               else {
-                       c->isbanned = True;
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-               }
-       if(!sel || !isvisible(sel)) {
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
-       }
+               else
+                       ban(c);
+       focus(NULL);
        restack();
 }
 
 LAYOUTS
 
        restack();
 }
 
 LAYOUTS
 
+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();
+}
+
 /* extern */
 
 void
 floating(void) {
        Client *c;
 
 /* extern */
 
 void
 floating(void) {
        Client *c;
 
-       for(c = clients; c; c = c->next) {
+       for(c = clients; c; c = c->next)
                if(isvisible(c)) {
                if(isvisible(c)) {
-                       if(c->isbanned)
-                               XMoveWindow(dpy, c->win, c->x, c->y);
-                       c->isbanned = False;
+                       unban(c);
                        resize(c, c->x, c->y, c->w, c->h, True);
                }
                        resize(c, c->x, c->y, c->w, c->h, True);
                }
-               else {
-                       c->isbanned = True;
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-               }
-       }
-       if(!sel || !isvisible(sel)) {
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
-       }
+               else
+                       ban(c);
+       focus(NULL);
        restack();
 }
 
        restack();
 }
 
@@ -120,20 +169,13 @@ focusclient(const char *arg) {
 }
 
 void
 }
 
 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();
+inchratio(const char *arg) {
+       incratio(arg, &hratio, HRATIO);
+}
+
+void
+incvratio(const char *arg) {
+       incratio(arg, &vratio, VRATIO);
 }
 
 void
 }
 
 void
@@ -178,6 +220,7 @@ void
 restack(void) {
        Client *c;
        XEvent ev;
 restack(void) {
        Client *c;
        XEvent ev;
+       XWindowChanges wc;
 
        drawstatus();
        if(!sel)
 
        drawstatus();
        if(!sel)
@@ -185,12 +228,17 @@ restack(void) {
        if(sel->isfloating || lt->arrange == floating)
                XRaiseWindow(dpy, sel->win);
        if(lt->arrange != floating) {
        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;
                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);
                }
        }
        XSync(dpy, False);
@@ -202,11 +250,9 @@ setlayout(const char *arg) {
        int i;
 
        if(!arg) {
        int i;
 
        if(!arg) {
-               for(i = 0; i < nlayouts && lt != &layout[i]; i++);
-               if(i == nlayouts - 1)
-                       lt = &layout[0];
-               else
-                       lt = &layout[++i];
+               lt++;
+               if(lt == layout + nlayouts)
+                       lt = layout;
        }
        else {
                i = atoi(arg);
        }
        else {
                i = atoi(arg);
@@ -220,6 +266,16 @@ setlayout(const char *arg) {
                drawstatus();
 }
 
                drawstatus();
 }
 
+void
+togglebar(const char *arg) {
+       if(bpos == BarOff)
+               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+       else
+               bpos = BarOff;
+       updatebarpos();
+       lt->arrange();
+}
+
 void
 togglemax(const char *arg) {
        XEvent ev;
 void
 togglemax(const char *arg) {
        XEvent ev;
@@ -231,7 +287,7 @@ togglemax(const char *arg) {
                sel->ry = sel->y;
                sel->rw = sel->w;
                sel->rh = sel->h;
                sel->ry = sel->y;
                sel->rw = sel->w;
                sel->rh = sel->h;
-               resize(sel, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
+               resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
        }
        else
                resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
        }
        else
                resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
@@ -241,13 +297,10 @@ togglemax(const char *arg) {
 
 void
 zoom(const char *arg) {
 
 void
 zoom(const char *arg) {
-       unsigned int n;
        Client *c;
 
        Client *c;
 
-       if(!sel || lt->arrange != tile || sel->isfloating)
+       if(!sel || lt->arrange == floating || sel->isfloating)
                return;
                return;
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;