-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* 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 hratio = HRATIO;
+static double vratio = VRATIO;
static unsigned int nlayouts = 0;
-static unsigned int masterw = MASTERWIDTH;
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) {
- 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)) {
- if(c->isbanned)
- XMoveWindow(dpy, c->win, c->x, c->y);
- c->isbanned = False;
- if(c->isversatile)
+ unban(c);
+ if(c->isfloating)
continue;
c->ismax = False;
- nx = wax;
- ny = way;
- if(i < nmaster) {
- ny += i * mh;
- nw = mw - 2 * BORDERPX;
- nh = mh - 2 * BORDERPX;
+ if(i < nmaster) { /* master window */
+ nw = mw - 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;
- nw = tw - 2 * BORDERPX;
- if(th > 2 * BORDERPX) {
- ny += (i - nmaster) * th;
- nh = th - 2 * BORDERPX;
+ else { /* tile window */
+ nw = tw - 2 * c->border;
+ if(i == nmaster) {
+ ny = way;
+ nx = wax + mw;
+ }
+ if(smaxtile) {
+ ny = way;
+ nh = wah - 2 * c->border;
}
- else /* fallback if th <= 2 * BORDERPX */
- nh = wah - 2 * BORDERPX;
+ 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 {
- 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
-/* extern */
+static void
+incratio(const char *arg, double *ratio, double def) {
+ double delta;
-void
-focusnext(Arg arg) {
- Client *c;
-
- if(!sel)
+ if(lt->arrange != tile)
return;
- 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();
+ 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
-focusprev(Arg arg) {
+floating(void) {
Client *c;
- if(!sel)
+ for(c = clients; c; c = c->next)
+ if(isvisible(c)) {
+ unban(c);
+ resize(c, c->x, c->y, c->w, c->h, True);
+ }
+ else
+ ban(c);
+ focus(NULL);
+ restack();
+}
+
+void
+focusclient(const char *arg) {
+ Client *c;
+
+ if(!sel || !arg)
return;
- 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(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);
}
if(c) {
focus(c);
}
void
-incmasterw(Arg arg) {
- if(lt->arrange != tile)
- return;
- if(arg.i == 0)
- masterw = MASTERWIDTH;
- else {
- if(waw * (masterw + arg.i) / 1000 >= waw - 2 * BORDERPX
- || waw * (masterw + arg.i) / 1000 <= 2 * BORDERPX)
- return;
- masterw += arg.i;
- }
- lt->arrange();
+inchratio(const char *arg) {
+ incratio(arg, &hratio, HRATIO);
}
void
-incnmaster(Arg arg) {
- if((lt->arrange != tile) || (nmaster + arg.i < 1)
- || (wah / (nmaster + arg.i) <= 2 * BORDERPX))
- return;
- nmaster += arg.i;
+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
Client *
nexttiled(Client *c) {
- for(; c && (c->isversatile || !isvisible(c)); c = c->next);
+ for(; c && (c->isfloating || !isvisible(c)); c = c->next);
return c;
}
restack(void) {
Client *c;
XEvent ev;
+ XWindowChanges wc;
drawstatus();
if(!sel)
return;
- if(sel->isversatile || lt->arrange == versatile)
+ if(sel->isfloating || lt->arrange == floating)
XRaiseWindow(dpy, sel->win);
- if(lt->arrange != versatile) {
- if(!sel->isversatile)
- XLowerWindow(dpy, sel->win);
+ if(lt->arrange != floating) {
+ 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);
}
void
-setlayout(Arg arg) {
- unsigned int i;
+setlayout(const char *arg) {
+ int i;
- if(arg.i == -1) {
- for(i = 0; i < nlayouts && lt != &layout[i]; i++);
- if(i == nlayouts - 1)
- lt = &layout[0];
- else
- lt = &layout[++i];
+ if(!arg) {
+ lt++;
+ if(lt == layout + nlayouts)
+ lt = layout;
}
else {
- if(arg.i < 0 || arg.i >= nlayouts)
+ i = atoi(arg);
+ if(i < 0 || i >= nlayouts)
return;
- lt = &layout[arg.i];
+ lt = &layout[i];
}
if(sel)
lt->arrange();
}
void
-togglemax(Arg arg) {
+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;
- if(!sel || (lt->arrange != versatile && !sel->isversatile) || sel->isfixed)
+ if(!sel || (lt->arrange != floating && !sel->isfloating) || sel->isfixed)
return;
if((sel->ismax = !sel->ismax)) {
sel->rx = sel->x;
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);
}
void
-versatile(void) {
- Client *c;
-
- for(c = clients; c; c = c->next) {
- if(isvisible(c)) {
- if(c->isbanned)
- XMoveWindow(dpy, c->win, c->x, c->y);
- c->isbanned = False;
- 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);
- }
- restack();
-}
-
-void
-zoom(Arg arg) {
- unsigned int n;
+zoom(const char *arg) {
Client *c;
- if(!sel || lt->arrange != tile || sel->isversatile)
+ if(!sel || lt->arrange == floating || sel->isfloating)
return;
- for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
- n++;
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
return;
Got questions, comments, patches, etc.? Contact Jason Woofenden