From c17c9983b5c030e3663d9b19311d2d942e553e78 Mon Sep 17 00:00:00 2001 From: A Frederick Christensen Date: Wed, 25 Feb 2026 20:18:52 -0600 Subject: [PATCH] simpleborders: Update for 0.8 and for wlroots-next-f4249db --- patches/simpleborders/README.md | 8 ++--- ...ers-v0.6.patch => simpleborders-0.8.patch} | 30 +++++++++---------- ... simpleborders-wlroots-next-f4249db.patch} | 22 +++++++------- 3 files changed, 29 insertions(+), 31 deletions(-) rename patches/simpleborders/{simpleborders-v0.6.patch => simpleborders-0.8.patch} (69%) rename patches/simpleborders/{simpleborders-v0.7.patch => simpleborders-wlroots-next-f4249db.patch} (78%) diff --git a/patches/simpleborders/README.md b/patches/simpleborders/README.md index 29dcf5e..50339ee 100644 --- a/patches/simpleborders/README.md +++ b/patches/simpleborders/README.md @@ -2,12 +2,10 @@ Like smartborders. Don't put borders when there is only one window on the screen. -The patch for tag v0.7 below appears to apply cleanly to the current HEAD of -upstream/main as at 2024-10-11. - ### Download - [git branch](https://codeberg.org/bencc/dwl/src/branch/simpleborders) -- [v0.7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-v0.7.patch) -- [v0.6](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-v0.6.patch) +- [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) + ### Authors - [Ben Collerson](https://codeberg.org/bencc) diff --git a/patches/simpleborders/simpleborders-v0.6.patch b/patches/simpleborders/simpleborders-0.8.patch similarity index 69% rename from patches/simpleborders/simpleborders-v0.6.patch rename to patches/simpleborders/simpleborders-0.8.patch index a4797bb..f9db086 100644 --- a/patches/simpleborders/simpleborders-v0.6.patch +++ b/patches/simpleborders/simpleborders-0.8.patch @@ -1,34 +1,34 @@ -From 681e520deaeee460647de36f5312af3cb0c31f4a Mon Sep 17 00:00:00 2001 -From: Ben Collerson -Date: Sat, 30 Dec 2023 13:39:31 +1000 -Subject: [PATCH] simpleborders +From 41eb0c0d196d302790ae87a5ca1a4da660864f10 Mon Sep 17 00:00:00 2001 +From: A Frederick Christensen +Date: Wed, 25 Feb 2026 20:11:56 -0600 +Subject: [PATCH] Apply simpleborders patch --- dwl.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dwl.c b/dwl.c -index 4d19357..900e651 100644 +index 44f3ad9..defe2a8 100644 --- a/dwl.c +++ b/dwl.c -@@ -245,6 +245,7 @@ static void cleanupmon(struct wl_listener *listener, void *data); - static void closemon(Monitor *m); +@@ -257,6 +257,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); -@@ -286,6 +287,7 @@ static void motionabsolute(struct wl_listener *listener, void *data); - static void motionnotify(uint32_t time); +@@ -305,6 +306,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); -@@ -739,6 +741,17 @@ commitnotify(struct wl_listener *listener, void *data) - c->resize = 0; +@@ -915,6 +917,17 @@ commitpopup(struct wl_listener *listener, void *data) + free(listener); } +int @@ -45,7 +45,7 @@ index 4d19357..900e651 100644 void createdecoration(struct wl_listener *listener, void *data) { -@@ -1697,6 +1710,14 @@ moveresize(const Arg *arg) +@@ -1980,6 +1993,14 @@ moveresize(const Arg *arg) } } @@ -60,8 +60,8 @@ index 4d19357..900e651 100644 void outputmgrapply(struct wl_listener *listener, void *data) { -@@ -1930,6 +1951,7 @@ resize(Client *c, struct wlr_box geo, int interact) - struct wlr_box clip; +@@ -2215,6 +2236,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; @@ -69,5 +69,5 @@ index 4d19357..900e651 100644 /* Update scene-graph, including borders */ -- -2.43.0 +2.52.0 diff --git a/patches/simpleborders/simpleborders-v0.7.patch b/patches/simpleborders/simpleborders-wlroots-next-f4249db.patch similarity index 78% rename from patches/simpleborders/simpleborders-v0.7.patch rename to patches/simpleborders/simpleborders-wlroots-next-f4249db.patch index e782d84..ae0a95d 100644 --- a/patches/simpleborders/simpleborders-v0.7.patch +++ b/patches/simpleborders/simpleborders-wlroots-next-f4249db.patch @@ -1,14 +1,14 @@ -From 09759c3ef75158c366e9fc63814485fbb31a3ccf Mon Sep 17 00:00:00 2001 -From: Ben Collerson -Date: Sat, 30 Dec 2023 13:39:31 +1000 -Subject: [PATCH] simpleborders +From 33364ee84f8063813fbdb8b319965a87f63e2694 Mon Sep 17 00:00:00 2001 +From: A Frederick Christensen +Date: Wed, 25 Feb 2026 20:14:28 -0600 +Subject: [PATCH] Apply simpleborders patch --- dwl.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dwl.c b/dwl.c -index a2711f67..415fe1a0 100644 +index 8a9715d..a3caac8 100644 --- a/dwl.c +++ b/dwl.c @@ -259,6 +259,7 @@ static void closemon(Monitor *m); @@ -19,7 +19,7 @@ index a2711f67..415fe1a0 100644 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); -@@ -308,6 +309,7 @@ static void motionnotify(uint32_t time, struct wlr_input_device *device, double +@@ -307,6 +308,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); @@ -27,8 +27,8 @@ index a2711f67..415fe1a0 100644 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); -@@ -849,6 +851,17 @@ commitpopup(struct wl_listener *listener, void *data) - wl_list_remove(&listener->link); +@@ -917,6 +919,17 @@ commitpopup(struct wl_listener *listener, void *data) + free(listener); } +int @@ -45,7 +45,7 @@ index a2711f67..415fe1a0 100644 void createdecoration(struct wl_listener *listener, void *data) { -@@ -1927,6 +1940,14 @@ moveresize(const Arg *arg) +@@ -1982,6 +1995,14 @@ moveresize(const Arg *arg) } } @@ -60,7 +60,7 @@ index a2711f67..415fe1a0 100644 void outputmgrapply(struct wl_listener *listener, void *data) { -@@ -2190,6 +2211,7 @@ resize(Client *c, struct wlr_box geo, int interact) +@@ -2217,6 +2238,7 @@ resize(Client *c, struct wlr_box geo, int interact) client_set_bounds(c, geo.width, geo.height); c->geom = geo; @@ -69,5 +69,5 @@ index a2711f67..415fe1a0 100644 /* Update scene-graph, including borders */ -- -2.45.2 +2.52.0