X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=20169175c99c1f3b5187edb8d03eb86c064a299a;hb=796925089cff58fbea4a1954cf0df57a6a648562;hp=2c3f5a234e0cbd4aaba2cd16e4bf04365b82d245;hpb=e1deda9e040c052af62aecc2fb4ee770fb2496a2;p=dwm.git diff --git a/layout.c b/layout.c index 2c3f5a2..2016917 100644 --- a/layout.c +++ b/layout.c @@ -1,8 +1,6 @@ -/* © 2006-2007 Anselm R. Garbe - * © 2006-2007 Sander van Dijk - * © 2007 Premysl Hruby - * See LICENSE file for license details. */ +/* See LICENSE file for copyright and license details. */ #include "dwm.h" +#include #include unsigned int blw = 0; @@ -10,69 +8,97 @@ Layout *lt = NULL; /* static */ +static double hratio = HRATIO; +static double vratio = VRATIO; static unsigned int nlayouts = 0; -static unsigned int masterw = MASTERWIDTH; static unsigned int nmaster = NMASTER; -static void -ban(Client *c) { - if (c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - c->isbanned = True; -} - -static void -unban(Client *c) { - if (!c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x, c->y); - c->isbanned = False; +static double /* simple pow() */ +spow(double x, double y) +{ + if(y == 0) + return 1; + while(--y) + x *= x; + return x; } static void tile(void) { - unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th; + 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; + /* preparation */ 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; + nx = wax; + ny = way; + 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; + if(vratio >= 1) + mmaxtile = bh > (mscale * spow(vratio, 0)); + 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 * spow(vratio, 0)); + smaxtile = bh > (sscale * spow(vratio, 0)); + } + 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)) { unban(c); 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; - nh = mh; - if(i + 1 == (n < nmaster ? n : nmaster)) /* remainder */ - nh = wah - mh * i; - nh -= 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; - 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; + if(i == nmaster) { + ny = way; + nx = wax + mw; } - else /* fallback if th <= 2 * c->border */ + if(smaxtile) { + ny = way; 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); + ny += nh; i++; } else @@ -83,6 +109,24 @@ tile(void) { 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 @@ -91,9 +135,7 @@ floating(void) { for(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); resize(c, c->x, c->y, c->w, c->h, True); } else @@ -127,20 +169,13 @@ 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(); +inchratio(const char *arg) { + incratio(arg, &hratio, HRATIO); +} + +void +incvratio(const char *arg) { + incratio(arg, &vratio, VRATIO); } void @@ -185,6 +220,7 @@ void restack(void) { Client *c; XEvent ev; + XWindowChanges wc; drawstatus(); if(!sel) @@ -192,12 +228,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); @@ -246,7 +287,7 @@ togglemax(const char *arg) { 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);