On Wed, Jun 10, 2020 at 02:03:48PM +0000, Michel Boaventura wrote:
> Hi,
>
> This patch brings Vanity Gaps to master, because the current patch on the site does not apply after f09418b.
>
> Thanks.
> From c35fd03ec002e1f4476a75203ff9b5cbcc630177 Mon Sep 17 00:00:00 2001
> From: Michel Boaventura <michel.boaventura_AT_protonmail.com>
> Date: Wed, 10 Jun 2020 10:46:51 -0300
> Subject: [PATCH] Update Vanity Gaps to master
>
> ---
> config.def.h | 21 +++++++
> dwm.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++----
> 2 files changed, 163 insertions(+), 12 deletions(-)
>
> diff --git a/config.def.h b/config.def.h
> index 1c0b587..0927c2d 100644
> --- a/config.def.h
> +++ b/config.def.h
> _AT_@ -3,6 +3,11 @@
> /* appearance */
> static const unsigned int borderpx = 1; /* border pixel of windows */
> static const unsigned int snap = 32; /* snap pixel */
> +static const unsigned int gappih = 10; /* horiz inner gap between windows */
> +static const unsigned int gappiv = 10; /* vert inner gap between windows */
> +static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
> +static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */
> +static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */
> static const int showbar = 1; /* 0 means no bar */
> static const int topbar = 1; /* 0 means bottom bar */
> static const char *fonts[] = { "monospace:size=10" };
> _AT_@ -70,6 +75,22 @@ static Key keys[] = {
> { MODKEY, XK_d, incnmaster, {.i = -1 } },
> { MODKEY, XK_h, setmfact, {.f = -0.05} },
> { MODKEY, XK_l, setmfact, {.f = +0.05} },
> + { MODKEY|Mod4Mask, XK_h, incrgaps, {.i = +1 } },
> + { MODKEY|Mod4Mask, XK_l, incrgaps, {.i = -1 } },
> + { MODKEY|Mod4Mask|ShiftMask, XK_h, incrogaps, {.i = +1 } },
> + { MODKEY|Mod4Mask|ShiftMask, XK_l, incrogaps, {.i = -1 } },
> + { MODKEY|Mod4Mask|ControlMask, XK_h, incrigaps, {.i = +1 } },
> + { MODKEY|Mod4Mask|ControlMask, XK_l, incrigaps, {.i = -1 } },
> + { MODKEY|Mod4Mask, XK_0, togglegaps, {0} },
> + { MODKEY|Mod4Mask|ShiftMask, XK_0, defaultgaps, {0} },
> + { MODKEY, XK_y, incrihgaps, {.i = +1 } },
> + { MODKEY, XK_o, incrihgaps, {.i = -1 } },
> + { MODKEY|ControlMask, XK_y, incrivgaps, {.i = +1 } },
> + { MODKEY|ControlMask, XK_o, incrivgaps, {.i = -1 } },
> + { MODKEY|Mod4Mask, XK_y, incrohgaps, {.i = +1 } },
> + { MODKEY|Mod4Mask, XK_o, incrohgaps, {.i = -1 } },
> + { MODKEY|ShiftMask, XK_y, incrovgaps, {.i = +1 } },
> + { MODKEY|ShiftMask, XK_o, incrovgaps, {.i = -1 } },
> { MODKEY, XK_Return, zoom, {0} },
> { MODKEY, XK_Tab, view, {0} },
> { MODKEY|ShiftMask, XK_c, killclient, {0} },
> diff --git a/dwm.c b/dwm.c
> index 9fd0286..50dbbaf 100644
> --- a/dwm.c
> +++ b/dwm.c
> _AT_@ -119,6 +119,10 @@ struct Monitor {
> int by; /* bar geometry */
> int mx, my, mw, mh; /* screen size */
> int wx, wy, ww, wh; /* window area */
> + int gappih; /* horizontal gap between windows */
> + int gappiv; /* vertical gap between windows */
> + int gappoh; /* horizontal outer gaps */
> + int gappov; /* vertical outer gaps */
> unsigned int seltags;
> unsigned int sellt;
> unsigned int tagset[2];
> _AT_@ -200,6 +204,16 @@ static void sendmon(Client *c, Monitor *m);
> static void setclientstate(Client *c, long state);
> static void setfocus(Client *c);
> static void setfullscreen(Client *c, int fullscreen);
> +static void setgaps(int oh, int ov, int ih, int iv);
> +static void incrgaps(const Arg *arg);
> +static void incrigaps(const Arg *arg);
> +static void incrogaps(const Arg *arg);
> +static void incrohgaps(const Arg *arg);
> +static void incrovgaps(const Arg *arg);
> +static void incrihgaps(const Arg *arg);
> +static void incrivgaps(const Arg *arg);
> +static void togglegaps(const Arg *arg);
> +static void defaultgaps(const Arg *arg);
> static void setlayout(const Arg *arg);
> static void setmfact(const Arg *arg);
> static void setup(void);
> _AT_@ -241,6 +255,7 @@ static char stext[256];
> static int screen;
> static int sw, sh; /* X display screen geometry width, height */
> static int bh, blw = 0; /* bar geometry */
> +static int enablegaps = 1; /* enables gaps, used by togglegaps */
> static int lrpad; /* sum of left and right padding for text */
> static int (*xerrorxlib)(Display *, XErrorEvent *);
> static unsigned int numlockmask = 0;
> _AT_@ -639,6 +654,10 @@ createmon(void)
> m->nmaster = nmaster;
> m->showbar = showbar;
> m->topbar = topbar;
> + m->gappih = gappih;
> + m->gappiv = gappiv;
> + m->gappoh = gappoh;
> + m->gappov = gappov;
> m->lt[0] = &layouts[0];
> m->lt[1] = &layouts[1 % LENGTH(layouts)];
> strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
> _AT_@ -1498,6 +1517,111 @@ setfullscreen(Client *c, int fullscreen)
> }
> }
>
> +void
> +setgaps(int oh, int ov, int ih, int iv)
> +{
> + if (oh < 0) oh = 0;
> + if (ov < 0) ov = 0;
> + if (ih < 0) ih = 0;
> + if (iv < 0) iv = 0;
> +
> + selmon->gappoh = oh;
> + selmon->gappov = ov;
> + selmon->gappih = ih;
> + selmon->gappiv = iv;
> + arrange(selmon);
> +}
> +
> +void
> +togglegaps(const Arg *arg)
> +{
> + enablegaps = !enablegaps;
> + arrange(selmon);
> +}
> +
> +void
> +defaultgaps(const Arg *arg)
> +{
> + setgaps(gappoh, gappov, gappih, gappiv);
> +}
> +
> +void
> +incrgaps(const Arg *arg)
> +{
> + setgaps(
> + selmon->gappoh + arg->i,
> + selmon->gappov + arg->i,
> + selmon->gappih + arg->i,
> + selmon->gappiv + arg->i
> + );
> +}
> +
> +void
> +incrigaps(const Arg *arg)
> +{
> + setgaps(
> + selmon->gappoh,
> + selmon->gappov,
> + selmon->gappih + arg->i,
> + selmon->gappiv + arg->i
> + );
> +}
> +
> +void
> +incrogaps(const Arg *arg)
> +{
> + setgaps(
> + selmon->gappoh + arg->i,
> + selmon->gappov + arg->i,
> + selmon->gappih,
> + selmon->gappiv
> + );
> +}
> +
> +void
> +incrohgaps(const Arg *arg)
> +{
> + setgaps(
> + selmon->gappoh + arg->i,
> + selmon->gappov,
> + selmon->gappih,
> + selmon->gappiv
> + );
> +}
> +
> +void
> +incrovgaps(const Arg *arg)
> +{
> + setgaps(
> + selmon->gappoh,
> + selmon->gappov + arg->i,
> + selmon->gappih,
> + selmon->gappiv
> + );
> +}
> +
> +void
> +incrihgaps(const Arg *arg)
> +{
> + setgaps(
> + selmon->gappoh,
> + selmon->gappov,
> + selmon->gappih + arg->i,
> + selmon->gappiv
> + );
> +}
> +
> +void
> +incrivgaps(const Arg *arg)
> +{
> + setgaps(
> + selmon->gappoh,
> + selmon->gappov,
> + selmon->gappih,
> + selmon->gappiv + arg->i
> + );
> +}
> +
> void
> setlayout(const Arg *arg)
> {
> _AT_@ -1674,28 +1798,34 @@ tagmon(const Arg *arg)
> void
> tile(Monitor *m)
> {
> - unsigned int i, n, h, mw, my, ty;
> + unsigned int i, n, h, r, oe = enablegaps, ie = enablegaps, mw, my, ty;
> Client *c;
>
> for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
> if (n == 0)
> return;
>
> + if (smartgaps == n) {
> + oe = 0; // outer gaps disabled
> + }
> +
> if (n > m->nmaster)
> - mw = m->nmaster ? m->ww * m->mfact : 0;
> + mw = m->nmaster ? (m->ww + m->gappiv*ie) * m->mfact : 0;
> else
> - mw = m->ww;
> - for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
> + mw = m->ww - 2*m->gappov*oe + m->gappiv*ie;
> + for (i = 0, my = ty = m->gappoh*oe, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
> if (i < m->nmaster) {
> - h = (m->wh - my) / (MIN(n, m->nmaster) - i);
> - resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
> - if (my + HEIGHT(c) < m->wh)
> - my += HEIGHT(c);
> + r = MIN(n, m->nmaster) - i;
> + h = (m->wh - my - m->gappoh*oe - m->gappih*ie * (r - 1)) / r;
> + resize(c, m->wx + m->gappov*oe, m->wy + my, mw - (2*c->bw) - m->gappiv*ie, h - (2*c->bw), 0);
> + if (my + HEIGHT(c) + m->gappih*ie < m->wh)
> + my += HEIGHT(c) + m->gappih*ie;
> } else {
> - h = (m->wh - ty) / (n - i);
> - resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
> - if (ty + HEIGHT(c) < m->wh)
> - ty += HEIGHT(c);
> + r = n - i;
> + h = (m->wh - ty - m->gappoh*oe - m->gappih*ie * (r - 1)) / r;
> + resize(c, m->wx + mw + m->gappov*oe, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappov*oe, h - (2*c->bw), 0);
> + if (ty + HEIGHT(c) + m->gappih*ie < m->wh)
> + ty += HEIGHT(c) + m->gappih*ie;
> }
> }
>
> --
> 2.27.0
>
Hi,
Please just post it to the public-writable wiki, not hackers_AT_.
hackers_AT_ is intended for upstream patches.
Thanks,
--
Kind regards,
Hiltjo
Received on Wed Jun 10 2020 - 17:11:47 CEST