[wiki] [sites] [dwm][patch] dwm-fullgaps: fix the tile layout hunk || swy7ch

From: <git_AT_suckless.org>
Date: Mon, 04 May 2020 14:23:59 +0200

commit 3125953547d37e95f7757f1794f86e122884a2c8
Author: swy7ch <swy7ch_AT_protonmail.com>
Date: Mon May 4 14:17:45 2020 +0200

    [dwm][patch] dwm-fullgaps: fix the tile layout hunk
    
    recent changes in dwm tile layout (commit f09418b) made the patching fail
    this patch addresses it

diff --git a/dwm.suckless.org/patches/fullgaps/dwm-fullgaps-20200504-b2e1dfc.diff b/dwm.suckless.org/patches/fullgaps/dwm-fullgaps-20200504-b2e1dfc.diff
new file mode 100644
index 00000000..665a18b8
--- /dev/null
+++ b/dwm.suckless.org/patches/fullgaps/dwm-fullgaps-20200504-b2e1dfc.diff
_AT_@ -0,0 +1,137 @@
+From b2e1dfc554f2e12ecbf2dc0f2714aab99cae7174 Mon Sep 17 00:00:00 2001
+From: swy7ch <swy7ch_AT_protonmail.com>
+Date: Mon, 4 May 2020 03:53:40 +0200
+Subject: [PATCH] update dwm-fullgaps patch to be used with tile layout update
+
+the recent tile layout changes in commit HEAD~1 (f09418b) broke the
+patch
+
+this patch adapt the new `if` statements to take gaps into account
+
+this patch also provides manpage entries for the keybindings
+---
+ config.def.h | 4 ++++
+ dwm.1 | 10 ++++++++++
+ dwm.c | 33 +++++++++++++++++++++++----------
+ 3 files changed, 37 insertions(+), 10 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..38d2f6c 100644
+--- a/config.def.h
++++ b/config.def.h
+_AT_@ -2,6 +2,7 @@
+
+ /* appearance */
+ static const unsigned int borderpx = 1; /* border pixel of windows */
++static const unsigned int gappx = 5; /* gaps between windows */
+ static const unsigned int snap = 32; /* snap pixel */
+ static const int showbar = 1; /* 0 means no bar */
+ static const int topbar = 1; /* 0 means bottom bar */
+_AT_@ -84,6 +85,9 @@ static Key keys[] = {
+ { MODKEY, XK_period, focusmon, {.i = +1 } },
+ { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
+ { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
++ { MODKEY, XK_minus, setgaps, {.i = -1 } },
++ { MODKEY, XK_equal, setgaps, {.i = +1 } },
++ { MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } },
+ TAGKEYS( XK_1, 0)
+ TAGKEYS( XK_2, 1)
+ TAGKEYS( XK_3, 2)
+diff --git a/dwm.1 b/dwm.1
+index 13b3729..0adb50c 100644
+--- a/dwm.1
++++ b/dwm.1
+_AT_@ -140,6 +140,16 @@ View all windows with any tag.
+ .B Mod1\-Control\-[1..n]
+ Add/remove all windows with nth tag to/from the view.
+ .TP
++.B Mod1\--
++Decrease the gaps around windows.
++.TP
++.B Mod1\-=
++Increase the gaps around windows.
++.TP
++.B Mod1\-Shift\-=
++Reset the gaps around windows to
++.BR 0.
++.TP
+ .B Mod1\-Shift\-q
+ Quit dwm.
+ .SS Mouse commands
+diff --git a/dwm.c b/dwm.c
+index 9fd0286..45a58f3 100644
+--- a/dwm.c
++++ b/dwm.c
+_AT_@ -119,6 +119,7 @@ struct Monitor {
+ int by; /* bar geometry */
+ int mx, my, mw, mh; /* screen size */
+ int wx, wy, ww, wh; /* window area */
++ int gappx; /* gaps between windows */
+ unsigned int seltags;
+ unsigned int sellt;
+ unsigned int tagset[2];
+_AT_@ -200,6 +201,7 @@ 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(const Arg *arg);
+ static void setlayout(const Arg *arg);
+ static void setmfact(const Arg *arg);
+ static void setup(void);
+_AT_@ -639,6 +641,7 @@ createmon(void)
+ m->nmaster = nmaster;
+ m->showbar = showbar;
+ m->topbar = topbar;
++ m->gappx = gappx;
+ m->lt[0] = &layouts[0];
+ m->lt[1] = &layouts[1 % LENGTH(layouts)];
+ strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+_AT_@ -1498,6 +1501,16 @@ setfullscreen(Client *c, int fullscreen)
+ }
+ }
+
++void
++setgaps(const Arg *arg)
++{
++ if ((arg->i == 0) || (selmon->gappx + arg->i < 0))
++ selmon->gappx = 0;
++ else
++ selmon->gappx += arg->i;
++ arrange(selmon);
++}
++
+ void
+ setlayout(const Arg *arg)
+ {
+_AT_@ -1684,18 +1697,18 @@ tile(Monitor *m)
+ if (n > m->nmaster)
+ mw = m->nmaster ? m->ww * 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 - m->gappx;
++ for (i = 0, my = ty = m->gappx, 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);
++ h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx;
++ resize(c, m->wx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx, h - (2*c->bw), 0);
++ if (my + HEIGHT(c) + m->gappx < m->wh)
++ my += HEIGHT(c) + m->gappx;
+ } 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);
++ h = (m->wh - ty) / (n - i) - m->gappx;
++ resize(c, m->wx + mw + m->gappx, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappx, h - (2*c->bw), 0);
++ if (ty + HEIGHT(c) + m->gappx < m->wh)
++ ty += HEIGHT(c) + m->gappx;
+ }
+ }
+
+--
+2.26.2
+
diff --git a/dwm.suckless.org/patches/fullgaps/index.md b/dwm.suckless.org/patches/fullgaps/index.md
index 2ed15bcb..4373c194 100644
--- a/dwm.suckless.org/patches/fullgaps/index.md
+++ b/dwm.suckless.org/patches/fullgaps/index.md
_AT_@ -15,7 +15,9 @@ The configuration variable `gappx` contains the default gap size.
 Download
 --------
 * [dwm-fullgaps-6.2.diff](dwm-fullgaps-6.2.diff)
+* [dwm-fullgaps-20200504-b2e1dfc.diff](dwm-fullgaps-20200504-b2e1dfc.diff]
 
 Author
 ------
 * Maciej Sumalvico <macjan_AT_o2.pl>
+* David Julien <swy7ch_AT_protonmail.com> (20200504-b2e1dfc port)
Received on Mon May 04 2020 - 14:23:59 CEST