From b50498d7a7216efdde40a06ccddbaaa56c8f7751 Mon Sep 17 00:00:00 2001
From: Malfurious <m@lfurio.us>
Date: Sat, 3 Jun 2023 22:46:54 -0400
Subject: Resolve conflicts
---
dwm.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/dwm.c b/dwm.c
index 8b925a6..3d8f11a 100644
--- a/dwm.c
+++ b/dwm.c
@@ -833,7 +833,7 @@ drawbar(Monitor *m)
Client *c;
char taglabel[64];
char *masterclientontag[LENGTH(tags)];
- w = blw = TEXTW(m->ltsymbol);
+ w = TEXTW(m->ltsymbol);
/* clear bar from last draw */
drw_setscheme(drw, scheme[SchemeNorm]);
@@ -1919,11 +1919,11 @@ col(Monitor *m)
for (i = x = y = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) {
w = (mw - x) / (MIN(n, m->nmaster) - i);
- resize(c, x + m->wx, m->wy, w - (2 * c->bw), m->wh - (2 * c->bw), 0);
+ resize(c, x + m->wx, m->wy, w - (2 * c->bw), m->wh - (2 * c->bw), c->bw, 0);
x += WIDTH(c);
} else {
h = (m->wh - y) / (n - i);
- resize(c, x + m->wx, m->wy + y, m->ww - x - (2 * c->bw), h - (2 * c->bw), 0);
+ resize(c, x + m->wx, m->wy + y, m->ww - x - (2 * c->bw), h - (2 * c->bw), c->bw, 0);
y += HEIGHT(c);
}
}
@@ -2657,19 +2657,19 @@ centeredmaster(Monitor *m)
* of the screen */
h = (m->wh - my) / (MIN(n, m->nmaster) - i);
resize(c, m->wx + mx, m->wy + my, mw - (2*c->bw),
- h - (2*c->bw), 0);
+ h - (2*c->bw), c->bw, 0);
my += HEIGHT(c);
} else {
/* stack clients are stacked vertically */
if ((i - m->nmaster) % 2 ) {
h = (m->wh - ety) / ( (1 + n - i) / 2);
resize(c, m->wx, m->wy + ety, tw - (2*c->bw),
- h - (2*c->bw), 0);
+ h - (2*c->bw), c->bw, 0);
ety += HEIGHT(c);
} else {
h = (m->wh - oty) / ((1 + n - i) / 2);
resize(c, m->wx + mx + mw, m->wy + oty,
- tw - (2*c->bw), h - (2*c->bw), 0);
+ tw - (2*c->bw), h - (2*c->bw), c->bw, 0);
oty += HEIGHT(c);
}
}
@@ -2712,13 +2712,13 @@ centeredfloatingmaster(Monitor *m)
* of the screen */
w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i);
resize(c, m->wx + mx, m->wy + my, w - (2*c->bw),
- mh - (2*c->bw), 0);
+ mh - (2*c->bw), c->bw, 0);
mx += WIDTH(c);
} else {
/* stack clients are stacked horizontally */
w = (m->ww - tx) / (n - i);
resize(c, m->wx + tx, m->wy, w - (2*c->bw),
- m->wh - (2*c->bw), 0);
+ m->wh - (2*c->bw), c->bw, 0);
tx += WIDTH(c);
}
}
@@ -2746,7 +2746,7 @@ grid(Monitor *m) {
/* adjust height/width of last row/column's windows */
ah = ((i + 1) % rows == 0) ? m->wh - ch * rows : 0;
aw = (i >= rows * (cols - 1)) ? m->ww - cw * cols : 0;
- resize(c, cx, cy, cw - 2 * c->bw + aw, ch - 2 * c->bw + ah, False);
+ resize(c, cx, cy, cw - 2 * c->bw + aw, ch - 2 * c->bw + ah, c->bw, 0);
i++;
}
}
--
cgit v1.2.3