diff --git a/patches/simpleborders/README.md b/patches/simpleborders/README.md index d9282cf..29dcf5e 100644 --- a/patches/simpleborders/README.md +++ b/patches/simpleborders/README.md @@ -1,9 +1,13 @@ ### Description + 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) -- [2024-06-18 applies to dwl wlroots-next branch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-wlrootsnext-20240618.patch) -- [2023-01-07](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders.patch) +- [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) ### Authors - [Ben Collerson](https://codeberg.org/bencc) diff --git a/patches/simpleborders/simpleborders.patch b/patches/simpleborders/simpleborders-v0.6.patch similarity index 100% rename from patches/simpleborders/simpleborders.patch rename to patches/simpleborders/simpleborders-v0.6.patch diff --git a/patches/simpleborders/simpleborders-wlrootsnext-20240618.patch b/patches/simpleborders/simpleborders-v0.7.patch similarity index 78% rename from patches/simpleborders/simpleborders-wlrootsnext-20240618.patch rename to patches/simpleborders/simpleborders-v0.7.patch index 827e3b8..e782d84 100644 --- a/patches/simpleborders/simpleborders-wlrootsnext-20240618.patch +++ b/patches/simpleborders/simpleborders-v0.7.patch @@ -1,4 +1,4 @@ -From 143b8d35f73f32be7f6a1f8e099144a38b4c5eb6 Mon Sep 17 00:00:00 2001 +From 09759c3ef75158c366e9fc63814485fbb31a3ccf Mon Sep 17 00:00:00 2001 From: Ben Collerson Date: Sat, 30 Dec 2023 13:39:31 +1000 Subject: [PATCH] simpleborders @@ -8,10 +8,10 @@ Subject: [PATCH] simpleborders 1 file changed, 22 insertions(+) diff --git a/dwl.c b/dwl.c -index 9890a6c..66760ec 100644 +index a2711f67..415fe1a0 100644 --- a/dwl.c +++ b/dwl.c -@@ -258,6 +258,7 @@ static void closemon(Monitor *m); +@@ -259,6 +259,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); @@ -19,7 +19,7 @@ index 9890a6c..66760ec 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); -@@ -307,6 +308,7 @@ static void motionnotify(uint32_t time, struct wlr_input_device *device, double +@@ -308,6 +309,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 9890a6c..66760ec 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); -@@ -804,6 +806,17 @@ commitnotify(struct wl_listener *listener, void *data) - c->resize = 0; +@@ -849,6 +851,17 @@ commitpopup(struct wl_listener *listener, void *data) + wl_list_remove(&listener->link); } +int @@ -43,9 +43,9 @@ index 9890a6c..66760ec 100644 +} + void - commitpopup(struct wl_listener *listener, void *data) + createdecoration(struct wl_listener *listener, void *data) { -@@ -1893,6 +1906,14 @@ moveresize(const Arg *arg) +@@ -1927,6 +1940,14 @@ moveresize(const Arg *arg) } } @@ -60,8 +60,8 @@ index 9890a6c..66760ec 100644 void outputmgrapply(struct wl_listener *listener, void *data) { -@@ -2127,6 +2148,7 @@ resize(Client *c, struct wlr_box geo, int interact) - struct wlr_box clip; +@@ -2190,6 +2211,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 9890a6c..66760ec 100644 /* Update scene-graph, including borders */ -- -2.44.1 +2.45.2