tMerge branch 'master' of src.adamsgaard.dk:dwm - dwm - [fork] customized build of dwm, the dynamic window manager
(HTM) git clone git://src.adamsgaard.dk/dwm
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 467e0b3b4d00d0dffa18d314dcf9fb4d76fb373f
(DIR) parent 66a03284ef5356a2561c307754836cfbe196c9be
(HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Thu, 17 Dec 2020 12:35:44 +0100
Merge branch 'master' of src.adamsgaard.dk:dwm
Diffstat:
M dwm.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
---
(DIR) diff --git a/dwm.c b/dwm.c
t@@ -1167,14 +1167,15 @@ monocle(Monitor *m)
unsigned int n = 0;
Client *c;
- for (c = m->clients; c; c = c->next)
+ for (c = m->clients; c; c = c->next) {
+ c->bw = 0;
if (ISVISIBLE(c))
n++;
+ }
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 - borderpx, m->wy - borderpx,
- m->ww, m->wh, 0);
+ resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
}
void
t@@ -1735,34 +1736,35 @@ tagmon(const Arg *arg)
void
tile(Monitor *m)
{
- unsigned int i, n, h, mw, my, ty, bw = borderpx;
+ unsigned int i, n, h, mw, my, ty;
Client *c;
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
if (n == 0)
return;
- if (n == 1)
- bw = 0;
-
if (n > m->nmaster)
mw = m->nmaster ? m->ww * m->mfact : 0;
else
mw = m->ww;
- for (i = 0, my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+ for (i = 0, my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
+ if (n == 1)
+ c->bw = 0;
+ else
+ c->bw = borderpx;
if (i < m->nmaster) {
h = (m->wh - my) / (MIN(n, m->nmaster) - i);
- resize(c, m->wx - (borderpx - bw), m->wy + my - (borderpx - bw),
- mw - 2*bw, h - 2*bw, 0);
+ resize(c, m->wx, m->wy, 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*bw, h - 2*bw, 0);
+ 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