flexical gaps in dwm

This commit is contained in:
wt committed 2024-07-10 10:43:08 +07:00
1 parent 0d726cb340
commit 4de9dfa462
5 files changed
+32 -17

No files matched your search

+1 -1
View File
@@ -142,7 +142,7 @@ static const Key keys[] = {
//------------------------------------ gaps ----------------------------
{ MODKEY|ShiftMask, XK_minus, setgaps, {.i = -1 } },
{ MODKEY|ShiftMask, XK_equal, setgaps, {.i = +1 } },
{ MODKEY|ShiftMask, XK_0, setgaps, {.i = 0 } },
{ MODKEY|ShiftMask, XK_n, setgaps, {.i = 0 } },
//----------------------------------------------------------------------
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
+1 -1
View File
@@ -141,7 +141,7 @@ static const Key keys[] = {
//------------------------------------ gaps ----------------------------
{ MODKEY|ShiftMask, XK_minus, setgaps, {.i = -1 } },
{ MODKEY|ShiftMask, XK_equal, setgaps, {.i = +1 } },
{ MODKEY|ShiftMask, XK_0, setgaps, {.i = 0 } },
{ MODKEY|ShiftMask, XK_n, setgaps, {.i = 0 } },
//----------------------------------------------------------------------
{ MODKEY, XK_b, togglebar, {0} },
BIN
View File
Binary file not shown.
+30 -15
View File
@@ -1699,7 +1699,7 @@ tagmon(const Arg *arg)
void
tile(Monitor *m)
{
unsigned int i, n, h, r, mw, my, ty;
unsigned int i, n, h, mw, my, ty;
Client *c;
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
@@ -1710,21 +1710,36 @@ tile(Monitor *m)
mw = m->nmaster ? m->ww * m->mfact : 0;
else
mw = m->ww - m->gap;
for (i = 0, my = ty = m->gap, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
if (i < m->nmaster) {
h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gap;
resize(c, m->wx + m->gap, m->wy + my, mw - (2*c->bw) - m->gap, h - (2*c->bw), 0);
if (my + HEIGHT(c) + m->gap < m->wh) {
my += HEIGHT(c) + m->gap;
}
} else {
h = (m->wh - ty) / (n - i) - m->gap;
resize(c, m->wx + mw + m->gap, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gap, h - (2*c->bw), 0);
if (ty + HEIGHT(c) + m->gap < m->wh) {
ty += HEIGHT(c) + m->gap;
}
}
for (i = 0, my = ty = m->gap, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
if (i < m->nmaster) {
h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gap;
resize(c, m->wx + m->gap, m->wy + my, mw - (2*c->bw) - m->gap, h - (2*c->bw), 0);
if (my + HEIGHT(c) + m->gap < m->wh)
my += HEIGHT(c) + m->gap;
} else {
h = (m->wh - ty) / (n - i) - m->gap;
resize(c, m->wx + mw + m->gap, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gap, h - (2*c->bw), 0);
if (ty + HEIGHT(c) + m->gap < m->wh)
ty += HEIGHT(c) + m->gap;
}
}
// mw = m->ww - m->gap;
// for (i = 0, my = ty = m->gap, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
// if (i < m->nmaster) {
// h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gap;
// resize(c, m->wx + m->gap, m->wy + my, mw - (2*c->bw) - m->gap, h - (2*c->bw), 0);
// if (my + HEIGHT(c) + m->gap < m->wh) {
// my += HEIGHT(c) + m->gap;
// }
// } else {
// h = (m->wh - ty) / (n - i) - m->gap;
// resize(c, m->wx + mw + m->gap, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gap, h - (2*c->bw), 0);
// if (ty + HEIGHT(c) + m->gap < m->wh) {
// ty += HEIGHT(c) + m->gap;
// }
// }
// }
// }
// mw = m->ww;
// for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
// if (i < m->nmaster) {
BIN
View File
Binary file not shown.