jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2026-03-22 08:51:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simpleborders: Update for 0.8 and for wlroots-next-f4249db

Browse Source
This commit is contained in:
A Frederick Christensen 2026-02-25 20:18:52 -06:00
parent 1988d629ec
commit c17c9983b5
No known key found for this signature in database
GPG Key ID: 6183FA655784FC36
3 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/simpleborders/README.md
View File

@ -2,12 +2,10 @@
Like smartborders. Don't put borders when there is only one window on the screen. 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 ### Download
- [git branch](https://codeberg.org/bencc/dwl/src/branch/simpleborders) - [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) - [simpleborders-wlroots-next-f4249db](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-wlroots-next-f4249db.patch)
- [v0.6](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-v0.6.patch) - [simpleborders-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simpleborders/simpleborders-v0.8.patch)
### Authors ### Authors
- [Ben Collerson](https://codeberg.org/bencc) - [Ben Collerson](https://codeberg.org/bencc)

30
patches/simpleborders/simpleborders-v0.6.patch → patches/simpleborders/simpleborders-0.8.patch
View File

@ -1,34 +1,34 @@
From 681e520deaeee460647de36f5312af3cb0c31f4a Mon Sep 17 00:00:00 2001 From 41eb0c0d196d302790ae87a5ca1a4da660864f10 Mon Sep 17 00:00:00 2001
From: Ben Collerson <benc@benc.cc> From: A Frederick Christensen <dwl@ivories.org>
Date: Sat, 30 Dec 2023 13:39:31 +1000 Date: Wed, 25 Feb 2026 20:11:56 -0600
Subject: [PATCH] simpleborders Subject: [PATCH] Apply simpleborders patch
--- ---
dwl.c | 22 ++++++++++++++++++++++ dwl.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+) 1 file changed, 22 insertions(+)
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 4d19357..900e651 100644 index 44f3ad9..defe2a8 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -245,6 +245,7 @@ static void cleanupmon(struct wl_listener *listener, void *data); @@ -257,6 +257,7 @@ static void closemon(Monitor *m);
static void closemon(Monitor *m);
static void commitlayersurfacenotify(struct wl_listener *listener, void *data); static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
static void commitnotify(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 int countclients(Monitor *m);
static void createdecoration(struct wl_listener *listener, void *data); static void createdecoration(struct wl_listener *listener, void *data);
static void createidleinhibitor(struct wl_listener *listener, void *data); static void createidleinhibitor(struct wl_listener *listener, void *data);
static void createkeyboard(struct wlr_keyboard *keyboard); static void createkeyboard(struct wlr_keyboard *keyboard);
@@ -286,6 +287,7 @@ static void motionabsolute(struct wl_listener *listener, void *data); @@ -305,6 +306,7 @@ static void motionnotify(uint32_t time, struct wlr_input_device *device, double
static void motionnotify(uint32_t time); double sy, double sx_unaccel, double sy_unaccel);
static void motionrelative(struct wl_listener *listener, void *data); static void motionrelative(struct wl_listener *listener, void *data);
static void moveresize(const Arg *arg); static void moveresize(const Arg *arg);
+static int needsborder(Client *c); +static int needsborder(Client *c);
static void outputmgrapply(struct wl_listener *listener, void *data); static void outputmgrapply(struct wl_listener *listener, void *data);
static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test); static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
static void outputmgrtest(struct wl_listener *listener, void *data); static void outputmgrtest(struct wl_listener *listener, void *data);
@@ -739,6 +741,17 @@ commitnotify(struct wl_listener *listener, void *data) @@ -915,6 +917,17 @@ commitpopup(struct wl_listener *listener, void *data)
c->resize = 0; free(listener);
} }
+int +int
@ -45,7 +45,7 @@ index 4d19357..900e651 100644
void void
createdecoration(struct wl_listener *listener, void *data) 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 void
outputmgrapply(struct wl_listener *listener, void *data) outputmgrapply(struct wl_listener *listener, void *data)
{ {
@@ -1930,6 +1951,7 @@ resize(Client *c, struct wlr_box geo, int interact) @@ -2215,6 +2236,7 @@ resize(Client *c, struct wlr_box geo, int interact)
struct wlr_box clip;
client_set_bounds(c, geo.width, geo.height); client_set_bounds(c, geo.width, geo.height);
c->geom = geo; c->geom = geo;
+ c->bw = needsborder(c) ? borderpx : 0; + c->bw = needsborder(c) ? borderpx : 0;
@ -69,5 +69,5 @@ index 4d19357..900e651 100644
/* Update scene-graph, including borders */ /* Update scene-graph, including borders */
-- --
2.43.0 2.52.0

22
patches/simpleborders/simpleborders-v0.7.patch → patches/simpleborders/simpleborders-wlroots-next-f4249db.patch
View File

@ -1,14 +1,14 @@
From 09759c3ef75158c366e9fc63814485fbb31a3ccf Mon Sep 17 00:00:00 2001 From 33364ee84f8063813fbdb8b319965a87f63e2694 Mon Sep 17 00:00:00 2001
From: Ben Collerson <benc@benc.cc> From: A Frederick Christensen <dwl@ivories.org>
Date: Sat, 30 Dec 2023 13:39:31 +1000 Date: Wed, 25 Feb 2026 20:14:28 -0600
Subject: [PATCH] simpleborders Subject: [PATCH] Apply simpleborders patch
--- ---
dwl.c | 22 ++++++++++++++++++++++ dwl.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+) 1 file changed, 22 insertions(+)
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index a2711f67..415fe1a0 100644 index 8a9715d..a3caac8 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -259,6 +259,7 @@ static void closemon(Monitor *m); @@ -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 createdecoration(struct wl_listener *listener, void *data);
static void createidleinhibitor(struct wl_listener *listener, void *data); static void createidleinhibitor(struct wl_listener *listener, void *data);
static void createkeyboard(struct wlr_keyboard *keyboard); 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); double sy, double sx_unaccel, double sy_unaccel);
static void motionrelative(struct wl_listener *listener, void *data); static void motionrelative(struct wl_listener *listener, void *data);
static void moveresize(const Arg *arg); 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 outputmgrapply(struct wl_listener *listener, void *data);
static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test); static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int test);
static void outputmgrtest(struct wl_listener *listener, void *data); static void outputmgrtest(struct wl_listener *listener, void *data);
@@ -849,6 +851,17 @@ commitpopup(struct wl_listener *listener, void *data) @@ -917,6 +919,17 @@ commitpopup(struct wl_listener *listener, void *data)
wl_list_remove(&listener->link); free(listener);
} }
+int +int
@ -45,7 +45,7 @@ index a2711f67..415fe1a0 100644
void void
createdecoration(struct wl_listener *listener, void *data) 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 void
outputmgrapply(struct wl_listener *listener, void *data) 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); client_set_bounds(c, geo.width, geo.height);
c->geom = geo; c->geom = geo;
@ -69,5 +69,5 @@ index a2711f67..415fe1a0 100644
/* Update scene-graph, including borders */ /* Update scene-graph, including borders */
-- --
2.45.2 2.52.0