simple_scratchpad:

- Fixed broken media links
btrtile:
2026-06-20 15:02:45 +00:00 · 2026-05-21 01:13:24 +03:00 · 2026-05-21 01:12:03 +03:00 · 2026-05-21 01:05:17 +03:00 · 2026-05-21 00:54:00 +03:00
10 changed files with 965 additions and 893 deletions
@@ -4,7 +4,7 @@
 It provides a focus-driven, mouse- and keyboard-friendly tiling layout that grants you granular control over how clients are placed and resized.
-![btrtile in action](https://github.com/julmajustus/dwl-patches/blob/main/demos/btrtiledemo.gif?raw=true)
+![btrtile in action](https://codeberg.org/julmajustus/my-dwl-patches/raw/branch/main/demos/btrtiledemo.gif?raw=true)
 ---
@@ -1,23 +1,24 @@
-From ad32bb92157d5238340eb53322254dc8127477db Mon Sep 17 00:00:00 2001
+From 1520d1f200ef0fb381683c1bcd58e553b52ac289 Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
-Date: Sun, 17 May 2026 22:49:07 +0300
+Date: Thu, 21 May 2026 00:42:07 +0300
-Subject: [PATCH] btrtile resizing refactor
+Subject: [PATCH] btrtile: Spring update pt2
- Refactored the tiled client resizing logic to be more logical. Insted
+- Simplified the resizing logic to avoid full arrange calls from
-of resizing based on clients split nodes, now btrtile handles client resizing based on the nearest edge client edge on the resize direction. Now it handles also resizing of the clientless splitnodes and should feel more intuitive.
+motionnotify
 - Minor intend fixes
 ---
- btrtile.c    | 582 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ btrtile.c    | 583 +++++++++++++++++++++++++++++++++++++++++++++++++++
 config.def.h |  12 ++
- dwl.c        | 160 +++++++++++---
+ dwl.c        | 152 +++++++++++---
- 3 files changed, 727 insertions(+), 27 deletions(-)
+ 3 files changed, 720 insertions(+), 27 deletions(-)
 create mode 100644 btrtile.c
 diff --git a/btrtile.c b/btrtile.c
 new file mode 100644
-index 0000000..c63e59f
+index 0000000..f05a30f
 --- /dev/null
 +++ b/btrtile.c
-@@ -0,0 +1,582 @@
+@@ -0,0 +1,583 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
@@ -28,7 +29,7 @@ index 0000000..c63e59f
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/15 00:26:07 by julmajustus           ::    ::::::: ::   */
-+/*   Updated: 2026/05/17 22:00:31 by julmajustus            : :   : : :  :    */
+/*   Updated: 2026/05/20 22:38:02 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
@@ -63,7 +64,6 @@ index 0000000..c63e59f
 +static unsigned int visible_count(LayoutNode *node, Monitor *m);
 +static Client *xytoclient(double x, double y);
 +
 +static int resizing_from_mouse = 0;
 +static double resize_last_update_x, resize_last_update_y;
 +static uint32_t last_resize_time = 0;
 +
@@ -91,6 +91,9 @@ index 0000000..c63e59f
 +		c = node->client;
 +		if (!c || !VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
 +			return;
 +		if (area.x == c->old_geom.x && area.y == c->old_geom.y &&
 +				area.width == c->old_geom.width && area.height == c->old_geom.height)
 +			return;
 +		resize(c, area, 0);
 +		c->old_geom = area;
 +		return;
@@ -169,16 +172,16 @@ index 0000000..c63e59f
 +	LayoutNode *found;
 +	struct wlr_box full_area;
 +
-+    if (!m)
+	if (!m)
-+        return;
+		return;
 +
-+    /* Remove non tiled clients from tree. */
+	/* Remove non tiled clients from tree. */
-+    wl_list_for_each(c, &clients, link) {
+	wl_list_for_each(c, &clients, link) {
-+        if (c->mon == m && !c->isfloating && !c->isfullscreen) {
+		if (c->mon == m && !c->isfloating && !c->isfullscreen) {
-+        } else {
+		} else {
-+            remove_client(m, c);
+			remove_client(m, c);
-+        }
+		}
-+    }
+	}
 +
 +	/* If no client is found under cursor, fallback to focustop(m) */
 +	if (!(focused = xytoclient(cursor->x, cursor->y)))
@@ -272,7 +275,7 @@ index 0000000..c63e59f
 +
 +LayoutNode *
 +find_suitable_split(Monitor *m, LayoutNode *start_node,
-+                    unsigned int need_vertical, int focused_on_left)
+		unsigned int need_vertical, int focused_on_left)
 +{
 +	LayoutNode *n = start_node, *child = NULL;
 +
@@ -444,11 +447,11 @@ index 0000000..c63e59f
 +	if (!client_node)
 +		return;
 +
-+    focused_on_left = (arg->f >= 0.0f);
+	focused_on_left = (arg->f >= 0.0f);
 +
 +	split_node = find_suitable_split(selmon, client_node, need_vertical, focused_on_left);
 +
-+    if (!split_node)
+	if (!split_node)
 +		split_node = find_suitable_split(selmon, client_node, need_vertical, !focused_on_left);
 +	if (!split_node)
 +		return;
@@ -460,10 +463,9 @@ index 0000000..c63e59f
 +		new_ratio = 0.95f;
 +	split_node->split_ratio = new_ratio;
 +
 +	apply_layout(selmon, selmon->root, selmon->w, 1);
 +	/* Skip the arrange when called from motionnotify; that path calls
 +	 * arrange itself after rate-limiting. */
 +	if (!resizing_from_mouse)
 +		arrange(selmon);
 +}
 +
 +void
@@ -479,69 +481,69 @@ index 0000000..c63e59f
 +}
 +
 +void swapclients(const Arg *arg) {
-+    Client  *c, *tmp, *target = NULL, *sel = focustop(selmon);
+	Client  *c, *tmp, *target = NULL, *sel = focustop(selmon);
 +	LayoutNode *sel_node, *target_node;
-+    int closest_dist = INT_MAX, dist, sel_center_x, sel_center_y,
+	int closest_dist = INT_MAX, dist, sel_center_x, sel_center_y,
 +	cand_center_x, cand_center_y;
 +
-+    if (!sel || sel->isfullscreen ||
+	if (!sel || sel->isfullscreen ||
-+        !selmon->root || !selmon->lt[selmon->sellt]->arrange)
+			!selmon->root || !selmon->lt[selmon->sellt]->arrange)
-+        return;
+		return;
 +
 +
-+    /* Get the center coordinates of the selected client */
+	/* Get the center coordinates of the selected client */
-+    sel_center_x = sel->geom.x + sel->geom.width / 2;
+	sel_center_x = sel->geom.x + sel->geom.width / 2;
-+    sel_center_y = sel->geom.y + sel->geom.height / 2;
+	sel_center_y = sel->geom.y + sel->geom.height / 2;
 +
-+    wl_list_for_each(c, &clients, link) {
+	wl_list_for_each(c, &clients, link) {
-+        if (!VISIBLEON(c, selmon) || c->isfloating || c->isfullscreen || c == sel)
+		if (!VISIBLEON(c, selmon) || c->isfloating || c->isfullscreen || c == sel)
-+            continue;
+			continue;
 +
-+        /* Get the center of candidate client */
+		/* Get the center of candidate client */
-+        cand_center_x = c->geom.x + c->geom.width / 2;
+		cand_center_x = c->geom.x + c->geom.width / 2;
-+        cand_center_y = c->geom.y + c->geom.height / 2;
+		cand_center_y = c->geom.y + c->geom.height / 2;
 +
-+        /* Check that the candidate lies in the requested direction. */
+		/* Check that the candidate lies in the requested direction. */
-+        switch (arg->ui) {
+		switch (arg->ui) {
-+            case 0:
+			case 0:
-+                if (cand_center_x >= sel_center_x)
+				if (cand_center_x >= sel_center_x)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 1:
+			case 1:
-+                if (cand_center_x <= sel_center_x)
+				if (cand_center_x <= sel_center_x)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 2:
+			case 2:
-+                if (cand_center_y >= sel_center_y)
+				if (cand_center_y >= sel_center_y)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 3:
+			case 3:
-+                if (cand_center_y <= sel_center_y)
+				if (cand_center_y <= sel_center_y)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            default:
+			default:
-+                continue;
+				continue;
-+        }
+		}
 +
-+        /* Get distance between the centers */
+		/* Get distance between the centers */
-+        dist = abs(sel_center_x - cand_center_x) + abs(sel_center_y - cand_center_y);
+		dist = abs(sel_center_x - cand_center_x) + abs(sel_center_y - cand_center_y);
-+        if (dist < closest_dist) {
+		if (dist < closest_dist) {
-+            closest_dist = dist;
+			closest_dist = dist;
-+            target = c;
+			target = c;
-+        }
+		}
-+    }
+	}
 +
-+    /* If target is found, swap the two clients’ positions in the layout tree */
+	/* If target is found, swap the two clients’ positions in the layout tree */
-+    if (target) {
+	if (target) {
-+        sel_node = find_client_node(selmon->root, sel);
+		sel_node = find_client_node(selmon->root, sel);
-+        target_node = find_client_node(selmon->root, target);
+		target_node = find_client_node(selmon->root, target);
-+        if (sel_node && target_node) {
+		if (sel_node && target_node) {
-+            tmp = sel_node->client;
+			tmp = sel_node->client;
-+            sel_node->client = target_node->client;
+			sel_node->client = target_node->client;
-+            target_node->client = tmp;
+			target_node->client = tmp;
-+            arrange(selmon);
+			arrange(selmon);
-+        }
+		}
-+    }
+	}
 +}
 +
 +unsigned int
@@ -564,7 +566,7 @@ index 0000000..c63e59f
 +
 +Client *
 +xytoclient(double x, double y) {
-+    Monitor *m = xytomon(x, y);
+	Monitor *m = xytomon(x, y);
 +	Client *c, *closest = NULL;
 +	double dist, mindist = INT_MAX, dx, dy;
 +
@@ -639,7 +641,7 @@ index 8a6eda0..bc04e3f 100644
 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                            1),
 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                    2),
 diff --git a/dwl.c b/dwl.c
-index 44f3ad9..d37e235 100644
+index 44f3ad9..a121efc 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -1,6 +1,7 @@
@@ -721,7 +723,7 @@ index 44f3ad9..d37e235 100644
 				b->func(&b->arg);
 				return;
 			}
-@@ -655,6 +664,27 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -655,6 +664,21 @@ buttonpress(struct wl_listener *listener, void *data)
 		/* If you released any buttons, we exit interactive move/resize mode. */
 		/* TODO: should reset to the pointer focus's current setcursor */
 		if (!locked && cursor_mode != CurNormal && cursor_mode != CurPressed) {
@@ -736,20 +738,14 @@ index 44f3ad9..d37e235 100644
 +						selmon->root = create_client_node(c);
 +
 +					setfloating(c, 0);
-+					arrange(selmon);
+					apply_layout(selmon, selmon->root, selmon->w, 1);
 +
 +				} else if (cursor_mode == CurResize && !c->isfloating) {
 +					resizing_from_mouse = 0;
 +				}
 +			} else {
 +				if (cursor_mode == CurResize && resizing_from_mouse)
 +					resizing_from_mouse = 0;
 +			}
 +			/* Default behaviour */
 			wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
 			cursor_mode = CurNormal;
 			/* Drop the window off on its new monitor */
-@@ -746,6 +776,7 @@ cleanupmon(struct wl_listener *listener, void *data)
+@@ -746,6 +770,7 @@ cleanupmon(struct wl_listener *listener, void *data)
 	wlr_output_layout_remove(output_layout, m->wlr_output);
 	wlr_scene_output_destroy(m->scene_output);
@@ -757,7 +753,7 @@ index 44f3ad9..d37e235 100644
 	closemon(m);
 	wlr_scene_node_destroy(&m->fullscreen_bg->node);
 	free(m);
-@@ -1090,6 +1121,7 @@ createmon(struct wl_listener *listener, void *data)
+@@ -1090,6 +1115,7 @@ createmon(struct wl_listener *listener, void *data)
 	wl_list_insert(&mons, &m->link);
 	printstatus();
@@ -765,22 +761,25 @@ index 44f3ad9..d37e235 100644
 	/* The xdg-protocol specifies:
 	 *
-@@ -1332,6 +1364,14 @@ destroynotify(struct wl_listener *listener, void *data)
+@@ -1329,9 +1355,17 @@ destroynotify(struct wl_listener *listener, void *data)
 {
 	/* Called when the xdg_toplevel is destroyed. */
 	Client *c = wl_container_of(listener, c, destroy);
 +	Monitor *mon;
 	wl_list_remove(&c->destroy.link);
 	wl_list_remove(&c->set_title.link);
 	wl_list_remove(&c->fullscreen.link);
 +	/* We check if the destroyed client was part of any tiled_list, to catch
 +	 * client removals even if they would not be currently managed by btrtile */
-+    Monitor *mon;
+	wl_list_for_each(mon, &mons, link) {
-+    wl_list_for_each(mon, &mons, link) {
+		if (mon->root) {
-+        if (mon->root) {
+			remove_client(mon, c);
-+            remove_client(mon, c);
+		}
-+        }
+	}
 +    }
 #ifdef XWAYLAND
 	if (c->type != XDGShell) {
 		wl_list_remove(&c->activate.link);
-@@ -1862,7 +1902,8 @@ void
+@@ -1862,7 +1896,8 @@ void
 motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
 		double dx_unaccel, double dy_unaccel)
 {
@@ -790,13 +789,13 @@ index 44f3ad9..d37e235 100644
 	Client *c = NULL, *w = NULL;
 	LayerSurface *l = NULL;
 	struct wlr_surface *surface = NULL;
-@@ -1916,18 +1957,56 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1916,18 +1951,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
 	/* Update drag icon's position */
 	wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), (int)round(cursor->y));
 -	/* If we are currently grabbing the mouse, handle and return */
-+	/* Skip if internal call or already resizing */
+	/* Skip if internal call */
-+	if (time == 0 && resizing_from_mouse)
+	if (time == 0)
 +		goto focus;
 +
 +	tiled = grabc && !grabc->isfloating && !grabc->isfullscreen;
@@ -818,7 +817,7 @@ index 44f3ad9..d37e235 100644
 -		resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y,
 -			.width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1);
 -		return;
-+		if (tiled && resizing_from_mouse) {
+		if (tiled) {
 +			dx_total = cursor->x - resize_last_update_x;
 +			dy_total = cursor->y - resize_last_update_y;
 +
@@ -831,7 +830,6 @@ index 44f3ad9..d37e235 100644
 +					a.f = (float)(dy_total * resize_factor);
 +					setratio_v(&a);
 +				}
 +				arrange(selmon);
 +
 +				last_resize_time = time;
 +				resize_last_update_x = cursor->x;
@@ -854,7 +852,7 @@ index 44f3ad9..d37e235 100644
 	/* If there's no client surface under the cursor, set the cursor image to a
 	 * default. This is what makes the cursor image appear when you move it
 	 * off of a client or over its border. */
-@@ -1961,22 +2040,41 @@ moveresize(const Arg *arg)
+@@ -1961,22 +2033,40 @@ moveresize(const Arg *arg)
 	if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
 		return;
@@ -889,7 +887,6 @@ index 44f3ad9..d37e235 100644
 +			wlr_cursor_set_xcursor(cursor, cursor_mgr, "se-resize");
 +			resize_last_update_x = cursor->x;
 +			resize_last_update_y = cursor->y;
 +			resizing_from_mouse = 1;
 +			break;
 +		}
 +	} else {
@@ -912,17 +909,17 @@ index 44f3ad9..d37e235 100644
 	}
 }
-@@ -2826,6 +2924,14 @@ unmapnotify(struct wl_listener *listener, void *data)
+@@ -2826,6 +2916,14 @@ unmapnotify(struct wl_listener *listener, void *data)
 			focusclient(focustop(selmon), 1);
 		}
 	} else {
-+        // btrtile remove clients for each monitor
+		/* btrtile remove clients for each monitor */
-+        Monitor *mon;
+		Monitor *mon;
-+        wl_list_for_each(mon, &mons, link) {
+		wl_list_for_each(mon, &mons, link) {
-+            if (mon->root) {
+			if (mon->root) {
-+                remove_client(mon, c);
+				remove_client(mon, c);
-+            }
+			}
-+        }
+		}
 +
 		wl_list_remove(&c->link);
 		setmon(c, NULL, 0);
@@ -1,23 +1,24 @@
-From 7ef8c161eb3cd801f608784e7d888fe12e94b9d4 Mon Sep 17 00:00:00 2001
+From 618e3b70204520b6eb2c5040e072087ac0a3b3f7 Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
-Date: Sun, 17 May 2026 22:39:30 +0300
+Date: Thu, 21 May 2026 00:40:54 +0300
-Subject: [PATCH] btrtile resizing refactor
+Subject: [PATCH] btrtile: Spring update pt2
- Refactored the tiled client resizing logic to be more logical. Insted
+- Simplified the resizing logic to avoid full arrange calls from
-  of resizing based on clients split nodes, now btrtile handles client resizing based on the nearest edge client edge on the resize direction. Now it handles also resizing of the clientless splitnodes and should feel more intuitive.
+motionnotify
 - Minor intend fixes
 ---
- btrtile.c    | 563 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ btrtile.c    | 564 +++++++++++++++++++++++++++++++++++++++++++++++++++
 config.def.h |  12 ++
- dwl.c        | 160 ++++++++++++---
+ dwl.c        | 152 +++++++++++---
- 3 files changed, 708 insertions(+), 27 deletions(-)
+ 3 files changed, 701 insertions(+), 27 deletions(-)
 create mode 100644 btrtile.c
 diff --git a/btrtile.c b/btrtile.c
 new file mode 100644
-index 0000000..ad810bf
+index 0000000..357ffb9
 --- /dev/null
 +++ b/btrtile.c
-@@ -0,0 +1,563 @@
+@@ -0,0 +1,564 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
@@ -28,7 +29,7 @@ index 0000000..ad810bf
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/15 00:26:07 by julmajustus           ::    ::::::: ::   */
-+/*   Updated: 2026/05/17 22:09:15 by julmajustus            : :   : : :  :    */
+/*   Updated: 2026/05/20 22:51:54 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
@@ -63,7 +64,6 @@ index 0000000..ad810bf
 +static unsigned int visible_count(LayoutNode *node, Monitor *m);
 +static Client *xytoclient(double x, double y);
 +
 +static int resizing_from_mouse = 0;
 +static double resize_last_update_x, resize_last_update_y;
 +static uint32_t last_resize_time = 0;
 +
@@ -84,6 +84,9 @@ index 0000000..ad810bf
 +		c = node->client;
 +		if (!c || !VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
 +			return;
 +		if (area.x == c->old_geom.x && area.y == c->old_geom.y &&
 +				area.width == c->old_geom.width && area.height == c->old_geom.height)
 +			return;
 +		resize(c, area, 0);
 +		c->old_geom = area;
 +		return;
@@ -150,16 +153,16 @@ index 0000000..ad810bf
 +	LayoutNode *found;
 +	struct wlr_box full_area;
 +
-+    if (!m)
+	if (!m)
-+        return;
+		return;
 +
-+    /* Remove non tiled clients from tree. */
+	/* Remove non tiled clients from tree. */
-+    wl_list_for_each(c, &clients, link) {
+	wl_list_for_each(c, &clients, link) {
-+        if (c->mon == m && !c->isfloating && !c->isfullscreen) {
+		if (c->mon == m && !c->isfloating && !c->isfullscreen) {
-+        } else {
+		} else {
-+            remove_client(m, c);
+			remove_client(m, c);
-+        }
+		}
-+    }
+	}
 +
 +	/* If no client is found under cursor, fallback to focustop(m) */
 +	if (!(focused = xytoclient(cursor->x, cursor->y)))
@@ -253,7 +256,7 @@ index 0000000..ad810bf
 +
 +LayoutNode *
 +find_suitable_split(Monitor *m, LayoutNode *start_node,
-+                    unsigned int need_vertical, int focused_on_left)
+		unsigned int need_vertical, int focused_on_left)
 +{
 +	LayoutNode *n = start_node, *child = NULL;
 +
@@ -425,11 +428,11 @@ index 0000000..ad810bf
 +	if (!client_node)
 +		return;
 +
-+    focused_on_left = (arg->f >= 0.0f);
+	focused_on_left = (arg->f >= 0.0f);
 +
 +	split_node = find_suitable_split(selmon, client_node, need_vertical, focused_on_left);
 +
-+    if (!split_node)
+	if (!split_node)
 +		split_node = find_suitable_split(selmon, client_node, need_vertical, !focused_on_left);
 +	if (!split_node)
 +		return;
@@ -441,10 +444,9 @@ index 0000000..ad810bf
 +		new_ratio = 0.95f;
 +	split_node->split_ratio = new_ratio;
 +
 +	apply_layout(selmon, selmon->root, selmon->w, 1);
 +	/* Skip the arrange when called from motionnotify; that path calls
 +	 * arrange itself after rate-limiting. */
 +	if (!resizing_from_mouse)
 +		arrange(selmon);
 +}
 +
 +void
@@ -460,69 +462,69 @@ index 0000000..ad810bf
 +}
 +
 +void swapclients(const Arg *arg) {
-+    Client  *c, *tmp, *target = NULL, *sel = focustop(selmon);
+	Client  *c, *tmp, *target = NULL, *sel = focustop(selmon);
 +	LayoutNode *sel_node, *target_node;
-+    int closest_dist = INT_MAX, dist, sel_center_x, sel_center_y,
+	int closest_dist = INT_MAX, dist, sel_center_x, sel_center_y,
 +	cand_center_x, cand_center_y;
 +
-+    if (!sel || sel->isfullscreen ||
+	if (!sel || sel->isfullscreen ||
-+        !selmon->root || !selmon->lt[selmon->sellt]->arrange)
+			!selmon->root || !selmon->lt[selmon->sellt]->arrange)
-+        return;
+		return;
 +
 +
-+    /* Get the center coordinates of the selected client */
+	/* Get the center coordinates of the selected client */
-+    sel_center_x = sel->geom.x + sel->geom.width / 2;
+	sel_center_x = sel->geom.x + sel->geom.width / 2;
-+    sel_center_y = sel->geom.y + sel->geom.height / 2;
+	sel_center_y = sel->geom.y + sel->geom.height / 2;
 +
-+    wl_list_for_each(c, &clients, link) {
+	wl_list_for_each(c, &clients, link) {
-+        if (!VISIBLEON(c, selmon) || c->isfloating || c->isfullscreen || c == sel)
+		if (!VISIBLEON(c, selmon) || c->isfloating || c->isfullscreen || c == sel)
-+            continue;
+			continue;
 +
-+        /* Get the center of candidate client */
+		/* Get the center of candidate client */
-+        cand_center_x = c->geom.x + c->geom.width / 2;
+		cand_center_x = c->geom.x + c->geom.width / 2;
-+        cand_center_y = c->geom.y + c->geom.height / 2;
+		cand_center_y = c->geom.y + c->geom.height / 2;
 +
-+        /* Check that the candidate lies in the requested direction. */
+		/* Check that the candidate lies in the requested direction. */
-+        switch (arg->ui) {
+		switch (arg->ui) {
-+            case 0:
+			case 0:
-+                if (cand_center_x >= sel_center_x)
+				if (cand_center_x >= sel_center_x)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 1:
+			case 1:
-+                if (cand_center_x <= sel_center_x)
+				if (cand_center_x <= sel_center_x)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 2:
+			case 2:
-+                if (cand_center_y >= sel_center_y)
+				if (cand_center_y >= sel_center_y)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 3:
+			case 3:
-+                if (cand_center_y <= sel_center_y)
+				if (cand_center_y <= sel_center_y)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            default:
+			default:
-+                continue;
+				continue;
-+        }
+		}
 +
-+        /* Get distance between the centers */
+		/* Get distance between the centers */
-+        dist = abs(sel_center_x - cand_center_x) + abs(sel_center_y - cand_center_y);
+		dist = abs(sel_center_x - cand_center_x) + abs(sel_center_y - cand_center_y);
-+        if (dist < closest_dist) {
+		if (dist < closest_dist) {
-+            closest_dist = dist;
+			closest_dist = dist;
-+            target = c;
+			target = c;
-+        }
+		}
-+    }
+	}
 +
-+    /* If target is found, swap the two clients’ positions in the layout tree */
+	/* If target is found, swap the two clients’ positions in the layout tree */
-+    if (target) {
+	if (target) {
-+        sel_node = find_client_node(selmon->root, sel);
+		sel_node = find_client_node(selmon->root, sel);
-+        target_node = find_client_node(selmon->root, target);
+		target_node = find_client_node(selmon->root, target);
-+        if (sel_node && target_node) {
+		if (sel_node && target_node) {
-+            tmp = sel_node->client;
+			tmp = sel_node->client;
-+            sel_node->client = target_node->client;
+			sel_node->client = target_node->client;
-+            target_node->client = tmp;
+			target_node->client = tmp;
-+            arrange(selmon);
+			arrange(selmon);
-+        }
+		}
-+    }
+	}
 +}
 +
 +unsigned int
@@ -545,7 +547,7 @@ index 0000000..ad810bf
 +
 +Client *
 +xytoclient(double x, double y) {
-+    Monitor *m = xytomon(x, y);
+	Monitor *m = xytomon(x, y);
 +	Client *c, *closest = NULL;
 +	double dist, mindist = INT_MAX, dx, dy;
 +
@@ -620,7 +622,7 @@ index 8a6eda0..bc04e3f 100644
 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                            1),
 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                    2),
 diff --git a/dwl.c b/dwl.c
-index 44f3ad9..d37e235 100644
+index 44f3ad9..a121efc 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -1,6 +1,7 @@
@@ -702,7 +704,7 @@ index 44f3ad9..d37e235 100644
 				b->func(&b->arg);
 				return;
 			}
-@@ -655,6 +664,27 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -655,6 +664,21 @@ buttonpress(struct wl_listener *listener, void *data)
 		/* If you released any buttons, we exit interactive move/resize mode. */
 		/* TODO: should reset to the pointer focus's current setcursor */
 		if (!locked && cursor_mode != CurNormal && cursor_mode != CurPressed) {
@@ -717,20 +719,14 @@ index 44f3ad9..d37e235 100644
 +						selmon->root = create_client_node(c);
 +
 +					setfloating(c, 0);
-+					arrange(selmon);
+					apply_layout(selmon, selmon->root, selmon->w, 1);
 +
 +				} else if (cursor_mode == CurResize && !c->isfloating) {
 +					resizing_from_mouse = 0;
 +				}
 +			} else {
 +				if (cursor_mode == CurResize && resizing_from_mouse)
 +					resizing_from_mouse = 0;
 +			}
 +			/* Default behaviour */
 			wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
 			cursor_mode = CurNormal;
 			/* Drop the window off on its new monitor */
-@@ -746,6 +776,7 @@ cleanupmon(struct wl_listener *listener, void *data)
+@@ -746,6 +770,7 @@ cleanupmon(struct wl_listener *listener, void *data)
 	wlr_output_layout_remove(output_layout, m->wlr_output);
 	wlr_scene_output_destroy(m->scene_output);
@@ -738,7 +734,7 @@ index 44f3ad9..d37e235 100644
 	closemon(m);
 	wlr_scene_node_destroy(&m->fullscreen_bg->node);
 	free(m);
-@@ -1090,6 +1121,7 @@ createmon(struct wl_listener *listener, void *data)
+@@ -1090,6 +1115,7 @@ createmon(struct wl_listener *listener, void *data)
 	wl_list_insert(&mons, &m->link);
 	printstatus();
@@ -746,22 +742,25 @@ index 44f3ad9..d37e235 100644
 	/* The xdg-protocol specifies:
 	 *
-@@ -1332,6 +1364,14 @@ destroynotify(struct wl_listener *listener, void *data)
+@@ -1329,9 +1355,17 @@ destroynotify(struct wl_listener *listener, void *data)
 {
 	/* Called when the xdg_toplevel is destroyed. */
 	Client *c = wl_container_of(listener, c, destroy);
 +	Monitor *mon;
 	wl_list_remove(&c->destroy.link);
 	wl_list_remove(&c->set_title.link);
 	wl_list_remove(&c->fullscreen.link);
 +	/* We check if the destroyed client was part of any tiled_list, to catch
 +	 * client removals even if they would not be currently managed by btrtile */
-+    Monitor *mon;
+	wl_list_for_each(mon, &mons, link) {
-+    wl_list_for_each(mon, &mons, link) {
+		if (mon->root) {
-+        if (mon->root) {
+			remove_client(mon, c);
-+            remove_client(mon, c);
+		}
-+        }
+	}
 +    }
 #ifdef XWAYLAND
 	if (c->type != XDGShell) {
 		wl_list_remove(&c->activate.link);
-@@ -1862,7 +1902,8 @@ void
+@@ -1862,7 +1896,8 @@ void
 motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
 		double dx_unaccel, double dy_unaccel)
 {
@@ -771,13 +770,13 @@ index 44f3ad9..d37e235 100644
 	Client *c = NULL, *w = NULL;
 	LayerSurface *l = NULL;
 	struct wlr_surface *surface = NULL;
-@@ -1916,18 +1957,56 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1916,18 +1951,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
 	/* Update drag icon's position */
 	wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), (int)round(cursor->y));
 -	/* If we are currently grabbing the mouse, handle and return */
-+	/* Skip if internal call or already resizing */
+	/* Skip if internal call */
-+	if (time == 0 && resizing_from_mouse)
+	if (time == 0)
 +		goto focus;
 +
 +	tiled = grabc && !grabc->isfloating && !grabc->isfullscreen;
@@ -799,7 +798,7 @@ index 44f3ad9..d37e235 100644
 -		resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y,
 -			.width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1);
 -		return;
-+		if (tiled && resizing_from_mouse) {
+		if (tiled) {
 +			dx_total = cursor->x - resize_last_update_x;
 +			dy_total = cursor->y - resize_last_update_y;
 +
@@ -812,7 +811,6 @@ index 44f3ad9..d37e235 100644
 +					a.f = (float)(dy_total * resize_factor);
 +					setratio_v(&a);
 +				}
 +				arrange(selmon);
 +
 +				last_resize_time = time;
 +				resize_last_update_x = cursor->x;
@@ -835,7 +833,7 @@ index 44f3ad9..d37e235 100644
 	/* If there's no client surface under the cursor, set the cursor image to a
 	 * default. This is what makes the cursor image appear when you move it
 	 * off of a client or over its border. */
-@@ -1961,22 +2040,41 @@ moveresize(const Arg *arg)
+@@ -1961,22 +2033,40 @@ moveresize(const Arg *arg)
 	if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
 		return;
@@ -870,7 +868,6 @@ index 44f3ad9..d37e235 100644
 +			wlr_cursor_set_xcursor(cursor, cursor_mgr, "se-resize");
 +			resize_last_update_x = cursor->x;
 +			resize_last_update_y = cursor->y;
 +			resizing_from_mouse = 1;
 +			break;
 +		}
 +	} else {
@@ -893,17 +890,17 @@ index 44f3ad9..d37e235 100644
 	}
 }
-@@ -2826,6 +2924,14 @@ unmapnotify(struct wl_listener *listener, void *data)
+@@ -2826,6 +2916,14 @@ unmapnotify(struct wl_listener *listener, void *data)
 			focusclient(focustop(selmon), 1);
 		}
 	} else {
-+        // btrtile remove clients for each monitor
+		/* btrtile remove clients for each monitor */
-+        Monitor *mon;
+		Monitor *mon;
-+        wl_list_for_each(mon, &mons, link) {
+		wl_list_for_each(mon, &mons, link) {
-+            if (mon->root) {
+			if (mon->root) {
-+                remove_client(mon, c);
+				remove_client(mon, c);
-+            }
+			}
-+        }
+		}
 +
 		wl_list_remove(&c->link);
 		setmon(c, NULL, 0);
@@ -1,23 +1,24 @@
-From b8d84c87f13681118865b83312387a881ab10b73 Mon Sep 17 00:00:00 2001
+From c11b1a8c93c27fad3782e9dbc1b094a4a7b78088 Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
-Date: Sun, 17 May 2026 23:10:49 +0300
+Date: Thu, 21 May 2026 00:38:45 +0300
-Subject: [PATCH] btrtile resizing refactor
+Subject: [PATCH] btrtile: Spring update pt2
- Refactored the tiled client resizing logic to be more logical. Insted
+- Simplified the resizing logic to avoid full arrange calls from
-of resizing based on clients split nodes, now btrtile handles client resizing based on the nearest edge client edge on the resize direction. Now it handles also resizing of the clientless splitnodes and should feel more intuitive.
+motionnotify
 - Minor intend fixes
 ---
- btrtile.c    | 582 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ btrtile.c    | 583 +++++++++++++++++++++++++++++++++++++++++++++++++++
 config.def.h |  12 ++
- dwl.c        | 161 +++++++++++---
+ dwl.c        | 152 +++++++++++---
- 3 files changed, 728 insertions(+), 27 deletions(-)
+ 3 files changed, 720 insertions(+), 27 deletions(-)
 create mode 100644 btrtile.c
 diff --git a/btrtile.c b/btrtile.c
 new file mode 100644
-index 0000000..c63e59f
+index 0000000..f05a30f
 --- /dev/null
 +++ b/btrtile.c
-@@ -0,0 +1,582 @@
+@@ -0,0 +1,583 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
@@ -28,7 +29,7 @@ index 0000000..c63e59f
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/15 00:26:07 by julmajustus           ::    ::::::: ::   */
-+/*   Updated: 2026/05/17 22:00:31 by julmajustus            : :   : : :  :    */
+/*   Updated: 2026/05/20 22:38:02 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
@@ -63,7 +64,6 @@ index 0000000..c63e59f
 +static unsigned int visible_count(LayoutNode *node, Monitor *m);
 +static Client *xytoclient(double x, double y);
 +
 +static int resizing_from_mouse = 0;
 +static double resize_last_update_x, resize_last_update_y;
 +static uint32_t last_resize_time = 0;
 +
@@ -91,6 +91,9 @@ index 0000000..c63e59f
 +		c = node->client;
 +		if (!c || !VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
 +			return;
 +		if (area.x == c->old_geom.x && area.y == c->old_geom.y &&
 +				area.width == c->old_geom.width && area.height == c->old_geom.height)
 +			return;
 +		resize(c, area, 0);
 +		c->old_geom = area;
 +		return;
@@ -169,16 +172,16 @@ index 0000000..c63e59f
 +	LayoutNode *found;
 +	struct wlr_box full_area;
 +
-+    if (!m)
+	if (!m)
-+        return;
+		return;
 +
-+    /* Remove non tiled clients from tree. */
+	/* Remove non tiled clients from tree. */
-+    wl_list_for_each(c, &clients, link) {
+	wl_list_for_each(c, &clients, link) {
-+        if (c->mon == m && !c->isfloating && !c->isfullscreen) {
+		if (c->mon == m && !c->isfloating && !c->isfullscreen) {
-+        } else {
+		} else {
-+            remove_client(m, c);
+			remove_client(m, c);
-+        }
+		}
-+    }
+	}
 +
 +	/* If no client is found under cursor, fallback to focustop(m) */
 +	if (!(focused = xytoclient(cursor->x, cursor->y)))
@@ -272,7 +275,7 @@ index 0000000..c63e59f
 +
 +LayoutNode *
 +find_suitable_split(Monitor *m, LayoutNode *start_node,
-+                    unsigned int need_vertical, int focused_on_left)
+		unsigned int need_vertical, int focused_on_left)
 +{
 +	LayoutNode *n = start_node, *child = NULL;
 +
@@ -444,11 +447,11 @@ index 0000000..c63e59f
 +	if (!client_node)
 +		return;
 +
-+    focused_on_left = (arg->f >= 0.0f);
+	focused_on_left = (arg->f >= 0.0f);
 +
 +	split_node = find_suitable_split(selmon, client_node, need_vertical, focused_on_left);
 +
-+    if (!split_node)
+	if (!split_node)
 +		split_node = find_suitable_split(selmon, client_node, need_vertical, !focused_on_left);
 +	if (!split_node)
 +		return;
@@ -460,10 +463,9 @@ index 0000000..c63e59f
 +		new_ratio = 0.95f;
 +	split_node->split_ratio = new_ratio;
 +
 +	apply_layout(selmon, selmon->root, selmon->w, 1);
 +	/* Skip the arrange when called from motionnotify; that path calls
 +	 * arrange itself after rate-limiting. */
 +	if (!resizing_from_mouse)
 +		arrange(selmon);
 +}
 +
 +void
@@ -479,69 +481,69 @@ index 0000000..c63e59f
 +}
 +
 +void swapclients(const Arg *arg) {
-+    Client  *c, *tmp, *target = NULL, *sel = focustop(selmon);
+	Client  *c, *tmp, *target = NULL, *sel = focustop(selmon);
 +	LayoutNode *sel_node, *target_node;
-+    int closest_dist = INT_MAX, dist, sel_center_x, sel_center_y,
+	int closest_dist = INT_MAX, dist, sel_center_x, sel_center_y,
 +	cand_center_x, cand_center_y;
 +
-+    if (!sel || sel->isfullscreen ||
+	if (!sel || sel->isfullscreen ||
-+        !selmon->root || !selmon->lt[selmon->sellt]->arrange)
+			!selmon->root || !selmon->lt[selmon->sellt]->arrange)
-+        return;
+		return;
 +
 +
-+    /* Get the center coordinates of the selected client */
+	/* Get the center coordinates of the selected client */
-+    sel_center_x = sel->geom.x + sel->geom.width / 2;
+	sel_center_x = sel->geom.x + sel->geom.width / 2;
-+    sel_center_y = sel->geom.y + sel->geom.height / 2;
+	sel_center_y = sel->geom.y + sel->geom.height / 2;
 +
-+    wl_list_for_each(c, &clients, link) {
+	wl_list_for_each(c, &clients, link) {
-+        if (!VISIBLEON(c, selmon) || c->isfloating || c->isfullscreen || c == sel)
+		if (!VISIBLEON(c, selmon) || c->isfloating || c->isfullscreen || c == sel)
-+            continue;
+			continue;
 +
-+        /* Get the center of candidate client */
+		/* Get the center of candidate client */
-+        cand_center_x = c->geom.x + c->geom.width / 2;
+		cand_center_x = c->geom.x + c->geom.width / 2;
-+        cand_center_y = c->geom.y + c->geom.height / 2;
+		cand_center_y = c->geom.y + c->geom.height / 2;
 +
-+        /* Check that the candidate lies in the requested direction. */
+		/* Check that the candidate lies in the requested direction. */
-+        switch (arg->ui) {
+		switch (arg->ui) {
-+            case 0:
+			case 0:
-+                if (cand_center_x >= sel_center_x)
+				if (cand_center_x >= sel_center_x)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 1:
+			case 1:
-+                if (cand_center_x <= sel_center_x)
+				if (cand_center_x <= sel_center_x)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 2:
+			case 2:
-+                if (cand_center_y >= sel_center_y)
+				if (cand_center_y >= sel_center_y)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 3:
+			case 3:
-+                if (cand_center_y <= sel_center_y)
+				if (cand_center_y <= sel_center_y)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            default:
+			default:
-+                continue;
+				continue;
-+        }
+		}
 +
-+        /* Get distance between the centers */
+		/* Get distance between the centers */
-+        dist = abs(sel_center_x - cand_center_x) + abs(sel_center_y - cand_center_y);
+		dist = abs(sel_center_x - cand_center_x) + abs(sel_center_y - cand_center_y);
-+        if (dist < closest_dist) {
+		if (dist < closest_dist) {
-+            closest_dist = dist;
+			closest_dist = dist;
-+            target = c;
+			target = c;
-+        }
+		}
-+    }
+	}
 +
-+    /* If target is found, swap the two clients’ positions in the layout tree */
+	/* If target is found, swap the two clients’ positions in the layout tree */
-+    if (target) {
+	if (target) {
-+        sel_node = find_client_node(selmon->root, sel);
+		sel_node = find_client_node(selmon->root, sel);
-+        target_node = find_client_node(selmon->root, target);
+		target_node = find_client_node(selmon->root, target);
-+        if (sel_node && target_node) {
+		if (sel_node && target_node) {
-+            tmp = sel_node->client;
+			tmp = sel_node->client;
-+            sel_node->client = target_node->client;
+			sel_node->client = target_node->client;
-+            target_node->client = tmp;
+			target_node->client = tmp;
-+            arrange(selmon);
+			arrange(selmon);
-+        }
+		}
-+    }
+	}
 +}
 +
 +unsigned int
@@ -564,7 +566,7 @@ index 0000000..c63e59f
 +
 +Client *
 +xytoclient(double x, double y) {
-+    Monitor *m = xytomon(x, y);
+	Monitor *m = xytomon(x, y);
 +	Client *c, *closest = NULL;
 +	double dist, mindist = INT_MAX, dx, dy;
 +
@@ -639,7 +641,7 @@ index 8a6eda0..bc04e3f 100644
 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                            1),
 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                    2),
 diff --git a/dwl.c b/dwl.c
-index 8101ffa..32a94c4 100644
+index 8101ffa..c9650c1 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -1,6 +1,7 @@
@@ -721,7 +723,7 @@ index 8101ffa..32a94c4 100644
 				b->func(&b->arg);
 				return;
 			}
-@@ -659,6 +668,27 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -659,6 +668,21 @@ buttonpress(struct wl_listener *listener, void *data)
 		/* If you released any buttons, we exit interactive move/resize mode. */
 		/* TODO: should reset to the pointer focus's current setcursor */
 		if (!locked && cursor_mode != CurNormal && cursor_mode != CurPressed) {
@@ -736,20 +738,14 @@ index 8101ffa..32a94c4 100644
 +						selmon->root = create_client_node(c);
 +
 +					setfloating(c, 0);
-+					arrange(selmon);
+					apply_layout(selmon, selmon->root, selmon->w, 1);
 +
 +				} else if (cursor_mode == CurResize && !c->isfloating) {
 +					resizing_from_mouse = 0;
 +				}
 +			} else {
 +				if (cursor_mode == CurResize && resizing_from_mouse)
 +					resizing_from_mouse = 0;
 +			}
 +			/* Default behaviour */
 			wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
 			cursor_mode = CurNormal;
 			/* Drop the window off on its new monitor */
-@@ -750,6 +780,7 @@ cleanupmon(struct wl_listener *listener, void *data)
+@@ -750,6 +774,7 @@ cleanupmon(struct wl_listener *listener, void *data)
 	wlr_output_layout_remove(output_layout, m->wlr_output);
 	wlr_scene_output_destroy(m->scene_output);
@@ -757,7 +753,7 @@ index 8101ffa..32a94c4 100644
 	closemon(m);
 	wlr_scene_node_destroy(&m->fullscreen_bg->node);
 	free(m);
-@@ -1094,6 +1125,7 @@ createmon(struct wl_listener *listener, void *data)
+@@ -1094,6 +1119,7 @@ createmon(struct wl_listener *listener, void *data)
 	wl_list_insert(&mons, &m->link);
 	printstatus();
@@ -765,23 +761,26 @@ index 8101ffa..32a94c4 100644
 	/* The xdg-protocol specifies:
 	 *
-@@ -1336,6 +1368,15 @@ destroynotify(struct wl_listener *listener, void *data)
+@@ -1332,10 +1358,18 @@ void
 destroynotify(struct wl_listener *listener, void *data)
 {
 	/* Called when the xdg_toplevel is destroyed. */
 +	Monitor *mon;
 	Client *c = wl_container_of(listener, c, destroy);
 	wl_list_remove(&c->destroy.link);
 	wl_list_remove(&c->set_title.link);
 	wl_list_remove(&c->fullscreen.link);
 +	/* We check if the destroyed client was part of any tiled_list, to catch
 +	 * client removals even if they would not be currently managed by btrtile */
-+    // btrtile remove clients for each monitor
+	wl_list_for_each(mon, &mons, link) {
-+    Monitor *mon;
+		if (mon->root) {
-+    wl_list_for_each(mon, &mons, link) {
+			remove_client(mon, c);
-+        if (mon->root) {
+		}
-+            remove_client(mon, c);
+	}
 +        }
 +    }
 #ifdef XWAYLAND
 	if (c->type != XDGShell) {
 		wl_list_remove(&c->activate.link);
-@@ -1866,7 +1907,8 @@ void
+@@ -1866,7 +1900,8 @@ void
 motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
 		double dx_unaccel, double dy_unaccel)
 {
@@ -791,13 +790,13 @@ index 8101ffa..32a94c4 100644
 	Client *c = NULL, *w = NULL;
 	LayerSurface *l = NULL;
 	struct wlr_surface *surface = NULL;
-@@ -1920,18 +1962,56 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1920,18 +1955,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
 	/* Update drag icon's position */
 	wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), (int)round(cursor->y));
 -	/* If we are currently grabbing the mouse, handle and return */
-+	/* Skip if internal call or already resizing */
+	/* Skip if internal call */
-+	if (time == 0 && resizing_from_mouse)
+	if (time == 0)
 +		goto focus;
 +
 +	tiled = grabc && !grabc->isfloating && !grabc->isfullscreen;
@@ -819,7 +818,7 @@ index 8101ffa..32a94c4 100644
 -		resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y,
 -			.width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1);
 -		return;
-+		if (tiled && resizing_from_mouse) {
+		if (tiled) {
 +			dx_total = cursor->x - resize_last_update_x;
 +			dy_total = cursor->y - resize_last_update_y;
 +
@@ -832,7 +831,6 @@ index 8101ffa..32a94c4 100644
 +					a.f = (float)(dy_total * resize_factor);
 +					setratio_v(&a);
 +				}
 +				arrange(selmon);
 +
 +				last_resize_time = time;
 +				resize_last_update_x = cursor->x;
@@ -855,7 +853,7 @@ index 8101ffa..32a94c4 100644
 	/* If there's no client surface under the cursor, set the cursor image to a
 	 * default. This is what makes the cursor image appear when you move it
 	 * off of a client or over its border. */
-@@ -1965,22 +2045,41 @@ moveresize(const Arg *arg)
+@@ -1965,22 +2037,40 @@ moveresize(const Arg *arg)
 	if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
 		return;
@@ -890,7 +888,6 @@ index 8101ffa..32a94c4 100644
 +			wlr_cursor_set_xcursor(cursor, cursor_mgr, "se-resize");
 +			resize_last_update_x = cursor->x;
 +			resize_last_update_y = cursor->y;
 +			resizing_from_mouse = 1;
 +			break;
 +		}
 +	} else {
@@ -913,17 +910,17 @@ index 8101ffa..32a94c4 100644
 	}
 }
-@@ -2833,6 +2932,14 @@ unmapnotify(struct wl_listener *listener, void *data)
+@@ -2833,6 +2923,14 @@ unmapnotify(struct wl_listener *listener, void *data)
 			focusclient(focustop(selmon), 1);
 		}
 	} else {
-+        // btrtile remove clients for each monitor
+		/* btrtile remove clients for each monitor */
-+        Monitor *mon;
+		Monitor *mon;
-+        wl_list_for_each(mon, &mons, link) {
+		wl_list_for_each(mon, &mons, link) {
-+            if (mon->root) {
+			if (mon->root) {
-+                remove_client(mon, c);
+				remove_client(mon, c);
-+            }
+			}
-+        }
+		}
 +
 		wl_list_remove(&c->link);
 		setmon(c, NULL, 0);
@@ -1,23 +1,24 @@
-From 3c78ee7e48fb24276d1a8d722ca1e715ea07d17f Mon Sep 17 00:00:00 2001
+From 47cb7ad9f669643765cafa4c2ecd1a4850bca893 Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
-Date: Sun, 17 May 2026 23:28:41 +0300
+Date: Thu, 21 May 2026 00:39:56 +0300
-Subject: [PATCH] btrtile resizing refactor
+Subject: [PATCH] btrtile: Spring update pt2
- Refactored the tiled client resizing logic to be more logical. Insted
+- Simplified the resizing logic to avoid full arrange calls from
-of resizing based on clients split nodes, now btrtile handles client resizing based on the nearest edge client edge on the resize direction. Now it handles also resizing of the clientless splitnodes and should feel more intuitive.
+motionnotify
 - Minor intend fixes
 ---
- btrtile.c    | 563 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ btrtile.c    | 564 +++++++++++++++++++++++++++++++++++++++++++++++++++
 config.def.h |  12 ++
- dwl.c        | 161 ++++++++++++---
+ dwl.c        | 152 +++++++++++---
- 3 files changed, 709 insertions(+), 27 deletions(-)
+ 3 files changed, 701 insertions(+), 27 deletions(-)
 create mode 100644 btrtile.c
 diff --git a/btrtile.c b/btrtile.c
 new file mode 100644
-index 0000000..7e70478
+index 0000000..357ffb9
 --- /dev/null
 +++ b/btrtile.c
-@@ -0,0 +1,563 @@
+@@ -0,0 +1,564 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
@@ -28,7 +29,7 @@ index 0000000..7e70478
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/15 00:26:07 by julmajustus           ::    ::::::: ::   */
-+/*   Updated: 2026/05/17 23:26:25 by julmajustus            : :   : : :  :    */
+/*   Updated: 2026/05/20 22:51:54 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
@@ -63,7 +64,6 @@ index 0000000..7e70478
 +static unsigned int visible_count(LayoutNode *node, Monitor *m);
 +static Client *xytoclient(double x, double y);
 +
 +static int resizing_from_mouse = 0;
 +static double resize_last_update_x, resize_last_update_y;
 +static uint32_t last_resize_time = 0;
 +
@@ -84,6 +84,9 @@ index 0000000..7e70478
 +		c = node->client;
 +		if (!c || !VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
 +			return;
 +		if (area.x == c->old_geom.x && area.y == c->old_geom.y &&
 +				area.width == c->old_geom.width && area.height == c->old_geom.height)
 +			return;
 +		resize(c, area, 0);
 +		c->old_geom = area;
 +		return;
@@ -150,16 +153,16 @@ index 0000000..7e70478
 +	LayoutNode *found;
 +	struct wlr_box full_area;
 +
-+    if (!m)
+	if (!m)
-+        return;
+		return;
 +
-+    /* Remove non tiled clients from tree. */
+	/* Remove non tiled clients from tree. */
-+    wl_list_for_each(c, &clients, link) {
+	wl_list_for_each(c, &clients, link) {
-+        if (c->mon == m && !c->isfloating && !c->isfullscreen) {
+		if (c->mon == m && !c->isfloating && !c->isfullscreen) {
-+        } else {
+		} else {
-+            remove_client(m, c);
+			remove_client(m, c);
-+        }
+		}
-+    }
+	}
 +
 +	/* If no client is found under cursor, fallback to focustop(m) */
 +	if (!(focused = xytoclient(cursor->x, cursor->y)))
@@ -253,7 +256,7 @@ index 0000000..7e70478
 +
 +LayoutNode *
 +find_suitable_split(Monitor *m, LayoutNode *start_node,
-+                    unsigned int need_vertical, int focused_on_left)
+		unsigned int need_vertical, int focused_on_left)
 +{
 +	LayoutNode *n = start_node, *child = NULL;
 +
@@ -425,11 +428,11 @@ index 0000000..7e70478
 +	if (!client_node)
 +		return;
 +
-+    focused_on_left = (arg->f >= 0.0f);
+	focused_on_left = (arg->f >= 0.0f);
 +
 +	split_node = find_suitable_split(selmon, client_node, need_vertical, focused_on_left);
 +
-+    if (!split_node)
+	if (!split_node)
 +		split_node = find_suitable_split(selmon, client_node, need_vertical, !focused_on_left);
 +	if (!split_node)
 +		return;
@@ -441,10 +444,9 @@ index 0000000..7e70478
 +		new_ratio = 0.95f;
 +	split_node->split_ratio = new_ratio;
 +
 +	apply_layout(selmon, selmon->root, selmon->w, 1);
 +	/* Skip the arrange when called from motionnotify; that path calls
 +	 * arrange itself after rate-limiting. */
 +	if (!resizing_from_mouse)
 +		arrange(selmon);
 +}
 +
 +void
@@ -460,69 +462,69 @@ index 0000000..7e70478
 +}
 +
 +void swapclients(const Arg *arg) {
-+    Client  *c, *tmp, *target = NULL, *sel = focustop(selmon);
+	Client  *c, *tmp, *target = NULL, *sel = focustop(selmon);
 +	LayoutNode *sel_node, *target_node;
-+    int closest_dist = INT_MAX, dist, sel_center_x, sel_center_y,
+	int closest_dist = INT_MAX, dist, sel_center_x, sel_center_y,
 +	cand_center_x, cand_center_y;
 +
-+    if (!sel || sel->isfullscreen ||
+	if (!sel || sel->isfullscreen ||
-+        !selmon->root || !selmon->lt[selmon->sellt]->arrange)
+			!selmon->root || !selmon->lt[selmon->sellt]->arrange)
-+        return;
+		return;
 +
 +
-+    /* Get the center coordinates of the selected client */
+	/* Get the center coordinates of the selected client */
-+    sel_center_x = sel->geom.x + sel->geom.width / 2;
+	sel_center_x = sel->geom.x + sel->geom.width / 2;
-+    sel_center_y = sel->geom.y + sel->geom.height / 2;
+	sel_center_y = sel->geom.y + sel->geom.height / 2;
 +
-+    wl_list_for_each(c, &clients, link) {
+	wl_list_for_each(c, &clients, link) {
-+        if (!VISIBLEON(c, selmon) || c->isfloating || c->isfullscreen || c == sel)
+		if (!VISIBLEON(c, selmon) || c->isfloating || c->isfullscreen || c == sel)
-+            continue;
+			continue;
 +
-+        /* Get the center of candidate client */
+		/* Get the center of candidate client */
-+        cand_center_x = c->geom.x + c->geom.width / 2;
+		cand_center_x = c->geom.x + c->geom.width / 2;
-+        cand_center_y = c->geom.y + c->geom.height / 2;
+		cand_center_y = c->geom.y + c->geom.height / 2;
 +
-+        /* Check that the candidate lies in the requested direction. */
+		/* Check that the candidate lies in the requested direction. */
-+        switch (arg->ui) {
+		switch (arg->ui) {
-+            case 0:
+			case 0:
-+                if (cand_center_x >= sel_center_x)
+				if (cand_center_x >= sel_center_x)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 1:
+			case 1:
-+                if (cand_center_x <= sel_center_x)
+				if (cand_center_x <= sel_center_x)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 2:
+			case 2:
-+                if (cand_center_y >= sel_center_y)
+				if (cand_center_y >= sel_center_y)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            case 3:
+			case 3:
-+                if (cand_center_y <= sel_center_y)
+				if (cand_center_y <= sel_center_y)
-+                    continue;
+					continue;
-+                break;
+				break;
-+            default:
+			default:
-+                continue;
+				continue;
-+        }
+		}
 +
-+        /* Get distance between the centers */
+		/* Get distance between the centers */
-+        dist = abs(sel_center_x - cand_center_x) + abs(sel_center_y - cand_center_y);
+		dist = abs(sel_center_x - cand_center_x) + abs(sel_center_y - cand_center_y);
-+        if (dist < closest_dist) {
+		if (dist < closest_dist) {
-+            closest_dist = dist;
+			closest_dist = dist;
-+            target = c;
+			target = c;
-+        }
+		}
-+    }
+	}
 +
-+    /* If target is found, swap the two clients’ positions in the layout tree */
+	/* If target is found, swap the two clients’ positions in the layout tree */
-+    if (target) {
+	if (target) {
-+        sel_node = find_client_node(selmon->root, sel);
+		sel_node = find_client_node(selmon->root, sel);
-+        target_node = find_client_node(selmon->root, target);
+		target_node = find_client_node(selmon->root, target);
-+        if (sel_node && target_node) {
+		if (sel_node && target_node) {
-+            tmp = sel_node->client;
+			tmp = sel_node->client;
-+            sel_node->client = target_node->client;
+			sel_node->client = target_node->client;
-+            target_node->client = tmp;
+			target_node->client = tmp;
-+            arrange(selmon);
+			arrange(selmon);
-+        }
+		}
-+    }
+	}
 +}
 +
 +unsigned int
@@ -545,7 +547,7 @@ index 0000000..7e70478
 +
 +Client *
 +xytoclient(double x, double y) {
-+    Monitor *m = xytomon(x, y);
+	Monitor *m = xytomon(x, y);
 +	Client *c, *closest = NULL;
 +	double dist, mindist = INT_MAX, dx, dy;
 +
@@ -620,7 +622,7 @@ index 8a6eda0..bc04e3f 100644
 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                            1),
 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                    2),
 diff --git a/dwl.c b/dwl.c
-index 8101ffa..32a94c4 100644
+index 8101ffa..bf52c6c 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -1,6 +1,7 @@
@@ -702,7 +704,7 @@ index 8101ffa..32a94c4 100644
 				b->func(&b->arg);
 				return;
 			}
-@@ -659,6 +668,27 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -659,6 +668,21 @@ buttonpress(struct wl_listener *listener, void *data)
 		/* If you released any buttons, we exit interactive move/resize mode. */
 		/* TODO: should reset to the pointer focus's current setcursor */
 		if (!locked && cursor_mode != CurNormal && cursor_mode != CurPressed) {
@@ -717,20 +719,14 @@ index 8101ffa..32a94c4 100644
 +						selmon->root = create_client_node(c);
 +
 +					setfloating(c, 0);
-+					arrange(selmon);
+					apply_layout(selmon, selmon->root, selmon->w, 1);
 +
 +				} else if (cursor_mode == CurResize && !c->isfloating) {
 +					resizing_from_mouse = 0;
 +				}
 +			} else {
 +				if (cursor_mode == CurResize && resizing_from_mouse)
 +					resizing_from_mouse = 0;
 +			}
 +			/* Default behaviour */
 			wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
 			cursor_mode = CurNormal;
 			/* Drop the window off on its new monitor */
-@@ -750,6 +780,7 @@ cleanupmon(struct wl_listener *listener, void *data)
+@@ -750,6 +774,7 @@ cleanupmon(struct wl_listener *listener, void *data)
 	wlr_output_layout_remove(output_layout, m->wlr_output);
 	wlr_scene_output_destroy(m->scene_output);
@@ -738,7 +734,7 @@ index 8101ffa..32a94c4 100644
 	closemon(m);
 	wlr_scene_node_destroy(&m->fullscreen_bg->node);
 	free(m);
-@@ -1094,6 +1125,7 @@ createmon(struct wl_listener *listener, void *data)
+@@ -1094,6 +1119,7 @@ createmon(struct wl_listener *listener, void *data)
 	wl_list_insert(&mons, &m->link);
 	printstatus();
@@ -746,23 +742,25 @@ index 8101ffa..32a94c4 100644
 	/* The xdg-protocol specifies:
 	 *
-@@ -1336,6 +1368,15 @@ destroynotify(struct wl_listener *listener, void *data)
+@@ -1333,9 +1359,17 @@ destroynotify(struct wl_listener *listener, void *data)
 {
 	/* Called when the xdg_toplevel is destroyed. */
 	Client *c = wl_container_of(listener, c, destroy);
 +	Monitor *mon;
 	wl_list_remove(&c->destroy.link);
 	wl_list_remove(&c->set_title.link);
 	wl_list_remove(&c->fullscreen.link);
 +	/* We check if the destroyed client was part of any tiled_list, to catch
 +	 * client removals even if they would not be currently managed by btrtile */
-+    // btrtile remove clients for each monitor
+	wl_list_for_each(mon, &mons, link) {
-+    Monitor *mon;
+		if (mon->root) {
-+    wl_list_for_each(mon, &mons, link) {
+			remove_client(mon, c);
-+        if (mon->root) {
+		}
-+            remove_client(mon, c);
+	}
 +        }
 +    }
 #ifdef XWAYLAND
 	if (c->type != XDGShell) {
 		wl_list_remove(&c->activate.link);
-@@ -1866,7 +1907,8 @@ void
+@@ -1866,7 +1900,8 @@ void
 motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
 		double dx_unaccel, double dy_unaccel)
 {
@@ -772,13 +770,13 @@ index 8101ffa..32a94c4 100644
 	Client *c = NULL, *w = NULL;
 	LayerSurface *l = NULL;
 	struct wlr_surface *surface = NULL;
-@@ -1920,18 +1962,56 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1920,18 +1955,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
 	/* Update drag icon's position */
 	wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), (int)round(cursor->y));
 -	/* If we are currently grabbing the mouse, handle and return */
-+	/* Skip if internal call or already resizing */
+	/* Skip if internal call */
-+	if (time == 0 && resizing_from_mouse)
+	if (time == 0)
 +		goto focus;
 +
 +	tiled = grabc && !grabc->isfloating && !grabc->isfullscreen;
@@ -800,7 +798,7 @@ index 8101ffa..32a94c4 100644
 -		resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y,
 -			.width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1);
 -		return;
-+		if (tiled && resizing_from_mouse) {
+		if (tiled) {
 +			dx_total = cursor->x - resize_last_update_x;
 +			dy_total = cursor->y - resize_last_update_y;
 +
@@ -813,7 +811,6 @@ index 8101ffa..32a94c4 100644
 +					a.f = (float)(dy_total * resize_factor);
 +					setratio_v(&a);
 +				}
 +				arrange(selmon);
 +
 +				last_resize_time = time;
 +				resize_last_update_x = cursor->x;
@@ -836,7 +833,7 @@ index 8101ffa..32a94c4 100644
 	/* If there's no client surface under the cursor, set the cursor image to a
 	 * default. This is what makes the cursor image appear when you move it
 	 * off of a client or over its border. */
-@@ -1965,22 +2045,41 @@ moveresize(const Arg *arg)
+@@ -1965,22 +2037,40 @@ moveresize(const Arg *arg)
 	if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
 		return;
@@ -871,7 +868,6 @@ index 8101ffa..32a94c4 100644
 +			wlr_cursor_set_xcursor(cursor, cursor_mgr, "se-resize");
 +			resize_last_update_x = cursor->x;
 +			resize_last_update_y = cursor->y;
 +			resizing_from_mouse = 1;
 +			break;
 +		}
 +	} else {
@@ -894,17 +890,17 @@ index 8101ffa..32a94c4 100644
 	}
 }
-@@ -2833,6 +2932,14 @@ unmapnotify(struct wl_listener *listener, void *data)
+@@ -2833,6 +2923,14 @@ unmapnotify(struct wl_listener *listener, void *data)
 			focusclient(focustop(selmon), 1);
 		}
 	} else {
-+        // btrtile remove clients for each monitor
+		/* btrtile remove clients for each monitor */
-+        Monitor *mon;
+		Monitor *mon;
-+        wl_list_for_each(mon, &mons, link) {
+		wl_list_for_each(mon, &mons, link) {
-+            if (mon->root) {
+			if (mon->root) {
-+                remove_client(mon, c);
+				remove_client(mon, c);
-+            }
+			}
-+        }
+		}
 +
 		wl_list_remove(&c->link);
 		setmon(c, NULL, 0);
@@ -2,8 +2,8 @@
 # simple_scratchpad — A very simple scratchpad utility.
-Adds functions to add, toggle and remove clients to/from scratchpad client list.
+Adds functions to add, toggle and remove clients to/from scratchpad client lists.
-![scratchpad in action](https://github.com/julmajustus/dwl-patches/blob/main/demos/simple_scratchpad_demo.gif?raw=true)
+![scratchpad in action](https://codeberg.org/julmajustus/my-dwl-patches/raw/branch/main/demos/simple_scratchpad_demo.gif?raw=true)
 ---
@@ -16,11 +16,14 @@ Adds functions to add, toggle and remove clients to/from scratchpad client list.
 3. **removescratchpad**
  - Removes client from scratchpad client list.
 4. **setscratchpad**
  - Sets current scratchpad number
 ### Download
 - [git branch](https://codeberg.org/julmajustus/dwl/src/branch/simple_scratchpad) 
- [scratchpad-wlroots-next-f4249db.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simple_scratchpad/simple_scratchpad-f4249db.patch)
+- [scratchpad-wlroots-next-d41ecb7.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simple_scratchpad/simple_scratchpad-wlroots-next-d41ecb7.patch)
- [scratchpad-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simple_scratchpad/simple_scratchpad-0.8.patch)
+- [scratchpad-v0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simple_scratchpad/simple_scratchpad-v0.8.patch)
 ### Authors
 - [julmajustus](https://codeberg.org/julmajustus)
@@ -1,211 +0,0 @@
 From 0d603b179ccccbb4270fd202a14a2db18d0a5413 Mon Sep 17 00:00:00 2001
 From: A Frederick Christensen <dwl@ivories.org>
 Date: Thu, 26 Feb 2026 17:09:28 -0600
 Subject: [PATCH] Apply simple_scratchpad patch
 ---
 config.def.h        |  3 ++
 dwl.c               | 34 +++++++++++++++++++++--
 simple_scratchpad.c | 68 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 simple_scratchpad.c
 diff --git a/config.def.h b/config.def.h
 index 8a6eda0..6254fc9 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -132,6 +132,9 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_Return,      zoom,             {0} },
 	{ MODKEY,                    XKB_KEY_Tab,         view,             {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c,           killclient,       {0} },
 +	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_z,           addscratchpad,    {0} },
 +	{ MODKEY|WLR_MODIFIER_CTRL,  XKB_KEY_z,           togglescratchpad, {0} },
 +	{ MODKEY,                    XKB_KEY_z,           removescratchpad, {0} },
 	{ MODKEY,                    XKB_KEY_t,           setlayout,        {.v = &layouts[0]} },
 	{ MODKEY,                    XKB_KEY_f,           setlayout,        {.v = &layouts[1]} },
 	{ MODKEY,                    XKB_KEY_m,           setlayout,        {.v = &layouts[2]} },
 diff --git a/dwl.c b/dwl.c
 index 44f3ad9..215f630 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -139,6 +139,7 @@ typedef struct {
 	uint32_t tags;
 	int isfloating, isurgent, isfullscreen;
 	uint32_t resize; /* configure serial of a pending resize */
 +	struct wl_list link_temp;
 } Client;
 typedef struct {
@@ -240,6 +241,7 @@ typedef struct {
 } SessionLock;
 /* function declarations */
 +static void addscratchpad(const Arg *arg);
 static void applybounds(Client *c, struct wlr_box *bbox);
 static void applyrules(Client *c);
 static void arrange(Monitor *m);
@@ -314,6 +316,7 @@ static void printstatus(void);
 static void powermgrsetmode(struct wl_listener *listener, void *data);
 static void quit(const Arg *arg);
 static void rendermon(struct wl_listener *listener, void *data);
 +static void removescratchpad(const Arg *arg);
 static void requestdecorationmode(struct wl_listener *listener, void *data);
 static void requeststartdrag(struct wl_listener *listener, void *data);
 static void requestmonstate(struct wl_listener *listener, void *data);
@@ -336,6 +339,7 @@ static void tagmon(const Arg *arg);
 static void tile(Monitor *m);
 static void togglefloating(const Arg *arg);
 static void togglefullscreen(const Arg *arg);
 +static void togglescratchpad(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unlocksession(struct wl_listener *listener, void *data);
@@ -406,6 +410,9 @@ static struct wlr_box sgeom;
 static struct wl_list mons;
 static Monitor *selmon;
 +static struct wl_list scratchpad_clients;
 +static int scratchpad_visible = 1;
 +
 /* global event handlers */
 static struct wl_listener cursor_axis = {.notify = axisnotify};
 static struct wl_listener cursor_button = {.notify = buttonpress};
@@ -455,6 +462,8 @@ static struct wlr_xwayland *xwayland;
 /* attempt to encapsulate suck into one file */
 #include "client.h"
 +#include "simple_scratchpad.c"
 +
 /* function implementations */
 void
 applybounds(Client *c, struct wlr_box *bbox)
@@ -1328,10 +1337,20 @@ void
 destroynotify(struct wl_listener *listener, void *data)
 {
 	/* Called when the xdg_toplevel is destroyed. */
 -	Client *c = wl_container_of(listener, c, destroy);
 +	Client *sc, *c = wl_container_of(listener, c, destroy);
 	wl_list_remove(&c->destroy.link);
 	wl_list_remove(&c->set_title.link);
 	wl_list_remove(&c->fullscreen.link);
 +	/* Check if destroyed client was part of scratchpad_clients
 +	 * and clean it from the list if so. */
 +	if (c && wl_list_length(&scratchpad_clients) > 0) {
 +		wl_list_for_each(sc, &scratchpad_clients, link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				break;
 +			}
 +		}
 +	}
 #ifdef XWAYLAND
 	if (c->type != XDGShell) {
 		wl_list_remove(&c->activate.link);
@@ -2333,11 +2352,21 @@ setcursorshape(struct wl_listener *listener, void *data)
 void
 setfloating(Client *c, int floating)
 {
 -	Client *p = client_get_parent(c);
 +	Client *sc, *p = client_get_parent(c);
 	c->isfloating = floating;
 	/* If in floating layout do not change the client's layer */
 	if (!c->mon || !client_surface(c)->mapped || !c->mon->lt[c->mon->sellt]->arrange)
 		return;
 +	/* Check if unfloated client was part of scratchpad_clients
 +	 * and remove it from scratchpad_clients list if so */
 +	if (!floating && wl_list_length(&scratchpad_clients) > 0) {
 +		wl_list_for_each(sc, &scratchpad_clients, link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				break;
 +			}
 +		}
 +	}
 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
 			(p && p->isfullscreen) ? LyrFS
 			: c->isfloating ? LyrFloat : LyrTile]);
@@ -2554,6 +2583,7 @@ setup(void)
 	 */
 	wl_list_init(&clients);
 	wl_list_init(&fstack);
 +	wl_list_init(&scratchpad_clients);
 	xdg_shell = wlr_xdg_shell_create(dpy, 6);
 	wl_signal_add(&xdg_shell->events.new_toplevel, &new_xdg_toplevel);
 diff --git a/simple_scratchpad.c b/simple_scratchpad.c
 new file mode 100644
 index 0000000..26d6b66
 --- /dev/null
 +++ b/simple_scratchpad.c
@@ -0,0 +1,68 @@
 +/* ************************************************************************** */
 +/*                                                                            */
 +/*                                                        :::      ::::::::   */
 +/*   simple_scratchpad.c                                :+:      :+:    :+:   */
 +/*                                                    +:+ +:+         +:+     */
 +/*   By: jmakkone <jmakkone@student.hive.fi>        +#+  +:+       +#+        */
 +/*                                                +#+#+#+#+#+   +#+           */
 +/*   Created: 2024/12/19 19:35:02 by jmakkone          #+#    #+#             */
 +/*   Updated: 2025/01/04 13:35:50 by jmakkone         ###   ########.fr       */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
 +void
 +addscratchpad(const Arg *arg)
 +{
 +	Client *cc, *c = focustop(selmon);
 +
 +	if (!c)
 +		return;
 +	/* Check if the added client is already a scratchpad client */
 +	wl_list_for_each(cc, &scratchpad_clients, link_temp) {
 +		if (cc == c)
 +			return;
 +	}
 +	if (!c->isfloating) {
 +		setfloating(c, 1);
 +	}
 +	wl_list_insert(&scratchpad_clients, &c->link_temp);
 +}
 +
 +void
 +togglescratchpad(const Arg *arg)
 +{
 +	Client *c;
 +	Monitor *m = selmon;
 +
 +	scratchpad_visible = !scratchpad_visible;
 +	if (scratchpad_visible) {
 +		wl_list_for_each(c, &scratchpad_clients, link_temp) {
 +			c->mon = m;
 +			c->tags = m->tagset[m->seltags];
 +			arrange(m);
 +			focusclient(c, 1);
 +		}
 +	} else {
 +		wl_list_for_each(c, &scratchpad_clients, link_temp) {
 +			c->tags = 0;
 +			focusclient(focustop(m), 1);
 +			arrange(m);
 +		}
 +	}
 +}
 +
 +void
 +removescratchpad(const Arg *arg)
 +{
 +	Client *sc, *c = focustop(selmon);
 +
 +	if (c && wl_list_length(&scratchpad_clients) > 0) {
 +		/* Check if c is in scratchpad_clients */
 +		wl_list_for_each(sc, &scratchpad_clients, link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				break;
 +			}
 +		}
 +	}
 +}
 -- 
 2.52.0
@@ -0,0 +1,256 @@
 From 09c708876afe3675f68f7b35c3f17263b134ceee Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
 Date: Thu, 21 May 2026 00:28:15 +0300
 Subject: [PATCH] simple_scratchpad: Spring update scratchpad V2
 - Added support for multiple scratchpads
 ---
 config.def.h        |  7 ++++
 dwl.c               | 43 +++++++++++++++++++++--
 simple_scratchpad.c | 85 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+), 2 deletions(-)
 create mode 100644 simple_scratchpad.c
 diff --git a/config.def.h b/config.def.h
 index 8a6eda0..a527e09 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -14,6 +14,7 @@ static const float urgentcolor[]           = COLOR(0xff0000ff);
 /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
 static const float fullscreen_bg[]         = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */
 +#define SCRATCHPAD_COUNT 3
 /* tagging - TAGCOUNT must be no greater than 31 */
 #define TAGCOUNT (9)
@@ -132,6 +133,9 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_Return,      zoom,             {0} },
 	{ MODKEY,                    XKB_KEY_Tab,         view,             {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c,           killclient,       {0} },
 +	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_z,           addscratchpad,    {0} },
 +	{ MODKEY|WLR_MODIFIER_CTRL,  XKB_KEY_z,           togglescratchpad, {0} },
 +	{ MODKEY,                    XKB_KEY_z,           removescratchpad, {0} },
 	{ MODKEY,                    XKB_KEY_t,           setlayout,        {.v = &layouts[0]} },
 	{ MODKEY,                    XKB_KEY_f,           setlayout,        {.v = &layouts[1]} },
 	{ MODKEY,                    XKB_KEY_m,           setlayout,        {.v = &layouts[2]} },
@@ -144,6 +148,9 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_period,      focusmon,         {.i = WLR_DIRECTION_RIGHT} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,        tagmon,           {.i = WLR_DIRECTION_LEFT} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,     tagmon,           {.i = WLR_DIRECTION_RIGHT} },
 +	{ MODKEY|WLR_MODIFIER_LOGO,  XKB_KEY_1,           setscratchpad,    {.i = 0} },
 +	{ MODKEY|WLR_MODIFIER_LOGO,  XKB_KEY_2,           setscratchpad,    {.i = 1} },
 +	{ MODKEY|WLR_MODIFIER_LOGO,  XKB_KEY_3,           setscratchpad,    {.i = 2} },
 	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                        0),
 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                            1),
 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                    2),
 diff --git a/dwl.c b/dwl.c
 index 44f3ad9..f54bbda 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -139,6 +139,7 @@ typedef struct {
 	uint32_t tags;
 	int isfloating, isurgent, isfullscreen;
 	uint32_t resize; /* configure serial of a pending resize */
 +	struct wl_list link_temp;
 } Client;
 typedef struct {
@@ -240,6 +241,7 @@ typedef struct {
 } SessionLock;
 /* function declarations */
 +static void addscratchpad(const Arg *arg);
 static void applybounds(Client *c, struct wlr_box *bbox);
 static void applyrules(Client *c);
 static void arrange(Monitor *m);
@@ -314,6 +316,7 @@ static void printstatus(void);
 static void powermgrsetmode(struct wl_listener *listener, void *data);
 static void quit(const Arg *arg);
 static void rendermon(struct wl_listener *listener, void *data);
 +static void removescratchpad(const Arg *arg);
 static void requestdecorationmode(struct wl_listener *listener, void *data);
 static void requeststartdrag(struct wl_listener *listener, void *data);
 static void requestmonstate(struct wl_listener *listener, void *data);
@@ -327,6 +330,7 @@ static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setmon(Client *c, Monitor *m, uint32_t newtags);
 static void setpsel(struct wl_listener *listener, void *data);
 +static void setscratchpad(const Arg *arg);
 static void setsel(struct wl_listener *listener, void *data);
 static void setup(void);
 static void spawn(const Arg *arg);
@@ -336,6 +340,7 @@ static void tagmon(const Arg *arg);
 static void tile(Monitor *m);
 static void togglefloating(const Arg *arg);
 static void togglefullscreen(const Arg *arg);
 +static void togglescratchpad(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unlocksession(struct wl_listener *listener, void *data);
@@ -455,6 +460,11 @@ static struct wlr_xwayland *xwayland;
 /* attempt to encapsulate suck into one file */
 #include "client.h"
 +static struct wl_list scratchpad_clients[SCRATCHPAD_COUNT];
 +static int scratchpad_visible[SCRATCHPAD_COUNT];
 +static int scratchpad_sel = 0;
 +#include "simple_scratchpad.c"
 +
 /* function implementations */
 void
 applybounds(Client *c, struct wlr_box *bbox)
@@ -1328,10 +1338,21 @@ void
 destroynotify(struct wl_listener *listener, void *data)
 {
 	/* Called when the xdg_toplevel is destroyed. */
 -	Client *c = wl_container_of(listener, c, destroy);
 +	Client *sc, *c = wl_container_of(listener, c, destroy);
 	wl_list_remove(&c->destroy.link);
 	wl_list_remove(&c->set_title.link);
 	wl_list_remove(&c->fullscreen.link);
 +	/* Check if destroyed client was part of any scratchpad slot
 +	 * and clean it from the list if so. */
 +	for (int i = 0; i < SCRATCHPAD_COUNT; i++) {
 +		wl_list_for_each(sc, &scratchpad_clients[i], link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				goto scratchpad_destroy_done;
 +			}
 +		}
 +	}
 +scratchpad_destroy_done:;
 #ifdef XWAYLAND
 	if (c->type != XDGShell) {
 		wl_list_remove(&c->activate.link);
@@ -2333,11 +2354,24 @@ setcursorshape(struct wl_listener *listener, void *data)
 void
 setfloating(Client *c, int floating)
 {
 -	Client *p = client_get_parent(c);
 +	Client *sc, *p = client_get_parent(c);
 	c->isfloating = floating;
 	/* If in floating layout do not change the client's layer */
 	if (!c->mon || !client_surface(c)->mapped || !c->mon->lt[c->mon->sellt]->arrange)
 		return;
 +	/* Check if unfloated client was part of any scratchpad slot
 +	 * and remove it from that slot if so */
 +	if (!floating) {
 +		for (int i = 0; i < SCRATCHPAD_COUNT; i++) {
 +			wl_list_for_each(sc, &scratchpad_clients[i], link_temp) {
 +				if (sc == c) {
 +					wl_list_remove(&c->link_temp);
 +					goto scratchpad_float_done;
 +				}
 +			}
 +		}
 +scratchpad_float_done:;
 +	}
 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
 			(p && p->isfullscreen) ? LyrFS
 			: c->isfloating ? LyrFloat : LyrTile]);
@@ -2554,6 +2588,11 @@ setup(void)
 	 */
 	wl_list_init(&clients);
 	wl_list_init(&fstack);
 +	wl_list_init(&fstack);
 +	for (int j = 0; j < SCRATCHPAD_COUNT; j++) {
 +		wl_list_init(&scratchpad_clients[j]);
 +		scratchpad_visible[j] = 1;
 +	}
 	xdg_shell = wlr_xdg_shell_create(dpy, 6);
 	wl_signal_add(&xdg_shell->events.new_toplevel, &new_xdg_toplevel);
 diff --git a/simple_scratchpad.c b/simple_scratchpad.c
 new file mode 100644
 index 0000000..cd62d83
 --- /dev/null
 +++ b/simple_scratchpad.c
@@ -0,0 +1,85 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
 +/*                                                   @@!         @@!   @@@@   */
 +/*                                                    !@!        !@!  @!@!@   */
 +/*   simple_scratchpad.c                               @!!       @!@ @! !@!   */
 +/*                                                      !!!      !@!!!  !!!   */
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/19 19:35:02 by jmakkone           ::    ::::::: ::   */
 +/*   Updated: 2026/05/20 23:58:16 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
 +void
 +addscratchpad(const Arg *arg)
 +{
 +	Client *cc, *c = focustop(selmon);
 +
 +	if (!c)
 +		return;
 +	/* Check if the added client is already a scratchpad client */
 +	for (int i = 0; i < SCRATCHPAD_COUNT; i++) {
 +		wl_list_for_each(cc, &scratchpad_clients[i], link_temp) {
 +			if (cc == c)
 +				return;
 +		}
 +	}
 +	if (!c->isfloating) {
 +		setfloating(c, 1);
 +	}
 +	wl_list_insert(&scratchpad_clients[scratchpad_sel], &c->link_temp);
 +}
 +
 +void
 +togglescratchpad(const Arg *arg)
 +{
 +	Client *c;
 +	Monitor *m = selmon;
 +
 +	scratchpad_visible[scratchpad_sel] = !scratchpad_visible[scratchpad_sel];
 +	if (scratchpad_visible[scratchpad_sel]) {
 +		wl_list_for_each(c, &scratchpad_clients[scratchpad_sel], link_temp) {
 +			c->mon = m;
 +			c->tags = m->tagset[m->seltags];
 +			arrange(m);
 +			focusclient(c, 1);
 +		}
 +	} else {
 +		wl_list_for_each(c, &scratchpad_clients[scratchpad_sel], link_temp) {
 +			c->tags = 0;
 +			focusclient(focustop(m), 1);
 +			arrange(m);
 +		}
 +	}
 +}
 +
 +void
 +removescratchpad(const Arg *arg)
 +{
 +	Client *sc, *c = focustop(selmon);
 +	if (!c)
 +		return;
 +	for (int i = 0; i < SCRATCHPAD_COUNT; i++) {
 +		/* Check if c is in scratchpad_clients */
 +		wl_list_for_each(sc, &scratchpad_clients[i], link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				return;
 +			}
 +		}
 +	}
 +}
 +
 +void
 +setscratchpad(const Arg *arg)
 +{
 +	int idx = arg->i;
 +
 +	if (idx < 0)
 +		idx = 0;
 +	else if (idx >= SCRATCHPAD_COUNT)
 +		idx = SCRATCHPAD_COUNT - 1;
 +	scratchpad_sel = idx;
 +}
 -- 
 2.53.0
@@ -0,0 +1,256 @@
 From be4f7488eac6ea502e0e9d1cc5595e01d97cb345 Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
 Date: Thu, 21 May 2026 00:28:41 +0300
 Subject: [PATCH] simple_scratchpad: Spring update scratchpad V2
 - Added support for multiple scratchpads
 ---
 config.def.h        |  7 ++++
 dwl.c               | 43 +++++++++++++++++++++--
 simple_scratchpad.c | 85 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+), 2 deletions(-)
 create mode 100644 simple_scratchpad.c
 diff --git a/config.def.h b/config.def.h
 index 8a6eda0..a527e09 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -14,6 +14,7 @@ static const float urgentcolor[]           = COLOR(0xff0000ff);
 /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
 static const float fullscreen_bg[]         = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */
 +#define SCRATCHPAD_COUNT 3
 /* tagging - TAGCOUNT must be no greater than 31 */
 #define TAGCOUNT (9)
@@ -132,6 +133,9 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_Return,      zoom,             {0} },
 	{ MODKEY,                    XKB_KEY_Tab,         view,             {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c,           killclient,       {0} },
 +	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_z,           addscratchpad,    {0} },
 +	{ MODKEY|WLR_MODIFIER_CTRL,  XKB_KEY_z,           togglescratchpad, {0} },
 +	{ MODKEY,                    XKB_KEY_z,           removescratchpad, {0} },
 	{ MODKEY,                    XKB_KEY_t,           setlayout,        {.v = &layouts[0]} },
 	{ MODKEY,                    XKB_KEY_f,           setlayout,        {.v = &layouts[1]} },
 	{ MODKEY,                    XKB_KEY_m,           setlayout,        {.v = &layouts[2]} },
@@ -144,6 +148,9 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_period,      focusmon,         {.i = WLR_DIRECTION_RIGHT} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,        tagmon,           {.i = WLR_DIRECTION_LEFT} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,     tagmon,           {.i = WLR_DIRECTION_RIGHT} },
 +	{ MODKEY|WLR_MODIFIER_LOGO,  XKB_KEY_1,           setscratchpad,    {.i = 0} },
 +	{ MODKEY|WLR_MODIFIER_LOGO,  XKB_KEY_2,           setscratchpad,    {.i = 1} },
 +	{ MODKEY|WLR_MODIFIER_LOGO,  XKB_KEY_3,           setscratchpad,    {.i = 2} },
 	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                        0),
 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                            1),
 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                    2),
 diff --git a/dwl.c b/dwl.c
 index 8101ffa..1c858a8 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -143,6 +143,7 @@ typedef struct {
 	uint32_t tags;
 	int isfloating, isurgent, isfullscreen;
 	uint32_t resize; /* configure serial of a pending resize */
 +	struct wl_list link_temp;
 } Client;
 typedef struct {
@@ -244,6 +245,7 @@ typedef struct {
 } SessionLock;
 /* function declarations */
 +static void addscratchpad(const Arg *arg);
 static void applybounds(Client *c, struct wlr_box *bbox);
 static void applyrules(Client *c);
 static void arrange(Monitor *m);
@@ -318,6 +320,7 @@ static void printstatus(void);
 static void powermgrsetmode(struct wl_listener *listener, void *data);
 static void quit(const Arg *arg);
 static void rendermon(struct wl_listener *listener, void *data);
 +static void removescratchpad(const Arg *arg);
 static void requestdecorationmode(struct wl_listener *listener, void *data);
 static void requeststartdrag(struct wl_listener *listener, void *data);
 static void requestmonstate(struct wl_listener *listener, void *data);
@@ -331,6 +334,7 @@ static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setmon(Client *c, Monitor *m, uint32_t newtags);
 static void setpsel(struct wl_listener *listener, void *data);
 +static void setscratchpad(const Arg *arg);
 static void setsel(struct wl_listener *listener, void *data);
 static void setup(void);
 static void spawn(const Arg *arg);
@@ -340,6 +344,7 @@ static void tagmon(const Arg *arg);
 static void tile(Monitor *m);
 static void togglefloating(const Arg *arg);
 static void togglefullscreen(const Arg *arg);
 +static void togglescratchpad(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unlocksession(struct wl_listener *listener, void *data);
@@ -459,6 +464,11 @@ static struct wlr_xwayland *xwayland;
 /* attempt to encapsulate suck into one file */
 #include "client.h"
 +static struct wl_list scratchpad_clients[SCRATCHPAD_COUNT];
 +static int scratchpad_visible[SCRATCHPAD_COUNT];
 +static int scratchpad_sel = 0;
 +#include "simple_scratchpad.c"
 +
 /* function implementations */
 void
 applybounds(Client *c, struct wlr_box *bbox)
@@ -1332,10 +1342,21 @@ void
 destroynotify(struct wl_listener *listener, void *data)
 {
 	/* Called when the xdg_toplevel is destroyed. */
 -	Client *c = wl_container_of(listener, c, destroy);
 +	Client *sc, *c = wl_container_of(listener, c, destroy);
 	wl_list_remove(&c->destroy.link);
 	wl_list_remove(&c->set_title.link);
 	wl_list_remove(&c->fullscreen.link);
 +	/* Check if destroyed client was part of any scratchpad slot
 +	 * and clean it from the list if so. */
 +	for (int i = 0; i < SCRATCHPAD_COUNT; i++) {
 +		wl_list_for_each(sc, &scratchpad_clients[i], link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				goto scratchpad_destroy_done;
 +			}
 +		}
 +	}
 +scratchpad_destroy_done:;
 #ifdef XWAYLAND
 	if (c->type != XDGShell) {
 		wl_list_remove(&c->activate.link);
@@ -2337,11 +2358,24 @@ setcursorshape(struct wl_listener *listener, void *data)
 void
 setfloating(Client *c, int floating)
 {
 -	Client *p = client_get_parent(c);
 +	Client *sc, *p = client_get_parent(c);
 	c->isfloating = floating;
 	/* If in floating layout do not change the client's layer */
 	if (!c->mon || !client_surface(c)->mapped || !c->mon->lt[c->mon->sellt]->arrange)
 		return;
 +	/* Check if unfloated client was part of any scratchpad slot
 +	 * and remove it from that slot if so */
 +	if (!floating) {
 +		for (int i = 0; i < SCRATCHPAD_COUNT; i++) {
 +			wl_list_for_each(sc, &scratchpad_clients[i], link_temp) {
 +				if (sc == c) {
 +					wl_list_remove(&c->link_temp);
 +					goto scratchpad_float_done;
 +				}
 +			}
 +		}
 +scratchpad_float_done:;
 +	}
 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
 			(p && p->isfullscreen) ? LyrFS
 			: c->isfloating ? LyrFloat : LyrTile]);
@@ -2561,6 +2595,11 @@ setup(void)
 	 */
 	wl_list_init(&clients);
 	wl_list_init(&fstack);
 +	wl_list_init(&fstack);
 +	for (int j = 0; j < SCRATCHPAD_COUNT; j++) {
 +		wl_list_init(&scratchpad_clients[j]);
 +		scratchpad_visible[j] = 1;
 +	}
 	xdg_shell = wlr_xdg_shell_create(dpy, 6);
 	wl_signal_add(&xdg_shell->events.new_toplevel, &new_xdg_toplevel);
 diff --git a/simple_scratchpad.c b/simple_scratchpad.c
 new file mode 100644
 index 0000000..0e23ddd
 --- /dev/null
 +++ b/simple_scratchpad.c
@@ -0,0 +1,85 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
 +/*                                                   @@!         @@!   @@@@   */
 +/*                                                    !@!        !@!  @!@!@   */
 +/*   simple_scratchpad.c                               @!!       @!@ @! !@!   */
 +/*                                                      !!!      !@!!!  !!!   */
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/19 19:35:02 by jmakkone           ::    ::::::: ::   */
 +/*   Updated: 2026/05/20 23:56:35 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
 +void
 +addscratchpad(const Arg *arg)
 +{
 +	Client *cc, *c = focustop(selmon);
 +
 +	if (!c)
 +		return;
 +	/* Check if the added client is already a scratchpad client */
 +	for (int i = 0; i < SCRATCHPAD_COUNT; i++) {
 +		wl_list_for_each(cc, &scratchpad_clients[i], link_temp) {
 +			if (cc == c)
 +				return;
 +		}
 +	}
 +	if (!c->isfloating) {
 +		setfloating(c, 1);
 +	}
 +	wl_list_insert(&scratchpad_clients[scratchpad_sel], &c->link_temp);
 +}
 +
 +void
 +togglescratchpad(const Arg *arg)
 +{
 +	Client *c;
 +	Monitor *m = selmon;
 +
 +	scratchpad_visible[scratchpad_sel] = !scratchpad_visible[scratchpad_sel];
 +	if (scratchpad_visible[scratchpad_sel]) {
 +		wl_list_for_each(c, &scratchpad_clients[scratchpad_sel], link_temp) {
 +			c->mon = m;
 +			c->tags = m->tagset[m->seltags];
 +			arrange(m);
 +			focusclient(c, 1);
 +		}
 +	} else {
 +		wl_list_for_each(c, &scratchpad_clients[scratchpad_sel], link_temp) {
 +			c->tags = 0;
 +			focusclient(focustop(m), 1);
 +			arrange(m);
 +		}
 +	}
 +}
 +
 +void
 +removescratchpad(const Arg *arg)
 +{
 +	Client *sc, *c = focustop(selmon);
 +	if (!c)
 +		return;
 +	for (int i = 0; i < SCRATCHPAD_COUNT; i++) {
 +		/* Check if c is in scratchpad_clients */
 +		wl_list_for_each(sc, &scratchpad_clients[i], link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				return;
 +			}
 +		}
 +	}
 +}
 +
 +void
 +setscratchpad(const Arg *arg)
 +{
 +	int idx = arg->i;
 +
 +	if (idx < 0)
 +		idx = 0;
 +	else if (idx >= SCRATCHPAD_COUNT)
 +		idx = SCRATCHPAD_COUNT - 1;
 +	scratchpad_sel = idx;
 +}
 -- 
 2.53.0
@@ -1,219 +0,0 @@
 From 94e649317328c7af091516fe3441ea80a814d1e4 Mon Sep 17 00:00:00 2001
 From: A Frederick Christensen <dwl@ivories.org>
 Date: Thu, 26 Feb 2026 17:18:17 -0600
 Subject: [PATCH] Apply simple_scratchpad patch
 ---
 config.def.h        |  4 ++-
 dwl.c               | 34 +++++++++++++++++++++--
 simple_scratchpad.c | 68 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 simple_scratchpad.c
 diff --git a/config.def.h b/config.def.h
 index 8a6eda0..bd6cb40 100644
 --- a/config.def.h
 +++ b/config.def.h
@@ -132,6 +132,9 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_Return,      zoom,             {0} },
 	{ MODKEY,                    XKB_KEY_Tab,         view,             {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c,           killclient,       {0} },
 +	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_z,           addscratchpad,    {0} },
 +	{ MODKEY|WLR_MODIFIER_CTRL,  XKB_KEY_z,           togglescratchpad, {0} },
 +	{ MODKEY,                    XKB_KEY_z,           removescratchpad, {0} },
 	{ MODKEY,                    XKB_KEY_t,           setlayout,        {.v = &layouts[0]} },
 	{ MODKEY,                    XKB_KEY_f,           setlayout,        {.v = &layouts[1]} },
 	{ MODKEY,                    XKB_KEY_m,           setlayout,        {.v = &layouts[2]} },
@@ -154,7 +157,6 @@ static const Key keys[] = {
 	TAGKEYS(          XKB_KEY_8, XKB_KEY_asterisk,                      7),
 	TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                     8),
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_q,           quit,             {0} },
 -
 	/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
 	{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
 	/* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is
 diff --git a/dwl.c b/dwl.c
 index 8a9715d..6ae7707 100644
 --- a/dwl.c
 +++ b/dwl.c
@@ -141,6 +141,7 @@ typedef struct {
 	uint32_t tags;
 	int isfloating, isurgent, isfullscreen;
 	uint32_t resize; /* configure serial of a pending resize */
 +	struct wl_list link_temp;
 } Client;
 typedef struct {
@@ -242,6 +243,7 @@ typedef struct {
 } SessionLock;
 /* function declarations */
 +static void addscratchpad(const Arg *arg);
 static void applybounds(Client *c, struct wlr_box *bbox);
 static void applyrules(Client *c);
 static void arrange(Monitor *m);
@@ -316,6 +318,7 @@ static void printstatus(void);
 static void powermgrsetmode(struct wl_listener *listener, void *data);
 static void quit(const Arg *arg);
 static void rendermon(struct wl_listener *listener, void *data);
 +static void removescratchpad(const Arg *arg);
 static void requestdecorationmode(struct wl_listener *listener, void *data);
 static void requeststartdrag(struct wl_listener *listener, void *data);
 static void requestmonstate(struct wl_listener *listener, void *data);
@@ -338,6 +341,7 @@ static void tagmon(const Arg *arg);
 static void tile(Monitor *m);
 static void togglefloating(const Arg *arg);
 static void togglefullscreen(const Arg *arg);
 +static void togglescratchpad(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unlocksession(struct wl_listener *listener, void *data);
@@ -408,6 +412,9 @@ static struct wlr_box sgeom;
 static struct wl_list mons;
 static Monitor *selmon;
 +static struct wl_list scratchpad_clients;
 +static int scratchpad_visible = 1;
 +
 /* global event handlers */
 static struct wl_listener cursor_axis = {.notify = axisnotify};
 static struct wl_listener cursor_button = {.notify = buttonpress};
@@ -457,6 +464,8 @@ static struct wlr_xwayland *xwayland;
 /* attempt to encapsulate suck into one file */
 #include "client.h"
 +#include "simple_scratchpad.c"
 +
 /* function implementations */
 void
 applybounds(Client *c, struct wlr_box *bbox)
@@ -1330,10 +1339,20 @@ void
 destroynotify(struct wl_listener *listener, void *data)
 {
 	/* Called when the xdg_toplevel is destroyed. */
 -	Client *c = wl_container_of(listener, c, destroy);
 +	Client *sc, *c = wl_container_of(listener, c, destroy);
 	wl_list_remove(&c->destroy.link);
 	wl_list_remove(&c->set_title.link);
 	wl_list_remove(&c->fullscreen.link);
 +	/* Check if destroyed client was part of scratchpad_clients
 +	 * and clean it from the list if so. */
 +	if (c && wl_list_length(&scratchpad_clients) > 0) {
 +		wl_list_for_each(sc, &scratchpad_clients, link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				break;
 +			}
 +		}
 +	}
 #ifdef XWAYLAND
 	if (c->type != XDGShell) {
 		wl_list_remove(&c->activate.link);
@@ -2335,11 +2354,21 @@ setcursorshape(struct wl_listener *listener, void *data)
 void
 setfloating(Client *c, int floating)
 {
 -	Client *p = client_get_parent(c);
 +	Client *sc, *p = client_get_parent(c);
 	c->isfloating = floating;
 	/* If in floating layout do not change the client's layer */
 	if (!c->mon || !client_surface(c)->mapped || !c->mon->lt[c->mon->sellt]->arrange)
 		return;
 +	/* Check if unfloated client was part of scratchpad_clients
 +	 * and remove it from scratchpad_clients list if so */
 +	if (!floating && wl_list_length(&scratchpad_clients) > 0) {
 +		wl_list_for_each(sc, &scratchpad_clients, link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				break;
 +			}
 +		}
 +	}
 	wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
 			(p && p->isfullscreen) ? LyrFS
 			: c->isfloating ? LyrFloat : LyrTile]);
@@ -2557,6 +2586,7 @@ setup(void)
 	 */
 	wl_list_init(&clients);
 	wl_list_init(&fstack);
 +	wl_list_init(&scratchpad_clients);
 	xdg_shell = wlr_xdg_shell_create(dpy, 6);
 	wl_signal_add(&xdg_shell->events.new_toplevel, &new_xdg_toplevel);
 diff --git a/simple_scratchpad.c b/simple_scratchpad.c
 new file mode 100644
 index 0000000..26d6b66
 --- /dev/null
 +++ b/simple_scratchpad.c
@@ -0,0 +1,68 @@
 +/* ************************************************************************** */
 +/*                                                                            */
 +/*                                                        :::      ::::::::   */
 +/*   simple_scratchpad.c                                :+:      :+:    :+:   */
 +/*                                                    +:+ +:+         +:+     */
 +/*   By: jmakkone <jmakkone@student.hive.fi>        +#+  +:+       +#+        */
 +/*                                                +#+#+#+#+#+   +#+           */
 +/*   Created: 2024/12/19 19:35:02 by jmakkone          #+#    #+#             */
 +/*   Updated: 2025/01/04 13:35:50 by jmakkone         ###   ########.fr       */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
 +void
 +addscratchpad(const Arg *arg)
 +{
 +	Client *cc, *c = focustop(selmon);
 +
 +	if (!c)
 +		return;
 +	/* Check if the added client is already a scratchpad client */
 +	wl_list_for_each(cc, &scratchpad_clients, link_temp) {
 +		if (cc == c)
 +			return;
 +	}
 +	if (!c->isfloating) {
 +		setfloating(c, 1);
 +	}
 +	wl_list_insert(&scratchpad_clients, &c->link_temp);
 +}
 +
 +void
 +togglescratchpad(const Arg *arg)
 +{
 +	Client *c;
 +	Monitor *m = selmon;
 +
 +	scratchpad_visible = !scratchpad_visible;
 +	if (scratchpad_visible) {
 +		wl_list_for_each(c, &scratchpad_clients, link_temp) {
 +			c->mon = m;
 +			c->tags = m->tagset[m->seltags];
 +			arrange(m);
 +			focusclient(c, 1);
 +		}
 +	} else {
 +		wl_list_for_each(c, &scratchpad_clients, link_temp) {
 +			c->tags = 0;
 +			focusclient(focustop(m), 1);
 +			arrange(m);
 +		}
 +	}
 +}
 +
 +void
 +removescratchpad(const Arg *arg)
 +{
 +	Client *sc, *c = focustop(selmon);
 +
 +	if (c && wl_list_length(&scratchpad_clients) > 0) {
 +		/* Check if c is in scratchpad_clients */
 +		wl_list_for_each(sc, &scratchpad_clients, link_temp) {
 +			if (sc == c) {
 +				wl_list_remove(&c->link_temp);
 +				break;
 +			}
 +		}
 +	}
 +}
 -- 
 2.52.0
Author	SHA1	Message	Date
julmajustus	1f0e82bf5d	simple_scratchpad: - Fixed broken media links	2026-05-21 01:13:24 +03:00
julmajustus	5483e1d437	btrtile: - Fixed broken media links	2026-05-21 01:12:03 +03:00
julmajustus	30c33ed26c	simple_scratchpad: Spring update scratchpad V2 - Added support for multiple scratchpads	2026-05-21 01:05:17 +03:00
julmajustus	03de6e2ada	btrtile: Spring update pt2 - Simplified the resizing logic to avoid full arrange calls from motionnotify - Minor intend fixes	2026-05-21 00:54:00 +03:00