sites

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 2a4388e7420da0c93bea5de3dd6a03835350e5cc
parent d290698610f92eb72360482ac130002c09c13068
Author: Unia <jthidskes@live.nl>
Date:   Wed, 27 Mar 2013 14:16:39 +0100

rename, sorry

Diffstat:
Mdwm.suckless.org/patches/dwm-6.0-smfact.diff | 71+++++++++++++++++++++++++++++++++--------------------------------------
Ddwm.suckless.org/patches/xx-dwm-6.0-smfact.diff | 96-------------------------------------------------------------------------------
2 files changed, 33 insertions(+), 134 deletions(-)

diff --git a/dwm.suckless.org/patches/dwm-6.0-smfact.diff b/dwm.suckless.org/patches/dwm-6.0-smfact.diff @@ -1,24 +1,5 @@ ---- config.def.h 2011-12-19 16:02:46.000000000 +0100 -+++ config.def.h 2013-03-26 00:40:52.933242100 +0100 -@@ -24,6 +24,7 @@ static const Rule rules[] = { - - /* layout(s) */ - static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -+static const float smfact = 0.00; /* factor of stacked clients [0.00..0.95] */ - static const int nmaster = 1; /* number of clients in master area */ - static const Bool resizehints = True; /* True means respect size hints in tiled resizals */ - -@@ -60,6 +61,8 @@ static Key keys[] = { - { MODKEY, XK_d, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, -+ { MODKEY|ShiftMask, XK_h, setsmfact, {.f = -0.05} }, -+ { MODKEY|ShiftMask, XK_l, setsmfact, {.f = +0.05} }, - { MODKEY, XK_Return, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} }, ---- dwm.c 2013-03-25 21:21:09.476413028 +0100 -+++ dwm.c 2013-03-26 00:39:01.406577437 +0100 +--- dwm.c 2013-03-27 14:12:41.316782003 +0100 ++++ dwm.c 2013-03-27 14:12:49.040115216 +0100 @@ -69,6 +69,7 @@ typedef union { int i; unsigned int ui; @@ -43,27 +24,22 @@ static void setup(void); static void showhide(Client *c); static void sigchld(int unused); -@@ -651,6 +654,7 @@ createmon(void) { - die("fatal: could not malloc() %u bytes\n", sizeof(Monitor)); - m->tagset[0] = m->tagset[1] = 1; - m->mfact = mfact; -+ m->smfact = smfact; - m->nmaster = nmaster; - m->showbar = showbar; - m->topbar = topbar; -@@ -1581,6 +1585,19 @@ setmfact(const Arg *arg) { +@@ -1581,6 +1584,22 @@ setmfact(const Arg *arg) { } void +setsmfact(const Arg *arg) { + float sf; ++ int n = 0; ++ Client *c; + + if(!arg || !selmon->lt[selmon->sellt]->arrange) + return; -+ sf = arg->sf < 1.0 ? arg->sf + selmon->smfact : arg->sf - 1.0; -+ if(sf < 0 || sf > 0.95) ++ sf = arg->sf < 1.0 ? arg->sf + selmon->smfacts[selmon->curtag] : arg->sf - 1.0; ++ for(n = 0, c = nexttiled(selmon->clients); c; c = nexttiled(c->next), n++); ++ if(sf < 0 || ((n > 7) ? (sf > 0.50) : (sf > 0.95))) + return; -+ selmon->smfact = sf; ++ selmon->smfacts[selmon->curtag] = sf; + arrange(selmon); +} + @@ -71,7 +47,7 @@ setup(void) { XSetWindowAttributes wa; -@@ -1703,7 +1720,7 @@ textnw(const char *text, unsigned int le +@@ -1703,7 +1722,7 @@ textnw(const char *text, unsigned int le void tile(Monitor *m) { @@ -80,12 +56,12 @@ Client *c; for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); -@@ -1721,9 +1738,16 @@ tile(Monitor *m) { +@@ -1721,9 +1740,16 @@ tile(Monitor *m) { my += HEIGHT(c); } else { - h = (m->wh - ty) / (n - i); -+ smh = m->wh * m->smfact; ++ smh = m->mh * m->smfacts[m->curtag]; + if(!(nexttiled(c->next))) + h = (m->wh - ty) / (n - i); + else @@ -93,9 +69,28 @@ resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False); - ty += HEIGHT(c); + if(!(nexttiled(c->next))) -+ ty += HEIGHT(c) - c->bw + smh; ++ ty += HEIGHT(c) + smh; + else -+ ty += HEIGHT(c) - c->bw; ++ ty += HEIGHT(c); } } +--- config.def.h 2013-03-27 14:13:01.230115003 +0100 ++++ config.def.h 2013-03-27 14:14:09.156780538 +0100 +@@ -24,6 +24,7 @@ static const Rule rules[] = { + + /* layout(s) */ + static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ ++static const float smfact = 0.00; /* factor of tiled clients [0.00..0.95] */ + static const int nmaster = 1; /* number of clients in master area */ + static const Bool resizehints = True; /* True means respect size hints in tiled resizals */ + +@@ -60,6 +61,8 @@ static Key keys[] = { + { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, ++ { MODKEY|ShiftMask, XK_h, setsmfact, {.f = +0.05} }, ++ { MODKEY|ShiftMask, XK_l, setsmfact, {.f = -0.05} }, + { MODKEY, XK_Return, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY|ShiftMask, XK_c, killclient, {0} }, diff --git a/dwm.suckless.org/patches/xx-dwm-6.0-smfact.diff b/dwm.suckless.org/patches/xx-dwm-6.0-smfact.diff @@ -1,96 +0,0 @@ ---- dwm.c 2013-03-27 14:12:41.316782003 +0100 -+++ dwm.c 2013-03-27 14:12:49.040115216 +0100 -@@ -69,6 +69,7 @@ typedef union { - int i; - unsigned int ui; - float f; -+ float sf; - const void *v; - } Arg; - -@@ -127,6 +128,7 @@ typedef struct { - struct Monitor { - char ltsymbol[16]; - float mfact; -+ float smfact; - int nmaster; - int num; - int by; /* bar geometry */ -@@ -220,6 +222,7 @@ static void setfocus(Client *c); - static void setfullscreen(Client *c, Bool fullscreen); - static void setlayout(const Arg *arg); - static void setmfact(const Arg *arg); -+static void setsmfact(const Arg *arg); - static void setup(void); - static void showhide(Client *c); - static void sigchld(int unused); -@@ -1581,6 +1584,22 @@ setmfact(const Arg *arg) { - } - - void -+setsmfact(const Arg *arg) { -+ float sf; -+ int n = 0; -+ Client *c; -+ -+ if(!arg || !selmon->lt[selmon->sellt]->arrange) -+ return; -+ sf = arg->sf < 1.0 ? arg->sf + selmon->smfacts[selmon->curtag] : arg->sf - 1.0; -+ for(n = 0, c = nexttiled(selmon->clients); c; c = nexttiled(c->next), n++); -+ if(sf < 0 || ((n > 7) ? (sf > 0.50) : (sf > 0.95))) -+ return; -+ selmon->smfacts[selmon->curtag] = sf; -+ arrange(selmon); -+} -+ -+void - setup(void) { - XSetWindowAttributes wa; - -@@ -1703,7 +1722,7 @@ textnw(const char *text, unsigned int le - - void - tile(Monitor *m) { -- unsigned int i, n, h, mw, my, ty; -+ unsigned int i, n, h, smh, mw, my, ty; - Client *c; - - for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); -@@ -1721,9 +1740,16 @@ tile(Monitor *m) { - my += HEIGHT(c); - } - else { -- h = (m->wh - ty) / (n - i); -+ smh = m->mh * m->smfacts[m->curtag]; -+ if(!(nexttiled(c->next))) -+ h = (m->wh - ty) / (n - i); -+ else -+ h = (m->wh - smh - ty) / (n - i); - resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False); -- ty += HEIGHT(c); -+ if(!(nexttiled(c->next))) -+ ty += HEIGHT(c) + smh; -+ else -+ ty += HEIGHT(c); - } - } - ---- config.def.h 2013-03-27 14:13:01.230115003 +0100 -+++ config.def.h 2013-03-27 14:14:09.156780538 +0100 -@@ -24,6 +24,7 @@ static const Rule rules[] = { - - /* layout(s) */ - static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -+static const float smfact = 0.00; /* factor of tiled clients [0.00..0.95] */ - static const int nmaster = 1; /* number of clients in master area */ - static const Bool resizehints = True; /* True means respect size hints in tiled resizals */ - -@@ -60,6 +61,8 @@ static Key keys[] = { - { MODKEY, XK_d, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, -+ { MODKEY|ShiftMask, XK_h, setsmfact, {.f = +0.05} }, -+ { MODKEY|ShiftMask, XK_l, setsmfact, {.f = -0.05} }, - { MODKEY, XK_Return, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} },