itMerge branch 'master' of src.adamsgaard.dk:dwm - dwm - [fork] customized build of dwm, the dynamic window manager Err adamsgaard.dk 70 hgit clone git://src.adamsgaard.dk/dwm URL:git://src.adamsgaard.dk/dwm adamsgaard.dk 70 1Log /src/dwm/log.gph adamsgaard.dk 70 1Files /src/dwm/files.gph adamsgaard.dk 70 1Refs /src/dwm/refs.gph adamsgaard.dk 70 1README /src/dwm/file/README.gph adamsgaard.dk 70 1LICENSE /src/dwm/file/LICENSE.gph adamsgaard.dk 70 i--- Err adamsgaard.dk 70 1commit 467e0b3b4d00d0dffa18d314dcf9fb4d76fb373f /src/dwm/commit/467e0b3b4d00d0dffa18d314dcf9fb4d76fb373f.gph adamsgaard.dk 70 1parent 66a03284ef5356a2561c307754836cfbe196c9be /src/dwm/commit/66a03284ef5356a2561c307754836cfbe196c9be.gph adamsgaard.dk 70 hAuthor: Anders Damsgaard URL:mailto:anders@adamsgaard.dk adamsgaard.dk 70 iDate: Thu, 17 Dec 2020 12:35:44 +0100 Err adamsgaard.dk 70 i Err adamsgaard.dk 70 iMerge branch 'master' of src.adamsgaard.dk:dwm Err adamsgaard.dk 70 i Err adamsgaard.dk 70 iDiffstat: Err adamsgaard.dk 70 i M dwm.c | 24 +++++++++++++----------- Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i1 file changed, 13 insertions(+), 11 deletions(-) Err adamsgaard.dk 70 i--- Err adamsgaard.dk 70 1diff --git a/dwm.c b/dwm.c /src/dwm/file/dwm.c.gph adamsgaard.dk 70 it@@ -1167,14 +1167,15 @@ monocle(Monitor *m) Err adamsgaard.dk 70 i unsigned int n = 0; Err adamsgaard.dk 70 i Client *c; Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i- for (c = m->clients; c; c = c->next) Err adamsgaard.dk 70 i+ for (c = m->clients; c; c = c->next) { Err adamsgaard.dk 70 i+ c->bw = 0; Err adamsgaard.dk 70 i if (ISVISIBLE(c)) Err adamsgaard.dk 70 i n++; Err adamsgaard.dk 70 i+ } Err adamsgaard.dk 70 i if (n > 0) /* override layout symbol */ Err adamsgaard.dk 70 i snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n); Err adamsgaard.dk 70 i for (c = nexttiled(m->clients); c; c = nexttiled(c->next)) Err adamsgaard.dk 70 i- resize(c, m->wx - borderpx, m->wy - borderpx, Err adamsgaard.dk 70 i- m->ww, m->wh, 0); Err adamsgaard.dk 70 i+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i void Err adamsgaard.dk 70 it@@ -1735,34 +1736,35 @@ tagmon(const Arg *arg) Err adamsgaard.dk 70 i void Err adamsgaard.dk 70 i tile(Monitor *m) Err adamsgaard.dk 70 i { Err adamsgaard.dk 70 i- unsigned int i, n, h, mw, my, ty, bw = borderpx; Err adamsgaard.dk 70 i+ unsigned int i, n, h, mw, my, ty; Err adamsgaard.dk 70 i Client *c; Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); Err adamsgaard.dk 70 i if (n == 0) Err adamsgaard.dk 70 i return; Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i- if (n == 1) Err adamsgaard.dk 70 i- bw = 0; Err adamsgaard.dk 70 i- Err adamsgaard.dk 70 i if (n > m->nmaster) Err adamsgaard.dk 70 i mw = m->nmaster ? m->ww * m->mfact : 0; Err adamsgaard.dk 70 i else Err adamsgaard.dk 70 i mw = m->ww; Err adamsgaard.dk 70 i- for (i = 0, my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) Err adamsgaard.dk 70 i+ for (i = 0, my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { Err adamsgaard.dk 70 i+ if (n == 1) Err adamsgaard.dk 70 i+ c->bw = 0; Err adamsgaard.dk 70 i+ else Err adamsgaard.dk 70 i+ c->bw = borderpx; Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i if (i < m->nmaster) { Err adamsgaard.dk 70 i h = (m->wh - my) / (MIN(n, m->nmaster) - i); Err adamsgaard.dk 70 i- resize(c, m->wx - (borderpx - bw), m->wy + my - (borderpx - bw), Err adamsgaard.dk 70 i- mw - 2*bw, h - 2*bw, 0); Err adamsgaard.dk 70 i+ resize(c, m->wx, m->wy, mw - (2*c->bw), h - (2*c->bw), 0); Err adamsgaard.dk 70 i if (my + HEIGHT(c) < m->wh) Err adamsgaard.dk 70 i my += HEIGHT(c); Err adamsgaard.dk 70 i } else { Err adamsgaard.dk 70 i h = (m->wh - ty) / (n - i); Err adamsgaard.dk 70 i- resize(c, m->wx + mw, m->wy + ty, m->ww - mw - 2*bw, h - 2*bw, 0); Err adamsgaard.dk 70 i+ resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); Err adamsgaard.dk 70 i if (ty + HEIGHT(c) < m->wh) Err adamsgaard.dk 70 i ty += HEIGHT(c); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i+ } Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i void Err adamsgaard.dk 70 .