From ef95baef73f3aef6bedff68034a221382323b49b Mon Sep 17 00:00:00 2001
From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com>
Date: Sun, 27 Sep 2026 17:01:52 +0200
Subject: [PATCH] gaplessgrid: rebase to latest main

---
 patches/gaplessgrid/README.md                 |  3 +-
 ...sgrid.patch => gaplessgrid-20260228.patch} |  0
 .../gaplessgrid/gaplessgrid-20260927.patch    | 89 +++++++++++++++++++
 3 files changed, 91 insertions(+), 1 deletion(-)
 rename patches/gaplessgrid/{gaplessgrid.patch => gaplessgrid-20260228.patch} (100%)
 create mode 100644 patches/gaplessgrid/gaplessgrid-20260927.patch

diff --git a/patches/gaplessgrid/README.md b/patches/gaplessgrid/README.md
index b22ead8..ba19009 100644
--- a/patches/gaplessgrid/README.md
+++ b/patches/gaplessgrid/README.md
@@ -4,7 +4,8 @@ Arranges windows in a grid. Except it adjusts the number of windows in the first
 On widescreens (w > 2*h), it splits to three columns before splitting rows.
 
 ### Download
-- [v0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid.patch)
+- [2026-09-27](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid-20260927.patch)
+- [v0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid-20260228.patch)
 - [2025-10-31](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid-20251031.patch)
 - [2024-09-18](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid-20240918.patch)
 - [2024-07-14](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gaplessgrid/gaplessgrid-20240714.patch)
diff --git a/patches/gaplessgrid/gaplessgrid.patch b/patches/gaplessgrid/gaplessgrid-20260228.patch
similarity index 100%
rename from patches/gaplessgrid/gaplessgrid.patch
rename to patches/gaplessgrid/gaplessgrid-20260228.patch
diff --git a/patches/gaplessgrid/gaplessgrid-20260927.patch b/patches/gaplessgrid/gaplessgrid-20260927.patch
new file mode 100644
index 0000000..f63fdc4
--- /dev/null
+++ b/patches/gaplessgrid/gaplessgrid-20260927.patch
@@ -0,0 +1,89 @@
+diff --git a/config.def.h b/config.def.h
+index a4019d3..d596f0c 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -34,6 +34,7 @@ static const Layout layouts[] = {
+ 	{ "[]=",      tile },
+ 	{ "><>",      NULL },    /* no layout function means floating behavior */
+ 	{ "[M]",      monocle },
++	{ "###",      gaplessgrid },
+ };
+ 
+ /* monitors */
+@@ -135,6 +136,7 @@ static const Key keys[] = {
+ 	{ MODKEY,                    XKB_KEY_t,           setlayout,        {.v = &layouts[0]} },
+ 	{ MODKEY,                    XKB_KEY_f,           setlayout,        {.v = &layouts[1]} },
+ 	{ MODKEY,                    XKB_KEY_m,           setlayout,        {.v = &layouts[2]} },
++	{ MODKEY,                    XKB_KEY_g,           setlayout,        {.v = &layouts[3]} },
+ 	{ MODKEY,                    XKB_KEY_space,       setlayout,        {0} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,       togglefloating,   {0} },
+ 	{ MODKEY,                    XKB_KEY_e,           togglefullscreen, {0} },
+diff --git a/dwl.c b/dwl.c
+index cca1ea4..9c0ed3c 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -311,6 +311,7 @@ static void focusstack(const Arg *arg);
+ static Client *focustop(Monitor *m);
+ static void fullscreennotify(struct wl_listener *listener, void *data);
+ static void gpureset(struct wl_listener *listener, void *data);
++static void gaplessgrid(Monitor *m);
+ static void handlesig(int signo);
+ static void incnmaster(const Arg *arg);
+ static void inputdevice(struct wl_listener *listener, void *data);
+@@ -1696,6 +1697,56 @@ handlesig(int signo)
+ 		quit(NULL);
+ }
+ 
++void
++gaplessgrid(Monitor *m)
++{
++	unsigned int n = 0, i = 0, ch, cw, cn, rn, rows, cols;
++	Client *c;
++
++	wl_list_for_each(c, &clients, link)
++		if (VISIBLEON(c, m) && !c->isfloating)
++			n++;
++	if (n == 0)
++		return;
++
++	/* grid dimensions */
++	for (cols = 0; cols <= (n / 2); cols++)
++		if ((cols * cols) >= n)
++			break;
++
++	if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
++		cols = 2;
++
++    /* widescreen is better if 3 columns */
++    if (n >= 3 && n <= 6 && (m->w.width / m->w.height) > 1)
++        cols = 3;
++
++	rows = n / cols;
++    
++	/* window geometries */
++	cw = cols ? m->w.width / cols : m->w.width;
++	cn = 0; /* current column number */
++	rn = 0; /* current row number */
++	wl_list_for_each(c, &clients, link) {
++		unsigned int cx, cy;
++		if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
++			continue;
++
++		if ((i / rows + 1) > (cols - n % cols))
++			rows = n / cols + 1;
++		ch = rows ? m->w.height / rows : m->w.height;
++		cx = m->w.x + cn * cw;
++		cy = m->w.y + rn * ch;
++		resize(c, (struct wlr_box) { cx, cy, cw, ch}, 0);
++		rn++;
++		if (rn >= rows) {
++			rn = 0;
++			cn++;
++		}
++		i++;
++	}
++}
++
+ void
+ incnmaster(const Arg *arg)
+ {