From 4de9dfa4625a98ad1088e34a79115ed7ef5714a2 Mon Sep 17 00:00:00 2001
From: TolaMironcenko <mironcenkotola@gmail.com>
Date: Wed, 10 Jul 2024 10:43:08 +0700
Subject: [PATCH] flexical gaps in dwm

---
 dwm/dwm/config.def.h |   2 +-
 dwm/dwm/config.h     |   2 +-
 dwm/dwm/dwm          | Bin 68408 -> 68408 bytes
 dwm/dwm/dwm.c        |  45 ++++++++++++++++++++++++++++---------------
 dwm/dwm/dwm.o        | Bin 62592 -> 62592 bytes
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/dwm/dwm/config.def.h b/dwm/dwm/config.def.h
index 29b6ddd..2dfbd43 100644
--- a/dwm/dwm/config.def.h
+++ b/dwm/dwm/config.def.h
@@ -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 } },
diff --git a/dwm/dwm/config.h b/dwm/dwm/config.h
index 6a4e874..37282fc 100644
--- a/dwm/dwm/config.h
+++ b/dwm/dwm/config.h
@@ -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} },
diff --git a/dwm/dwm/dwm b/dwm/dwm/dwm
index 62d08f4322330d30b0d94c674f9233ba5fecc093..e18bf85d6d52daa82c5eaee84022544f7028a26f 100755
GIT binary patch
delta 42
zcmV+_0M-AvmISz#1h9w$6v-;E@l5_{%TPMbQE_%Xs6l_om9v}!EWiP7v&qA6N3Vhu
AIsgCw

delta 42
zcmV+_0M-AvmISz#1h9w$6iUuv*|}oF^6&74Dmw_^+Usa|0<)Y0EWiOUv&qA6N5mQw
A(f|Me

diff --git a/dwm/dwm/dwm.c b/dwm/dwm/dwm.c
index 0c92415..10bb8c9 100644
--- a/dwm/dwm/dwm.c
+++ b/dwm/dwm/dwm.c
@@ -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) {
diff --git a/dwm/dwm/dwm.o b/dwm/dwm/dwm.o
index 27d5ac0178623482fe2c1480ccfbdae351cb90a5..c44ee4db42ec6613a7e405a386b3f5649ed487d3 100644
GIT binary patch
delta 20
ccmZp8$=vXgdBX`m#=OZBy~Q^_@LRAH0A#TVx&QzG

delta 22
ecmZp8$=vXgdBX|6$sB<KlNWe%Y<}RkU?~7~s0v2_