|
|
@ -1,5 +1,6 @@
|
|
|
|
/* See LICENSE file for copyright and license details. */
|
|
|
|
/* See LICENSE file for copyright and license details. */
|
|
|
|
#include "dwm.h"
|
|
|
|
#include "dwm.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
|
|
|
|
unsigned int blw = 0;
|
|
|
|
unsigned int blw = 0;
|
|
|
@ -7,53 +8,79 @@ Layout *lt = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
/* static */
|
|
|
|
/* static */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static double ratio = RATIO;
|
|
|
|
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
|
|
|
|
static void
|
|
|
|
tile(void) {
|
|
|
|
tile(void) {
|
|
|
|
unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
|
|
|
|
double mscale = 0, tscale = 0, sum = 0;
|
|
|
|
|
|
|
|
unsigned int i, n, nx, ny, nw, nh, mw, tw;
|
|
|
|
Client *c;
|
|
|
|
Client *c;
|
|
|
|
|
|
|
|
|
|
|
|
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
|
|
|
|
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
|
|
|
|
n++;
|
|
|
|
n++;
|
|
|
|
/* window geoms */
|
|
|
|
|
|
|
|
mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
|
|
|
|
mw = (n <= nmaster) ? waw : waw / (1 + ratio);
|
|
|
|
mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
|
|
|
|
|
|
|
|
th = (n > nmaster) ? wah / (n - nmaster) : 0;
|
|
|
|
|
|
|
|
tw = waw - mw;
|
|
|
|
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)
|
|
|
|
for(i = 0, c = clients; c; c = c->next)
|
|
|
|
if(isvisible(c)) {
|
|
|
|
if(isvisible(c)) {
|
|
|
|
unban(c);
|
|
|
|
unban(c);
|
|
|
|
if(c->isfloating)
|
|
|
|
if(c->isfloating)
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
c->ismax = False;
|
|
|
|
c->ismax = False;
|
|
|
|
nx = wax;
|
|
|
|
if(i < nmaster) { /* master window */
|
|
|
|
ny = way;
|
|
|
|
|
|
|
|
if(i < nmaster) {
|
|
|
|
|
|
|
|
ny += i * mh;
|
|
|
|
|
|
|
|
nw = mw - 2 * c->border;
|
|
|
|
nw = mw - 2 * c->border;
|
|
|
|
nh = mh;
|
|
|
|
if(i + 1 == n || i + 1 == nmaster)
|
|
|
|
if(i + 1 == (n < nmaster ? n : nmaster)) /* remainder */
|
|
|
|
nh = (way + wah) - ny - (2 * c->border);
|
|
|
|
nh = wah - mh * i;
|
|
|
|
else
|
|
|
|
nh -= 2 * c->border;
|
|
|
|
nh = (mscale * spow(ratio, i)) - (2 * c->border);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else { /* tile window */
|
|
|
|
else { /* tile window */
|
|
|
|
nx += mw;
|
|
|
|
if(i == nmaster) {
|
|
|
|
nw = tw - 2 * c->border;
|
|
|
|
ny = way;
|
|
|
|
if(th > 2 * c->border) {
|
|
|
|
nx = wax + mw;
|
|
|
|
ny += (i - nmaster) * th;
|
|
|
|
|
|
|
|
nh = th;
|
|
|
|
|
|
|
|
if(i + 1 == n) /* remainder */
|
|
|
|
|
|
|
|
nh = wah - th * (i - nmaster);
|
|
|
|
|
|
|
|
nh -= 2 * c->border;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else /* fallback if th <= 2 * c->border */
|
|
|
|
nw = tw - 2 * c->border;
|
|
|
|
nh = wah - 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);
|
|
|
|
resize(c, nx, ny, nw, nh, False);
|
|
|
|
|
|
|
|
ny += nh;
|
|
|
|
i++;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
@ -106,18 +133,19 @@ focusclient(const char *arg) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
void
|
|
|
|
incmasterw(const char *arg) {
|
|
|
|
incratio(const char *arg) {
|
|
|
|
int i;
|
|
|
|
double delta;
|
|
|
|
|
|
|
|
|
|
|
|
if(lt->arrange != tile)
|
|
|
|
if(lt->arrange != tile)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
if(!arg)
|
|
|
|
if(!arg)
|
|
|
|
masterw = MASTERWIDTH;
|
|
|
|
ratio = RATIO;
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
i = atoi(arg);
|
|
|
|
if(1 == sscanf(arg, "%lf", &delta)) {
|
|
|
|
if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX
|
|
|
|
if(delta + ratio < .1 || delta + ratio > 1.9)
|
|
|
|
|| waw * (masterw + i) / 1000 <= 2 * BORDERPX)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
ratio += delta;
|
|
|
|
masterw += i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
lt->arrange();
|
|
|
|
lt->arrange();
|
|
|
|
}
|
|
|
|
}
|
|
|
|