X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=layout.c;h=eb64a3332a95aa4146160325b3259f3b6fa47c90;hb=b5eea45a316a897632578a74c909aa336557b1d6;hp=5bb6e97348593facf5473ca4737575298580a7a2;hpb=5ad2828c579937afc3dc6da9987587e0eb2473dc;p=dwm.git diff --git a/layout.c b/layout.c index 5bb6e97..eb64a33 100644 --- a/layout.c +++ b/layout.c @@ -1,7 +1,6 @@ -/* © 2006-2007 Anselm R. Garbe - * © 2006-2007 Sander van Dijk - * See LICENSE file for license details. */ +/* See LICENSE file for copyright and license details. */ #include "dwm.h" +#include #include unsigned int blw = 0; @@ -10,84 +9,26 @@ 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, remainder; - 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; - remainder = (n > nmaster) ? wah - th * (n - nmaster) : 0; - tw = waw - mw; - - 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; - if(c->isfloating) - continue; - c->ismax = False; - nx = wax; - ny = way; - if(i < nmaster) { - ny += i * mh; - nw = mw - 2 * c->border; - nh = mh - 2 * c->border; - } - else { /* tile window */ - nx += mw; - 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; - } - else /* fallback if th <= 2 * c->border */ - nh = wah - 2 * c->border; - } - resize(c, nx, ny, nw, nh, False); - i++; - } - else { - c->isbanned = True; - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - } - if(!sel || !isvisible(sel)) - focustopvisible(); - restack(); -} LAYOUTS /* extern */ void -floating(void) { +floating(const char *arg) { Client *c; - for(c = clients; c; c = c->next) { + if(lt->arrange != floating) + return; + + 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 { - c->isbanned = True; - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - } - } - if(!sel || !isvisible(sel)) - focustopvisible(); + else + ban(c); + focus(NULL); restack(); } @@ -116,42 +57,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; @@ -174,6 +79,7 @@ void restack(void) { Client *c; XEvent ev; + XWindowChanges wc; drawstatus(); if(!sel) @@ -181,12 +87,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); @@ -198,11 +109,9 @@ setlayout(const char *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); @@ -211,21 +120,78 @@ setlayout(const char *arg) { lt = &layout[i]; } if(sel) - lt->arrange(); + lt->arrange(NULL); else drawstatus(); } void -togglebar(const char *arg) { - if(bpos == BarOff) { - if((bpos = BARPOS) == BarOff) - bpos = BarTop; +tile(const char *arg) { + static double master = MASTER; + double delta; + unsigned int i, n, nx, ny, nw, nh, mw, th; + Client *c; + + if(lt->arrange != tile) + return; + + /* arg handling, manipulate master */ + if(arg && (1 == sscanf(arg, "%lf", &delta))) { + if(delta + master > 0.1 && delta + master < 0.9) + master += delta; } + + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) + n++; + + /* window geoms */ + mw = (n == 1) ? waw : master * waw; + th = (n > 1) ? wah / (n - 1) : 0; + if(n > 1 && th < bh) + th = wah; + + 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 == 0) { /* master */ + nw = mw - 2 * c->border; + nh = wah - 2 * c->border; + } + else { /* tile window */ + if(i == 1) { + ny = way; + nx += mw; + } + nw = waw - mw - 2 * c->border; + if(i + 1 == n) /* remainder */ + nh = (way + wah) - ny - 2 * c->border; + else + nh = th - 2 * c->border; + } + resize(c, nx, ny, nw, nh, False); + if(n > 1 && th != wah) + ny += nh + 2 * c->border; + i++; + } + else + ban(c); + focus(NULL); + restack(); +} + +void +togglebar(const char *arg) { + if(bpos == BarOff) + bpos = (BARPOS == BarOff) ? BarTop : BARPOS; else bpos = BarOff; updatebarpos(); - lt->arrange(); + lt->arrange(NULL); } void @@ -239,7 +205,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); @@ -251,7 +217,7 @@ void zoom(const char *arg) { Client *c; - if(!sel || lt->arrange != tile || sel->isfloating) + if(!sel || lt->arrange == floating || sel->isfloating) return; if((c = sel) == nexttiled(clients)) if(!(c = nexttiled(c->next))) @@ -259,5 +225,5 @@ zoom(const char *arg) { detach(c); attach(c); focus(c); - lt->arrange(); + lt->arrange(NULL); }