From a8e00a682197173d19b003ac24f9f8c6a688115d Mon Sep 17 00:00:00 2001 From: mrsu Date: Sun, 23 Jun 2024 19:30:21 +0100 Subject: [PATCH] unpatched fullgaps --- dwm.c | 39 ++-- ...unctionalgaps-pertagfunctionality-6.2.diff | 207 ++++++++++++++++++ 2 files changed, 220 insertions(+), 26 deletions(-) create mode 100644 patches/dwm-functionalgaps-pertagfunctionality-6.2.diff diff --git a/dwm.c b/dwm.c index 8edef05..05767bd 100644 --- a/dwm.c +++ b/dwm.c @@ -132,7 +132,6 @@ 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]; @@ -232,7 +231,6 @@ 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); @@ -755,7 +753,6 @@ 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); @@ -1700,16 +1697,6 @@ 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) { @@ -1921,25 +1908,25 @@ tile(Monitor *m) if (n > m->nmaster) mw = m->nmaster ? m->ww * m->mfact : 0; else - 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) - 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) - 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; + mw = m->ww; + for (i = my = ty = 0, 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); + } 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); } } void togglebar(const Arg *arg) { - selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar; + selmon->showbar = !selmon->showbar; updatebarpos(selmon); XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); arrange(selmon); diff --git a/patches/dwm-functionalgaps-pertagfunctionality-6.2.diff b/patches/dwm-functionalgaps-pertagfunctionality-6.2.diff new file mode 100644 index 0000000..7d1fabe --- /dev/null +++ b/patches/dwm-functionalgaps-pertagfunctionality-6.2.diff @@ -0,0 +1,207 @@ +diff -pu dwm.withpertag/config.def.h dwm.functionalgapspertag/config.def.h +--- dwm.withpertag/config.def.h 2021-02-27 23:47:22.426092186 -0600 ++++ dwm.functionalgapspertag/config.def.h 2021-03-01 15:40:07.312696974 -0600 +@@ -2,6 +2,8 @@ + + /* appearance */ + static const unsigned int borderpx = 1; /* border pixel of windows */ ++static const int startwithgaps[] = { 0 }; /* 1 means gaps are used by default, this can be customized for each tag */ ++static const unsigned int gappx[] = { 10 }; /* default gap between windows in pixels, this can be customized for each tag */ + 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 */ +@@ -84,6 +86,10 @@ 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 = -5 } }, ++ { MODKEY, XK_equal, setgaps, {.i = +5 } }, ++ { MODKEY|ShiftMask, XK_minus, setgaps, {.i = GAP_RESET } }, ++ { MODKEY|ShiftMask, XK_equal, setgaps, {.i = GAP_TOGGLE} }, + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) +diff -pu dwm.withpertag/dwm.c dwm.functionalgapspertag/dwm.c +--- dwm.withpertag/dwm.c 2021-02-27 23:47:41.352759785 -0600 ++++ dwm.functionalgapspertag/dwm.c 2021-03-01 17:10:10.402964866 -0600 +@@ -57,6 +57,9 @@ + #define TAGMASK ((1 << LENGTH(tags)) - 1) + #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) + ++#define GAP_TOGGLE 100 ++#define GAP_RESET 0 ++ + /* enums */ + enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ + enum { SchemeNorm, SchemeSel }; /* color schemes */ +@@ -112,6 +115,7 @@ typedef struct { + } Layout; + + typedef struct Pertag Pertag; ++ + struct Monitor { + char ltsymbol[16]; + float mfact; +@@ -202,6 +206,7 @@ static void sendmon(Client *c, Monitor * + 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); +@@ -281,6 +286,9 @@ struct Pertag { + unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */ + const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes */ + int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */ ++ ++ int drawwithgaps[LENGTH(tags) + 1]; /* gaps toggle for each tag */ ++ int gappx[LENGTH(tags) + 1]; /* gaps for each tag */ + }; + + /* compile-time check if all tags fit into an unsigned int bit array. */ +@@ -666,7 +674,13 @@ createmon(void) + m->pertag->sellts[i] = m->sellt; + + m->pertag->showbars[i] = m->showbar; ++ if (i > 0) { ++ m->pertag->drawwithgaps[i] = startwithgaps[(i - 1) % LENGTH(gappx)]; ++ m->pertag->gappx[i] = gappx[(i - 1) % LENGTH(gappx)]; ++ } + } ++ m->pertag->drawwithgaps[0] = startwithgaps[0]; ++ m->pertag->gappx[0] = gappx[0]; + + return m; + } +@@ -823,6 +837,12 @@ focus(Client *c) + attachstack(c); + grabbuttons(c, 1); + XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel); ++ if (!selmon->pertag->drawwithgaps[selmon->pertag->curtag] && !c->isfloating) { ++ XWindowChanges wc; ++ wc.sibling = selmon->barwin; ++ wc.stack_mode = Below; ++ XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc); ++ } + setfocus(c); + } else { + XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); +@@ -1139,7 +1159,10 @@ monocle(Monitor *m) + if (n > 0) /* override layout symbol */ + snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n); + for (c = nexttiled(m->clients); c; c = nexttiled(c->next)) +- resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0); ++ if (selmon->pertag->drawwithgaps[selmon->pertag->curtag]) ++ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0); ++ else ++ resize(c, m->wx - c->bw, m->wy, m->ww, m->wh, False); + } + + void +@@ -1309,6 +1332,15 @@ resizeclient(Client *c, int x, int y, in + c->oldw = c->w; c->w = wc.width = w; + c->oldh = c->h; c->h = wc.height = h; + wc.border_width = c->bw; ++ if (!selmon->pertag->drawwithgaps[selmon->pertag->curtag] && /* this is the noborderfloatingfix patch, slightly modified so that it will work if, and only if, gaps are disabled. */ ++ (((nexttiled(c->mon->clients) == c && !nexttiled(c->next)) /* these two first lines are the only ones changed. if you are manually patching and have noborder installed already, just change these lines; or conversely, just remove this section if the noborder patch is not desired;) */ ++ || &monocle == c->mon->lt[c->mon->sellt]->arrange)) ++ && !c->isfullscreen && !c->isfloating ++ && NULL != c->mon->lt[c->mon->sellt]->arrange) { ++ c->w = wc.width += c->bw * 2; ++ c->h = wc.height += c->bw * 2; ++ wc.border_width = 0; ++ } + XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); + configure(c); + XSync(dpy, False); +@@ -1525,6 +1557,29 @@ setfullscreen(Client *c, int fullscreen) + } + + void ++setgaps(const Arg *arg) ++{ ++ switch(arg->i) ++ { ++ case GAP_TOGGLE: ++ selmon->pertag->drawwithgaps[selmon->pertag->curtag] = !selmon->pertag->drawwithgaps[selmon->pertag->curtag]; ++ break; ++ case GAP_RESET: ++ if (selmon->pertag->curtag > 0) ++ selmon->pertag->gappx[selmon->pertag->curtag] = gappx[selmon->pertag->curtag - 1 % LENGTH(gappx)]; ++ else ++ selmon->pertag->gappx[0] = gappx[0]; ++ break; ++ default: ++ if (selmon->pertag->gappx[selmon->pertag->curtag] + arg->i < 0) ++ selmon->pertag->gappx[selmon->pertag->curtag] = 0; ++ else ++ selmon->pertag->gappx[selmon->pertag->curtag] += arg->i; ++ } ++ arrange(selmon); ++} ++ ++void + setlayout(const Arg *arg) + { + if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) +@@ -1706,23 +1761,42 @@ tile(Monitor *m) + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); + if (n == 0) + return; +- +- 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++) +- 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); +- } 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); +- } ++ if (m->pertag->drawwithgaps[m->pertag->curtag]) { /* draw with fullgaps logic */ ++ if (n > m->nmaster) ++ mw = m->nmaster ? m->ww * m->mfact : 0; ++ else ++ mw = m->ww - m->pertag->gappx[m->pertag->curtag]; ++ for (i = 0, my = ty = m->pertag->gappx[m->pertag->curtag], c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) ++ if (i < m->nmaster) { ++ h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->pertag->gappx[m->pertag->curtag]; ++ resize(c, m->wx + m->pertag->gappx[m->pertag->curtag], m->wy + my, mw - (2*c->bw) - m->pertag->gappx[m->pertag->curtag], h - (2*c->bw), 0); ++ if (my + HEIGHT(c) + m->pertag->gappx[m->pertag->curtag] < m->wh) ++ my += HEIGHT(c) + m->pertag->gappx[m->pertag->curtag]; ++ } else { ++ h = (m->wh - ty) / (n - i) - m->pertag->gappx[m->pertag->curtag]; ++ resize(c, m->wx + mw + m->pertag->gappx[m->pertag->curtag], m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->pertag->gappx[m->pertag->curtag], h - (2*c->bw), 0); ++ if (ty + HEIGHT(c) + m->pertag->gappx[m->pertag->curtag] < m->wh) ++ ty += HEIGHT(c) + m->pertag->gappx[m->pertag->curtag]; ++ } ++ } else { /* draw with singularborders logic */ ++ 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++) ++ if (i < m->nmaster) { ++ h = (m->wh - my) / (MIN(n, m->nmaster) - i); ++ if (n == 1) ++ resize(c, m->wx - c->bw, m->wy, m->ww, m->wh, False); ++ else ++ resize(c, m->wx - c->bw, m->wy + my, mw - c->bw, h - c->bw, False); ++ my += HEIGHT(c) - c->bw; ++ } else { ++ h = (m->wh - ty) / (n - i); ++ resize(c, m->wx + mw - c->bw, m->wy + ty, m->ww - mw, h - c->bw, False); ++ ty += HEIGHT(c) - c->bw; ++ } ++ } + } + + void