apply patch fibonacci
This commit is contained in:
parent
14f781f3a9
commit
8831627894
1
README
1
README
|
@ -60,3 +60,4 @@ Customisations
|
||||||
* Merged patch: https://dwm.suckless.org/patches/warp/dwm-warp-git-20160626-7af4d43.diff
|
* Merged patch: https://dwm.suckless.org/patches/warp/dwm-warp-git-20160626-7af4d43.diff
|
||||||
* Merged patch: https://dwm.suckless.org/patches/dwmc/dwm-dwmc-6.2.diff
|
* Merged patch: https://dwm.suckless.org/patches/dwmc/dwm-dwmc-6.2.diff
|
||||||
* Merged patch: https: //dwm.suckless.org/patches/cfacts/dwm-cfacts-6.2.diff
|
* Merged patch: https: //dwm.suckless.org/patches/cfacts/dwm-cfacts-6.2.diff
|
||||||
|
* Merged patch: https://dwm.suckless.org/patches/fibonacci/dwm-fibonacci-5.8.2.diff
|
||||||
|
|
|
@ -36,6 +36,7 @@ static const float mfact = 0.55; /* factor of master area size [0.05..0.95]
|
||||||
static const int nmaster = 1; /* number of clients in master area */
|
static const int nmaster = 1; /* number of clients in master area */
|
||||||
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
||||||
|
|
||||||
|
#include "fibonacci.c"
|
||||||
static const Layout layouts[] = {
|
static const Layout layouts[] = {
|
||||||
/* symbol arrange function */
|
/* symbol arrange function */
|
||||||
{ "[]=", tile }, /* first entry is default */
|
{ "[]=", tile }, /* first entry is default */
|
||||||
|
@ -43,6 +44,8 @@ static const Layout layouts[] = {
|
||||||
{ "[M]", monocle },
|
{ "[M]", monocle },
|
||||||
{ "TTT", bstack },
|
{ "TTT", bstack },
|
||||||
{ "===", bstackhoriz },
|
{ "===", bstackhoriz },
|
||||||
|
{ "[@]", spiral },
|
||||||
|
{ "[\\]", dwindle },
|
||||||
};
|
};
|
||||||
|
|
||||||
/* key definitions */
|
/* key definitions */
|
||||||
|
|
3
config.h
3
config.h
|
@ -41,6 +41,7 @@ static const float mfact = 0.50; /* factor of master area size [0.05..0.95]
|
||||||
static const int nmaster = 1; /* number of clients in master area */
|
static const int nmaster = 1; /* number of clients in master area */
|
||||||
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
||||||
|
|
||||||
|
#include "fibonacci.c"
|
||||||
static const Layout layouts[] = {
|
static const Layout layouts[] = {
|
||||||
/* symbol arrange function */
|
/* symbol arrange function */
|
||||||
{ "::[]=", tile }, /* first entry is default */
|
{ "::[]=", tile }, /* first entry is default */
|
||||||
|
@ -48,6 +49,7 @@ static const Layout layouts[] = {
|
||||||
{ "[M]", monocle },
|
{ "[M]", monocle },
|
||||||
{ "TTT", bstack },
|
{ "TTT", bstack },
|
||||||
{ "===", bstackhoriz },
|
{ "===", bstackhoriz },
|
||||||
|
{ "[@]", dwindle },
|
||||||
};
|
};
|
||||||
|
|
||||||
/* key definitions */
|
/* key definitions */
|
||||||
|
@ -88,6 +90,7 @@ static Key keys[] = {
|
||||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||||
{ MODKEY, XK_v, setlayout, {.v = &layouts[3]} },
|
{ MODKEY, XK_v, setlayout, {.v = &layouts[3]} },
|
||||||
{ MODKEY|ShiftMask, XK_v, setlayout, {.v = &layouts[4]} },
|
{ MODKEY|ShiftMask, XK_v, setlayout, {.v = &layouts[4]} },
|
||||||
|
{ MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[5]} },
|
||||||
{ MODKEY, XK_space, setlayout, {0} },
|
{ MODKEY, XK_space, setlayout, {0} },
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||||
|
|
|
@ -0,0 +1,66 @@
|
||||||
|
void
|
||||||
|
fibonacci(Monitor *mon, int s) {
|
||||||
|
unsigned int i, n, nx, ny, nw, nh;
|
||||||
|
Client *c;
|
||||||
|
|
||||||
|
for(n = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next), n++);
|
||||||
|
if(n == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
nx = mon->wx;
|
||||||
|
ny = 0;
|
||||||
|
nw = mon->ww;
|
||||||
|
nh = mon->wh;
|
||||||
|
|
||||||
|
for(i = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next)) {
|
||||||
|
if((i % 2 && nh / 2 > 2 * c->bw)
|
||||||
|
|| (!(i % 2) && nw / 2 > 2 * c->bw)) {
|
||||||
|
if(i < n - 1) {
|
||||||
|
if(i % 2)
|
||||||
|
nh /= 2;
|
||||||
|
else
|
||||||
|
nw /= 2;
|
||||||
|
if((i % 4) == 2 && !s)
|
||||||
|
nx += nw;
|
||||||
|
else if((i % 4) == 3 && !s)
|
||||||
|
ny += nh;
|
||||||
|
}
|
||||||
|
if((i % 4) == 0) {
|
||||||
|
if(s)
|
||||||
|
ny += nh;
|
||||||
|
else
|
||||||
|
ny -= nh;
|
||||||
|
}
|
||||||
|
else if((i % 4) == 1)
|
||||||
|
nx += nw;
|
||||||
|
else if((i % 4) == 2)
|
||||||
|
ny += nh;
|
||||||
|
else if((i % 4) == 3) {
|
||||||
|
if(s)
|
||||||
|
nx += nw;
|
||||||
|
else
|
||||||
|
nx -= nw;
|
||||||
|
}
|
||||||
|
if(i == 0)
|
||||||
|
{
|
||||||
|
if(n != 1)
|
||||||
|
nw = mon->ww * mon->mfact;
|
||||||
|
ny = mon->wy;
|
||||||
|
}
|
||||||
|
else if(i == 1)
|
||||||
|
nw = mon->ww - nw;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
resize(c, nx, ny, nw - 2 * c->bw, nh - 2 * c->bw, False);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
dwindle(Monitor *mon) {
|
||||||
|
fibonacci(mon, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
spiral(Monitor *mon) {
|
||||||
|
fibonacci(mon, 0);
|
||||||
|
}
|
Loading…
Reference in New Issue