From 706d6350cb765163dbd739cbea3ab27df7c34174 Mon Sep 17 00:00:00 2001
From: julmajustus <julmajustus@tutanota.com>
Date: Mon, 22 Jun 2026 23:17:56 +0300
Subject: [PATCH] btrtile: bug fixes and readability improvements

- Removed client old_geom caching for simplicity; fixes: https://codeberg.org/dwl/dwl-patches/issues/647
- Improved readability of the client sanitization loop inside btrtile()
- Removed fullscreened clients from the sanitization loop to retain their geometry
---
 patches/btrtile/btrtile-v0.8-gaps.patch       | 70 ++++++++----------
 patches/btrtile/btrtile-v0.8.patch            | 70 ++++++++----------
 .../btrtile-wlroots-next-d41ecb7-gaps.patch   | 72 +++++++++----------
 .../btrtile-wlroots-next-d41ecb7.patch        | 70 ++++++++----------
 4 files changed, 122 insertions(+), 160 deletions(-)

diff --git a/patches/btrtile/btrtile-v0.8-gaps.patch b/patches/btrtile/btrtile-v0.8-gaps.patch
index b8f48c3..8fda516 100644
--- a/patches/btrtile/btrtile-v0.8-gaps.patch
+++ b/patches/btrtile/btrtile-v0.8-gaps.patch
@@ -1,24 +1,24 @@
-From 1520d1f200ef0fb381683c1bcd58e553b52ac289 Mon Sep 17 00:00:00 2001
+From 42e35a6a8a93f0e6d886ad69686c85c1d58536d6 Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
-Date: Thu, 21 May 2026 00:42:07 +0300
-Subject: [PATCH] btrtile: Spring update pt2
+Date: Mon, 22 Jun 2026 22:54:11 +0300
+Subject: [PATCH] btrtile: bug fixes and readability improvement
 
-- Simplified the resizing logic to avoid full arrange calls from
-motionnotify
-- Minor intend fixes
+- Removed client old_geom caching for simplicity fixes: https://codeberg.org/dwl/dwl-patches/issues/647
+- Improved readability of the client sanitization loop inside btrtile function
+- Removed fullscreened client's from the sanitization loop to retain their geometry
 ---
- btrtile.c    | 583 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ btrtile.c    | 575 +++++++++++++++++++++++++++++++++++++++++++++++++++
  config.def.h |  12 ++
- dwl.c        | 152 +++++++++++---
- 3 files changed, 720 insertions(+), 27 deletions(-)
+ dwl.c        | 151 +++++++++++---
+ 3 files changed, 711 insertions(+), 27 deletions(-)
  create mode 100644 btrtile.c
 
 diff --git a/btrtile.c b/btrtile.c
 new file mode 100644
-index 0000000..f05a30f
+index 0000000..24bf4d9
 --- /dev/null
 +++ b/btrtile.c
-@@ -0,0 +1,583 @@
+@@ -0,0 +1,575 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
@@ -29,7 +29,7 @@ index 0000000..f05a30f
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/15 00:26:07 by julmajustus           ::    ::::::: ::   */
-+/*   Updated: 2026/05/20 22:38:02 by julmajustus            : :   : : :  :    */
++/*   Updated: 2026/06/22 22:54:06 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
@@ -91,11 +91,7 @@ index 0000000..f05a30f
 +		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;
 +	}
 +
@@ -175,12 +171,10 @@ index 0000000..f05a30f
 +	if (!m)
 +		return;
 +
-+	/* Remove non tiled clients from tree. */
++	/* Remove floating and moved clients */
 +	wl_list_for_each(c, &clients, link) {
-+		if (c->mon == m && !c->isfloating && !c->isfullscreen) {
-+		} else {
++		if (c->mon != m || c->isfloating)
 +			remove_client(m, c);
-+		}
 +	}
 +
 +	/* If no client is found under cursor, fallback to focustop(m) */
@@ -464,8 +458,6 @@ index 0000000..f05a30f
 +	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. */
 +}
 +
 +void
@@ -641,7 +633,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..a121efc 100644
+index 44f3ad9..2529e1f 100644
 --- a/dwl.c
 +++ b/dwl.c
 @@ -1,6 +1,7 @@
@@ -660,18 +652,16 @@ index 44f3ad9..a121efc 100644
  typedef struct Monitor Monitor;
  typedef struct {
  	/* Must keep this field first */
-@@ -137,8 +139,9 @@ typedef struct {
+@@ -137,7 +139,7 @@ typedef struct {
  #endif
  	unsigned int bw;
  	uint32_t tags;
 -	int isfloating, isurgent, isfullscreen;
 +	int isfloating, isurgent, isfullscreen, was_tiled;
  	uint32_t resize; /* configure serial of a pending resize */
-+	struct wlr_box old_geom;
  } Client;
  
- typedef struct {
-@@ -205,6 +208,7 @@ struct Monitor {
+@@ -205,6 +207,7 @@ struct Monitor {
  	int nmaster;
  	char ltsymbol[16];
  	int asleep;
@@ -679,7 +669,7 @@ index 44f3ad9..a121efc 100644
  };
  
  typedef struct {
-@@ -247,6 +251,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
+@@ -247,6 +250,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
  		struct wlr_box *usable_area, int exclusive);
  static void arrangelayers(Monitor *m);
  static void axisnotify(struct wl_listener *listener, void *data);
@@ -687,7 +677,7 @@ index 44f3ad9..a121efc 100644
  static void buttonpress(struct wl_listener *listener, void *data);
  static void chvt(const Arg *arg);
  static void checkidleinhibitor(struct wlr_surface *exclude);
-@@ -329,6 +334,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
+@@ -329,6 +333,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
  static void setpsel(struct wl_listener *listener, void *data);
  static void setsel(struct wl_listener *listener, void *data);
  static void setup(void);
@@ -697,7 +687,7 @@ index 44f3ad9..a121efc 100644
  static void spawn(const Arg *arg);
  static void startdrag(struct wl_listener *listener, void *data);
  static void tag(const Arg *arg);
-@@ -454,6 +462,7 @@ static struct wlr_xwayland *xwayland;
+@@ -454,6 +461,7 @@ static struct wlr_xwayland *xwayland;
  
  /* attempt to encapsulate suck into one file */
  #include "client.h"
@@ -705,7 +695,7 @@ index 44f3ad9..a121efc 100644
  
  /* function implementations */
  void
-@@ -624,7 +633,7 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -624,7 +632,7 @@ buttonpress(struct wl_listener *listener, void *data)
  	struct wlr_pointer_button_event *event = data;
  	struct wlr_keyboard *keyboard;
  	uint32_t mods;
@@ -714,7 +704,7 @@ index 44f3ad9..a121efc 100644
  	const Button *b;
  
  	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
-@@ -645,7 +654,7 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -645,7 +653,7 @@ buttonpress(struct wl_listener *listener, void *data)
  		mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
  		for (b = buttons; b < END(buttons); b++) {
  			if (CLEANMASK(mods) == CLEANMASK(b->mod) &&
@@ -723,7 +713,7 @@ index 44f3ad9..a121efc 100644
  				b->func(&b->arg);
  				return;
  			}
-@@ -655,6 +664,21 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -655,6 +663,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) {
@@ -745,7 +735,7 @@ index 44f3ad9..a121efc 100644
  			wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
  			cursor_mode = CurNormal;
  			/* Drop the window off on its new monitor */
-@@ -746,6 +770,7 @@ cleanupmon(struct wl_listener *listener, void *data)
+@@ -746,6 +769,7 @@ cleanupmon(struct wl_listener *listener, void *data)
  	wlr_output_layout_remove(output_layout, m->wlr_output);
  	wlr_scene_output_destroy(m->scene_output);
  
@@ -753,7 +743,7 @@ index 44f3ad9..a121efc 100644
  	closemon(m);
  	wlr_scene_node_destroy(&m->fullscreen_bg->node);
  	free(m);
-@@ -1090,6 +1115,7 @@ createmon(struct wl_listener *listener, void *data)
+@@ -1090,6 +1114,7 @@ createmon(struct wl_listener *listener, void *data)
  
  	wl_list_insert(&mons, &m->link);
  	printstatus();
@@ -761,7 +751,7 @@ index 44f3ad9..a121efc 100644
  
  	/* The xdg-protocol specifies:
  	 *
-@@ -1329,9 +1355,17 @@ destroynotify(struct wl_listener *listener, void *data)
+@@ -1329,9 +1354,17 @@ destroynotify(struct wl_listener *listener, void *data)
  {
  	/* Called when the xdg_toplevel is destroyed. */
  	Client *c = wl_container_of(listener, c, destroy);
@@ -779,7 +769,7 @@ index 44f3ad9..a121efc 100644
  #ifdef XWAYLAND
  	if (c->type != XDGShell) {
  		wl_list_remove(&c->activate.link);
-@@ -1862,7 +1896,8 @@ void
+@@ -1862,7 +1895,8 @@ void
  motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
  		double dx_unaccel, double dy_unaccel)
  {
@@ -789,7 +779,7 @@ index 44f3ad9..a121efc 100644
  	Client *c = NULL, *w = NULL;
  	LayerSurface *l = NULL;
  	struct wlr_surface *surface = NULL;
-@@ -1916,18 +1951,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1916,18 +1950,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));
  
@@ -852,7 +842,7 @@ index 44f3ad9..a121efc 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 +2033,40 @@ moveresize(const Arg *arg)
+@@ -1961,22 +2032,40 @@ moveresize(const Arg *arg)
  	if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
  		return;
  
@@ -909,7 +899,7 @@ index 44f3ad9..a121efc 100644
  	}
  }
  
-@@ -2826,6 +2916,14 @@ unmapnotify(struct wl_listener *listener, void *data)
+@@ -2826,6 +2915,14 @@ unmapnotify(struct wl_listener *listener, void *data)
  			focusclient(focustop(selmon), 1);
  		}
  	} else {
diff --git a/patches/btrtile/btrtile-v0.8.patch b/patches/btrtile/btrtile-v0.8.patch
index e568ef3..18a62e2 100644
--- a/patches/btrtile/btrtile-v0.8.patch
+++ b/patches/btrtile/btrtile-v0.8.patch
@@ -1,24 +1,24 @@
-From 618e3b70204520b6eb2c5040e072087ac0a3b3f7 Mon Sep 17 00:00:00 2001
+From 04d7c04a0a88e381df788e1ec60398d956543f8b Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
-Date: Thu, 21 May 2026 00:40:54 +0300
-Subject: [PATCH] btrtile: Spring update pt2
+Date: Mon, 22 Jun 2026 22:52:57 +0300
+Subject: [PATCH] btrtile: bug fixes and readability improvement
 
-- Simplified the resizing logic to avoid full arrange calls from
-motionnotify
-- Minor intend fixes
+- Removed client old_geom caching for simplicity fixes: https://codeberg.org/dwl/dwl-patches/issues/647
+- Improved readability of the client sanitization loop inside btrtile function
+- Removed fullscreened client's from the sanitization loop to retain their geometry
 ---
- btrtile.c    | 564 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ btrtile.c    | 556 +++++++++++++++++++++++++++++++++++++++++++++++++++
  config.def.h |  12 ++
- dwl.c        | 152 +++++++++++---
- 3 files changed, 701 insertions(+), 27 deletions(-)
+ dwl.c        | 151 +++++++++++---
+ 3 files changed, 692 insertions(+), 27 deletions(-)
  create mode 100644 btrtile.c
 
 diff --git a/btrtile.c b/btrtile.c
 new file mode 100644
-index 0000000..357ffb9
+index 0000000..6055871
 --- /dev/null
 +++ b/btrtile.c
-@@ -0,0 +1,564 @@
+@@ -0,0 +1,556 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
@@ -29,7 +29,7 @@ index 0000000..357ffb9
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/15 00:26:07 by julmajustus           ::    ::::::: ::   */
-+/*   Updated: 2026/05/20 22:51:54 by julmajustus            : :   : : :  :    */
++/*   Updated: 2026/06/22 22:52:52 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
@@ -84,11 +84,7 @@ index 0000000..357ffb9
 +		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;
 +	}
 +
@@ -156,12 +152,10 @@ index 0000000..357ffb9
 +	if (!m)
 +		return;
 +
-+	/* Remove non tiled clients from tree. */
++	/* Remove floating and moved clients */
 +	wl_list_for_each(c, &clients, link) {
-+		if (c->mon == m && !c->isfloating && !c->isfullscreen) {
-+		} else {
++		if (c->mon != m || c->isfloating)
 +			remove_client(m, c);
-+		}
 +	}
 +
 +	/* If no client is found under cursor, fallback to focustop(m) */
@@ -445,8 +439,6 @@ index 0000000..357ffb9
 +	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. */
 +}
 +
 +void
@@ -622,7 +614,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..a121efc 100644
+index 44f3ad9..2529e1f 100644
 --- a/dwl.c
 +++ b/dwl.c
 @@ -1,6 +1,7 @@
@@ -641,18 +633,16 @@ index 44f3ad9..a121efc 100644
  typedef struct Monitor Monitor;
  typedef struct {
  	/* Must keep this field first */
-@@ -137,8 +139,9 @@ typedef struct {
+@@ -137,7 +139,7 @@ typedef struct {
  #endif
  	unsigned int bw;
  	uint32_t tags;
 -	int isfloating, isurgent, isfullscreen;
 +	int isfloating, isurgent, isfullscreen, was_tiled;
  	uint32_t resize; /* configure serial of a pending resize */
-+	struct wlr_box old_geom;
  } Client;
  
- typedef struct {
-@@ -205,6 +208,7 @@ struct Monitor {
+@@ -205,6 +207,7 @@ struct Monitor {
  	int nmaster;
  	char ltsymbol[16];
  	int asleep;
@@ -660,7 +650,7 @@ index 44f3ad9..a121efc 100644
  };
  
  typedef struct {
-@@ -247,6 +251,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
+@@ -247,6 +250,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
  		struct wlr_box *usable_area, int exclusive);
  static void arrangelayers(Monitor *m);
  static void axisnotify(struct wl_listener *listener, void *data);
@@ -668,7 +658,7 @@ index 44f3ad9..a121efc 100644
  static void buttonpress(struct wl_listener *listener, void *data);
  static void chvt(const Arg *arg);
  static void checkidleinhibitor(struct wlr_surface *exclude);
-@@ -329,6 +334,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
+@@ -329,6 +333,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
  static void setpsel(struct wl_listener *listener, void *data);
  static void setsel(struct wl_listener *listener, void *data);
  static void setup(void);
@@ -678,7 +668,7 @@ index 44f3ad9..a121efc 100644
  static void spawn(const Arg *arg);
  static void startdrag(struct wl_listener *listener, void *data);
  static void tag(const Arg *arg);
-@@ -454,6 +462,7 @@ static struct wlr_xwayland *xwayland;
+@@ -454,6 +461,7 @@ static struct wlr_xwayland *xwayland;
  
  /* attempt to encapsulate suck into one file */
  #include "client.h"
@@ -686,7 +676,7 @@ index 44f3ad9..a121efc 100644
  
  /* function implementations */
  void
-@@ -624,7 +633,7 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -624,7 +632,7 @@ buttonpress(struct wl_listener *listener, void *data)
  	struct wlr_pointer_button_event *event = data;
  	struct wlr_keyboard *keyboard;
  	uint32_t mods;
@@ -695,7 +685,7 @@ index 44f3ad9..a121efc 100644
  	const Button *b;
  
  	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
-@@ -645,7 +654,7 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -645,7 +653,7 @@ buttonpress(struct wl_listener *listener, void *data)
  		mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
  		for (b = buttons; b < END(buttons); b++) {
  			if (CLEANMASK(mods) == CLEANMASK(b->mod) &&
@@ -704,7 +694,7 @@ index 44f3ad9..a121efc 100644
  				b->func(&b->arg);
  				return;
  			}
-@@ -655,6 +664,21 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -655,6 +663,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) {
@@ -726,7 +716,7 @@ index 44f3ad9..a121efc 100644
  			wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
  			cursor_mode = CurNormal;
  			/* Drop the window off on its new monitor */
-@@ -746,6 +770,7 @@ cleanupmon(struct wl_listener *listener, void *data)
+@@ -746,6 +769,7 @@ cleanupmon(struct wl_listener *listener, void *data)
  	wlr_output_layout_remove(output_layout, m->wlr_output);
  	wlr_scene_output_destroy(m->scene_output);
  
@@ -734,7 +724,7 @@ index 44f3ad9..a121efc 100644
  	closemon(m);
  	wlr_scene_node_destroy(&m->fullscreen_bg->node);
  	free(m);
-@@ -1090,6 +1115,7 @@ createmon(struct wl_listener *listener, void *data)
+@@ -1090,6 +1114,7 @@ createmon(struct wl_listener *listener, void *data)
  
  	wl_list_insert(&mons, &m->link);
  	printstatus();
@@ -742,7 +732,7 @@ index 44f3ad9..a121efc 100644
  
  	/* The xdg-protocol specifies:
  	 *
-@@ -1329,9 +1355,17 @@ destroynotify(struct wl_listener *listener, void *data)
+@@ -1329,9 +1354,17 @@ destroynotify(struct wl_listener *listener, void *data)
  {
  	/* Called when the xdg_toplevel is destroyed. */
  	Client *c = wl_container_of(listener, c, destroy);
@@ -760,7 +750,7 @@ index 44f3ad9..a121efc 100644
  #ifdef XWAYLAND
  	if (c->type != XDGShell) {
  		wl_list_remove(&c->activate.link);
-@@ -1862,7 +1896,8 @@ void
+@@ -1862,7 +1895,8 @@ void
  motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
  		double dx_unaccel, double dy_unaccel)
  {
@@ -770,7 +760,7 @@ index 44f3ad9..a121efc 100644
  	Client *c = NULL, *w = NULL;
  	LayerSurface *l = NULL;
  	struct wlr_surface *surface = NULL;
-@@ -1916,18 +1951,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1916,18 +1950,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));
  
@@ -833,7 +823,7 @@ index 44f3ad9..a121efc 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 +2033,40 @@ moveresize(const Arg *arg)
+@@ -1961,22 +2032,40 @@ moveresize(const Arg *arg)
  	if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
  		return;
  
@@ -890,7 +880,7 @@ index 44f3ad9..a121efc 100644
  	}
  }
  
-@@ -2826,6 +2916,14 @@ unmapnotify(struct wl_listener *listener, void *data)
+@@ -2826,6 +2915,14 @@ unmapnotify(struct wl_listener *listener, void *data)
  			focusclient(focustop(selmon), 1);
  		}
  	} else {
diff --git a/patches/btrtile/btrtile-wlroots-next-d41ecb7-gaps.patch b/patches/btrtile/btrtile-wlroots-next-d41ecb7-gaps.patch
index dca9bca..44c7b8e 100644
--- a/patches/btrtile/btrtile-wlroots-next-d41ecb7-gaps.patch
+++ b/patches/btrtile/btrtile-wlroots-next-d41ecb7-gaps.patch
@@ -1,24 +1,26 @@
-From c11b1a8c93c27fad3782e9dbc1b094a4a7b78088 Mon Sep 17 00:00:00 2001
+From efb796ce92e7212aa392141705c7322fedc45dba Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
-Date: Thu, 21 May 2026 00:38:45 +0300
-Subject: [PATCH] btrtile: Spring update pt2
+Date: Mon, 22 Jun 2026 22:46:19 +0300
+Subject: [PATCH] btrtile: bug fixes and readability improvement
 
-- Simplified the resizing logic to avoid full arrange calls from
-motionnotify
-- Minor intend fixes
+- Removed client old_geom caching for simplicity fixes: https://codeberg.org/dwl/dwl-patches/issues/647
+- Improved readability of the client sanitization loop inside btrtile function
+- Removed fullscreened client's from the sanitization loop to retain    simple_scratchpad: Spring update scratchpad V2
+
+    - Added support for multiple scratchpads their geometry
 ---
- btrtile.c    | 583 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ btrtile.c    | 575 +++++++++++++++++++++++++++++++++++++++++++++++++++
  config.def.h |  12 ++
- dwl.c        | 152 +++++++++++---
- 3 files changed, 720 insertions(+), 27 deletions(-)
+ dwl.c        | 151 +++++++++++---
+ 3 files changed, 711 insertions(+), 27 deletions(-)
  create mode 100644 btrtile.c
 
 diff --git a/btrtile.c b/btrtile.c
 new file mode 100644
-index 0000000..f05a30f
+index 0000000..645b741
 --- /dev/null
 +++ b/btrtile.c
-@@ -0,0 +1,583 @@
+@@ -0,0 +1,575 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
@@ -29,7 +31,7 @@ index 0000000..f05a30f
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/15 00:26:07 by julmajustus           ::    ::::::: ::   */
-+/*   Updated: 2026/05/20 22:38:02 by julmajustus            : :   : : :  :    */
++/*   Updated: 2026/06/22 22:34:11 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
@@ -91,11 +93,7 @@ index 0000000..f05a30f
 +		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;
 +	}
 +
@@ -175,12 +173,10 @@ index 0000000..f05a30f
 +	if (!m)
 +		return;
 +
-+	/* Remove non tiled clients from tree. */
++	/* Remove floating and moved clients */
 +	wl_list_for_each(c, &clients, link) {
-+		if (c->mon == m && !c->isfloating && !c->isfullscreen) {
-+		} else {
++		if (c->mon != m || c->isfloating)
 +			remove_client(m, c);
-+		}
 +	}
 +
 +	/* If no client is found under cursor, fallback to focustop(m) */
@@ -464,8 +460,6 @@ index 0000000..f05a30f
 +	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. */
 +}
 +
 +void
@@ -641,7 +635,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..c9650c1 100644
+index 8101ffa..7abf390 100644
 --- a/dwl.c
 +++ b/dwl.c
 @@ -1,6 +1,7 @@
@@ -660,18 +654,16 @@ index 8101ffa..c9650c1 100644
  typedef struct Monitor Monitor;
  typedef struct {
  	/* Must keep this field first */
-@@ -141,8 +143,9 @@ typedef struct {
+@@ -141,7 +143,7 @@ typedef struct {
  #endif
  	unsigned int bw;
  	uint32_t tags;
 -	int isfloating, isurgent, isfullscreen;
 +	int isfloating, isurgent, isfullscreen, was_tiled;
  	uint32_t resize; /* configure serial of a pending resize */
-+	struct wlr_box old_geom;
  } Client;
  
- typedef struct {
-@@ -209,6 +212,7 @@ struct Monitor {
+@@ -209,6 +211,7 @@ struct Monitor {
  	int nmaster;
  	char ltsymbol[16];
  	int asleep;
@@ -679,7 +671,7 @@ index 8101ffa..c9650c1 100644
  };
  
  typedef struct {
-@@ -251,6 +255,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
+@@ -251,6 +254,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
  		struct wlr_box *usable_area, int exclusive);
  static void arrangelayers(Monitor *m);
  static void axisnotify(struct wl_listener *listener, void *data);
@@ -687,7 +679,7 @@ index 8101ffa..c9650c1 100644
  static void buttonpress(struct wl_listener *listener, void *data);
  static void chvt(const Arg *arg);
  static void checkidleinhibitor(struct wlr_surface *exclude);
-@@ -333,6 +338,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
+@@ -333,6 +337,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
  static void setpsel(struct wl_listener *listener, void *data);
  static void setsel(struct wl_listener *listener, void *data);
  static void setup(void);
@@ -697,7 +689,7 @@ index 8101ffa..c9650c1 100644
  static void spawn(const Arg *arg);
  static void startdrag(struct wl_listener *listener, void *data);
  static void tag(const Arg *arg);
-@@ -458,6 +466,7 @@ static struct wlr_xwayland *xwayland;
+@@ -458,6 +465,7 @@ static struct wlr_xwayland *xwayland;
  
  /* attempt to encapsulate suck into one file */
  #include "client.h"
@@ -705,7 +697,7 @@ index 8101ffa..c9650c1 100644
  
  /* function implementations */
  void
-@@ -628,7 +637,7 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -628,7 +636,7 @@ buttonpress(struct wl_listener *listener, void *data)
  	struct wlr_pointer_button_event *event = data;
  	struct wlr_keyboard *keyboard;
  	uint32_t mods;
@@ -714,7 +706,7 @@ index 8101ffa..c9650c1 100644
  	const Button *b;
  
  	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
-@@ -649,7 +658,7 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -649,7 +657,7 @@ buttonpress(struct wl_listener *listener, void *data)
  		mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
  		for (b = buttons; b < END(buttons); b++) {
  			if (CLEANMASK(mods) == CLEANMASK(b->mod) &&
@@ -723,7 +715,7 @@ index 8101ffa..c9650c1 100644
  				b->func(&b->arg);
  				return;
  			}
-@@ -659,6 +668,21 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -659,6 +667,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) {
@@ -745,7 +737,7 @@ index 8101ffa..c9650c1 100644
  			wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
  			cursor_mode = CurNormal;
  			/* Drop the window off on its new monitor */
-@@ -750,6 +774,7 @@ cleanupmon(struct wl_listener *listener, void *data)
+@@ -750,6 +773,7 @@ cleanupmon(struct wl_listener *listener, void *data)
  	wlr_output_layout_remove(output_layout, m->wlr_output);
  	wlr_scene_output_destroy(m->scene_output);
  
@@ -753,7 +745,7 @@ index 8101ffa..c9650c1 100644
  	closemon(m);
  	wlr_scene_node_destroy(&m->fullscreen_bg->node);
  	free(m);
-@@ -1094,6 +1119,7 @@ createmon(struct wl_listener *listener, void *data)
+@@ -1094,6 +1118,7 @@ createmon(struct wl_listener *listener, void *data)
  
  	wl_list_insert(&mons, &m->link);
  	printstatus();
@@ -761,7 +753,7 @@ index 8101ffa..c9650c1 100644
  
  	/* The xdg-protocol specifies:
  	 *
-@@ -1332,10 +1358,18 @@ void
+@@ -1332,10 +1357,18 @@ void
  destroynotify(struct wl_listener *listener, void *data)
  {
  	/* Called when the xdg_toplevel is destroyed. */
@@ -780,7 +772,7 @@ index 8101ffa..c9650c1 100644
  #ifdef XWAYLAND
  	if (c->type != XDGShell) {
  		wl_list_remove(&c->activate.link);
-@@ -1866,7 +1900,8 @@ void
+@@ -1866,7 +1899,8 @@ void
  motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
  		double dx_unaccel, double dy_unaccel)
  {
@@ -790,7 +782,7 @@ index 8101ffa..c9650c1 100644
  	Client *c = NULL, *w = NULL;
  	LayerSurface *l = NULL;
  	struct wlr_surface *surface = NULL;
-@@ -1920,18 +1955,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1920,18 +1954,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));
  
@@ -853,7 +845,7 @@ index 8101ffa..c9650c1 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 +2037,40 @@ moveresize(const Arg *arg)
+@@ -1965,22 +2036,40 @@ moveresize(const Arg *arg)
  	if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
  		return;
  
@@ -910,7 +902,7 @@ index 8101ffa..c9650c1 100644
  	}
  }
  
-@@ -2833,6 +2923,14 @@ unmapnotify(struct wl_listener *listener, void *data)
+@@ -2833,6 +2922,14 @@ unmapnotify(struct wl_listener *listener, void *data)
  			focusclient(focustop(selmon), 1);
  		}
  	} else {
diff --git a/patches/btrtile/btrtile-wlroots-next-d41ecb7.patch b/patches/btrtile/btrtile-wlroots-next-d41ecb7.patch
index a507d32..1593fce 100644
--- a/patches/btrtile/btrtile-wlroots-next-d41ecb7.patch
+++ b/patches/btrtile/btrtile-wlroots-next-d41ecb7.patch
@@ -1,24 +1,24 @@
-From 47cb7ad9f669643765cafa4c2ecd1a4850bca893 Mon Sep 17 00:00:00 2001
+From 3500e732fc34aa849cd3babeff7d2545a0230fa9 Mon Sep 17 00:00:00 2001
 From: julmajustus <julmajustus@tutanota.com>
-Date: Thu, 21 May 2026 00:39:56 +0300
-Subject: [PATCH] btrtile: Spring update pt2
+Date: Mon, 22 Jun 2026 22:33:17 +0300
+Subject: [PATCH] btrtile: bug fixes and readability improvement
 
-- Simplified the resizing logic to avoid full arrange calls from
-motionnotify
-- Minor intend fixes
+- Removed client old_geom caching for simplicity fixes: https://codeberg.org/dwl/dwl-patches/issues/647
+- Improved readability of the client sanitization loop inside btrtile function
+- Removed fullscreened client's from the sanitization loop to retain their geometry
 ---
- btrtile.c    | 564 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ btrtile.c    | 556 +++++++++++++++++++++++++++++++++++++++++++++++++++
  config.def.h |  12 ++
- dwl.c        | 152 +++++++++++---
- 3 files changed, 701 insertions(+), 27 deletions(-)
+ dwl.c        | 151 +++++++++++---
+ 3 files changed, 692 insertions(+), 27 deletions(-)
  create mode 100644 btrtile.c
 
 diff --git a/btrtile.c b/btrtile.c
 new file mode 100644
-index 0000000..357ffb9
+index 0000000..b4f6f43
 --- /dev/null
 +++ b/btrtile.c
-@@ -0,0 +1,564 @@
+@@ -0,0 +1,556 @@
 +/* ************************************************************************** */
 +/*                                                 @@@            @@@@@@@@    */
 +/*                                                  @@@          @@@@@@@@@@   */
@@ -29,7 +29,7 @@ index 0000000..357ffb9
 +/*   By: julmajustus <julmajustus@tutanota.com>          !!:     !!:!   !!!   */
 +/*                                                        ::!    :!:    !:!   */
 +/*   Created: 2024/12/15 00:26:07 by julmajustus           ::    ::::::: ::   */
-+/*   Updated: 2026/05/20 22:51:54 by julmajustus            : :   : : :  :    */
++/*   Updated: 2026/06/22 22:30:19 by julmajustus            : :   : : :  :    */
 +/*                                                                            */
 +/* ************************************************************************** */
 +
@@ -84,11 +84,7 @@ index 0000000..357ffb9
 +		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;
 +	}
 +
@@ -156,12 +152,10 @@ index 0000000..357ffb9
 +	if (!m)
 +		return;
 +
-+	/* Remove non tiled clients from tree. */
++	/* Remove floating and moved clients */
 +	wl_list_for_each(c, &clients, link) {
-+		if (c->mon == m && !c->isfloating && !c->isfullscreen) {
-+		} else {
++		if (c->mon != m || c->isfloating)
 +			remove_client(m, c);
-+		}
 +	}
 +
 +	/* If no client is found under cursor, fallback to focustop(m) */
@@ -445,8 +439,6 @@ index 0000000..357ffb9
 +	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. */
 +}
 +
 +void
@@ -622,7 +614,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..bf52c6c 100644
+index 8101ffa..31446ed 100644
 --- a/dwl.c
 +++ b/dwl.c
 @@ -1,6 +1,7 @@
@@ -641,18 +633,16 @@ index 8101ffa..bf52c6c 100644
  typedef struct Monitor Monitor;
  typedef struct {
  	/* Must keep this field first */
-@@ -141,8 +143,9 @@ typedef struct {
+@@ -141,7 +143,7 @@ typedef struct {
  #endif
  	unsigned int bw;
  	uint32_t tags;
 -	int isfloating, isurgent, isfullscreen;
 +	int isfloating, isurgent, isfullscreen, was_tiled;
  	uint32_t resize; /* configure serial of a pending resize */
-+	struct wlr_box old_geom;
  } Client;
  
- typedef struct {
-@@ -209,6 +212,7 @@ struct Monitor {
+@@ -209,6 +211,7 @@ struct Monitor {
  	int nmaster;
  	char ltsymbol[16];
  	int asleep;
@@ -660,7 +650,7 @@ index 8101ffa..bf52c6c 100644
  };
  
  typedef struct {
-@@ -251,6 +255,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
+@@ -251,6 +254,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
  		struct wlr_box *usable_area, int exclusive);
  static void arrangelayers(Monitor *m);
  static void axisnotify(struct wl_listener *listener, void *data);
@@ -668,7 +658,7 @@ index 8101ffa..bf52c6c 100644
  static void buttonpress(struct wl_listener *listener, void *data);
  static void chvt(const Arg *arg);
  static void checkidleinhibitor(struct wlr_surface *exclude);
-@@ -333,6 +338,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
+@@ -333,6 +337,9 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
  static void setpsel(struct wl_listener *listener, void *data);
  static void setsel(struct wl_listener *listener, void *data);
  static void setup(void);
@@ -678,7 +668,7 @@ index 8101ffa..bf52c6c 100644
  static void spawn(const Arg *arg);
  static void startdrag(struct wl_listener *listener, void *data);
  static void tag(const Arg *arg);
-@@ -458,6 +466,7 @@ static struct wlr_xwayland *xwayland;
+@@ -458,6 +465,7 @@ static struct wlr_xwayland *xwayland;
  
  /* attempt to encapsulate suck into one file */
  #include "client.h"
@@ -686,7 +676,7 @@ index 8101ffa..bf52c6c 100644
  
  /* function implementations */
  void
-@@ -628,7 +637,7 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -628,7 +636,7 @@ buttonpress(struct wl_listener *listener, void *data)
  	struct wlr_pointer_button_event *event = data;
  	struct wlr_keyboard *keyboard;
  	uint32_t mods;
@@ -695,7 +685,7 @@ index 8101ffa..bf52c6c 100644
  	const Button *b;
  
  	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
-@@ -649,7 +658,7 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -649,7 +657,7 @@ buttonpress(struct wl_listener *listener, void *data)
  		mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
  		for (b = buttons; b < END(buttons); b++) {
  			if (CLEANMASK(mods) == CLEANMASK(b->mod) &&
@@ -704,7 +694,7 @@ index 8101ffa..bf52c6c 100644
  				b->func(&b->arg);
  				return;
  			}
-@@ -659,6 +668,21 @@ buttonpress(struct wl_listener *listener, void *data)
+@@ -659,6 +667,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) {
@@ -726,7 +716,7 @@ index 8101ffa..bf52c6c 100644
  			wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
  			cursor_mode = CurNormal;
  			/* Drop the window off on its new monitor */
-@@ -750,6 +774,7 @@ cleanupmon(struct wl_listener *listener, void *data)
+@@ -750,6 +773,7 @@ cleanupmon(struct wl_listener *listener, void *data)
  	wlr_output_layout_remove(output_layout, m->wlr_output);
  	wlr_scene_output_destroy(m->scene_output);
  
@@ -734,7 +724,7 @@ index 8101ffa..bf52c6c 100644
  	closemon(m);
  	wlr_scene_node_destroy(&m->fullscreen_bg->node);
  	free(m);
-@@ -1094,6 +1119,7 @@ createmon(struct wl_listener *listener, void *data)
+@@ -1094,6 +1118,7 @@ createmon(struct wl_listener *listener, void *data)
  
  	wl_list_insert(&mons, &m->link);
  	printstatus();
@@ -742,7 +732,7 @@ index 8101ffa..bf52c6c 100644
  
  	/* The xdg-protocol specifies:
  	 *
-@@ -1333,9 +1359,17 @@ destroynotify(struct wl_listener *listener, void *data)
+@@ -1333,9 +1358,17 @@ destroynotify(struct wl_listener *listener, void *data)
  {
  	/* Called when the xdg_toplevel is destroyed. */
  	Client *c = wl_container_of(listener, c, destroy);
@@ -760,7 +750,7 @@ index 8101ffa..bf52c6c 100644
  #ifdef XWAYLAND
  	if (c->type != XDGShell) {
  		wl_list_remove(&c->activate.link);
-@@ -1866,7 +1900,8 @@ void
+@@ -1866,7 +1899,8 @@ void
  motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy,
  		double dx_unaccel, double dy_unaccel)
  {
@@ -770,7 +760,7 @@ index 8101ffa..bf52c6c 100644
  	Client *c = NULL, *w = NULL;
  	LayerSurface *l = NULL;
  	struct wlr_surface *surface = NULL;
-@@ -1920,18 +1955,55 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
+@@ -1920,18 +1954,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));
  
@@ -833,7 +823,7 @@ index 8101ffa..bf52c6c 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 +2037,40 @@ moveresize(const Arg *arg)
+@@ -1965,22 +2036,40 @@ moveresize(const Arg *arg)
  	if (!grabc || client_is_unmanaged(grabc) || grabc->isfullscreen)
  		return;
  
@@ -890,7 +880,7 @@ index 8101ffa..bf52c6c 100644
  	}
  }
  
-@@ -2833,6 +2923,14 @@ unmapnotify(struct wl_listener *listener, void *data)
+@@ -2833,6 +2922,14 @@ unmapnotify(struct wl_listener *listener, void *data)
  			focusclient(focustop(selmon), 1);
  		}
  	} else {