From 4c1f74e96f6be03a581196ad015d3b693b30e0a1 Mon Sep 17 00:00:00 2001
From: A Frederick Christensen <dwl@ivories.org>
Date: Sun, 13 Sep 2026 19:48:48 -0500
Subject: [PATCH] simpleborders: update filename structure and add version

---
 patches/simpleborders/README.md               |  5 +-
 ...ders-0.8.patch => simpleborders_0.8.patch} |  0
 .../simpleborders_main-5fd19fe.patch          | 61 +++++++++++++++++++
 ... simpleborders_wlroots-next-f4249db.patch} |  0
 4 files changed, 64 insertions(+), 2 deletions(-)
 rename patches/simpleborders/{simpleborders-0.8.patch => simpleborders_0.8.patch} (100%)
 create mode 100644 patches/simpleborders/simpleborders_main-5fd19fe.patch
 rename patches/simpleborders/{simpleborders-wlroots-next-f4249db.patch => simpleborders_wlroots-next-f4249db.patch} (100%)

diff --git a/patches/simpleborders/README.md b/patches/simpleborders/README.md
index 4fe9e68..da9b4ce 100644
--- a/patches/simpleborders/README.md
+++ b/patches/simpleborders/README.md
@@ -4,8 +4,9 @@ Like smartborders. Don't put borders when there is only one window on the screen
 
 ### Download
 - [git branch](https://codeberg.org/bencc/dwl/src/branch/simpleborders)
-- [simpleborders-wlroots-next-f4249db](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-wlroots-next-f4249db.patch)
-- [simpleborders-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-v0.8.patch)
+- [simpleborders_main-5fd19fe.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders_main-5fd19fe.patch)
+- [simpleborders_wlroots-next-f4249db.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders_wlroots-next-f4249db.patch)
+- [simpleborders_0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders_0.8.patch)
 
 ### Authors
 - [A Frederick Christensen](https://codeberg.org/fauxmight)
diff --git a/patches/simpleborders/simpleborders-0.8.patch b/patches/simpleborders/simpleborders_0.8.patch
similarity index 100%
rename from patches/simpleborders/simpleborders-0.8.patch
rename to patches/simpleborders/simpleborders_0.8.patch
diff --git a/patches/simpleborders/simpleborders_main-5fd19fe.patch b/patches/simpleborders/simpleborders_main-5fd19fe.patch
new file mode 100644
index 0000000..0949095
--- /dev/null
+++ b/patches/simpleborders/simpleborders_main-5fd19fe.patch
@@ -0,0 +1,61 @@
+diff --git a/dwl.c b/dwl.c
+index f902ace..5c3f0ee 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -275,6 +275,7 @@ static void closemon(Monitor *m);
+ static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
+ static void commitnotify(struct wl_listener *listener, void *data);
+ static void commitpopup(struct wl_listener *listener, void *data);
++static int countclients(Monitor *m);
+ static void createdecoration(struct wl_listener *listener, void *data);
+ static void createidleinhibitor(struct wl_listener *listener, void *data);
+ static void createkeyboard(struct wlr_keyboard *keyboard);
+@@ -323,6 +324,7 @@ static void motionnotify(uint32_t time, struct wlr_input_device *device, double
+ 		double sy, double sx_unaccel, double sy_unaccel);
+ static void motionrelative(struct wl_listener *listener, void *data);
+ static void moveresize(const Arg *arg);
++static int needsborder(Client *c);
+ static void outputmgrapply(struct wl_listener *listener, void *data);
+ static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
+ static void outputmgrtest(struct wl_listener *listener, void *data);
+@@ -991,6 +993,17 @@ commitpopup(struct wl_listener *listener, void *data)
+ 	free(listener);
+ }
+ 
++int
++countclients(Monitor *m)
++{
++	unsigned int n = 0;
++	Client *c;
++	wl_list_for_each(c, &clients, link)
++		if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen)
++			n++;
++	return n;
++}
++
+ void
+ createdecoration(struct wl_listener *listener, void *data)
+ {
+@@ -2099,6 +2112,14 @@ moveresize(const Arg *arg)
+ 	}
+ }
+ 
++int
++needsborder(Client *c) {
++	return ((countclients(c->mon) > 1
++			&& c->mon->lt[c->mon->sellt]->arrange != monocle)
++		|| c->isfloating)
++		&& !c->isfullscreen;
++}
++
+ void
+ outputmgrapply(struct wl_listener *listener, void *data)
+ {
+@@ -2330,6 +2351,7 @@ resize(Client *c, struct wlr_box geo, int interact)
+ 
+ 	client_set_bounds(c, geo.width, geo.height);
+ 	c->geom = geo;
++	c->bw = needsborder(c) ? borderpx : 0;
+ 	applybounds(c, bbox);
+ 
+ 	/* Update scene-graph, including borders */
diff --git a/patches/simpleborders/simpleborders-wlroots-next-f4249db.patch b/patches/simpleborders/simpleborders_wlroots-next-f4249db.patch
similarity index 100%
rename from patches/simpleborders/simpleborders-wlroots-next-f4249db.patch
rename to patches/simpleborders/simpleborders_wlroots-next-f4249db.patch