From 870a32283199f6cc731eee2eb194b1cd70ed6fa3 Mon Sep 17 00:00:00 2001
From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
Date: Mon, 16 Mar 2026 20:52:50 +0100
Subject: [PATCH] movestack: update to 0.8

---
 patches/movestack/README.md                   |  4 +-
 .../{movestack.patch => movestack-0.7.patch}  |  0
 patches/movestack/movestack-0.8.patch         | 87 +++++++++++++++++++
 3 files changed, 89 insertions(+), 2 deletions(-)
 rename patches/movestack/{movestack.patch => movestack-0.7.patch} (100%)
 create mode 100644 patches/movestack/movestack-0.8.patch

diff --git a/patches/movestack/README.md b/patches/movestack/README.md
index f50bf68..8695374 100644
--- a/patches/movestack/README.md
+++ b/patches/movestack/README.md
@@ -2,8 +2,8 @@
 Allows you to move a window up and down the stack.
 
 ### Download
-- [git branch](https://codeberg.org/nikitaivanov/dwl/src/branch/movestack)
-- [v0.7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/movestack/movestack.patch)
+- [0.8](/dwl/dwl-patches/raw/branch/main/patches/movestack/movestack-0.8.patch)
+- [0.7](/dwl/dwl-patches/raw/branch/main/patches/movestack/movestack-0.7.patch)
 
 ### Authors
 - [wochap](https://codeberg.org/wochap)
diff --git a/patches/movestack/movestack.patch b/patches/movestack/movestack-0.7.patch
similarity index 100%
rename from patches/movestack/movestack.patch
rename to patches/movestack/movestack-0.7.patch
diff --git a/patches/movestack/movestack-0.8.patch b/patches/movestack/movestack-0.8.patch
new file mode 100644
index 0000000..cf0c933
--- /dev/null
+++ b/patches/movestack/movestack-0.8.patch
@@ -0,0 +1,87 @@
+From 7e8de6e79d24114272b22b55c906d7b55c36173a Mon Sep 17 00:00:00 2001
+From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
+Date: Mon, 16 Mar 2026 20:50:44 +0100
+Subject: [PATCH] Add movestack
+
+---
+ config.def.h |  2 ++
+ dwl.c        | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 45 insertions(+)
+
+diff --git a/config.def.h b/config.def.h
+index 8a6eda0..f490e24 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -125,6 +125,8 @@ static const Key keys[] = {
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return,      spawn,            {.v = termcmd} },
+ 	{ MODKEY,                    XKB_KEY_j,           focusstack,       {.i = +1} },
+ 	{ MODKEY,                    XKB_KEY_k,           focusstack,       {.i = -1} },
++	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_j,           movestack,        {.i = +1} },
++	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_k,           movestack,        {.i = -1} },
+ 	{ MODKEY,                    XKB_KEY_i,           incnmaster,       {.i = +1} },
+ 	{ MODKEY,                    XKB_KEY_d,           incnmaster,       {.i = -1} },
+ 	{ MODKEY,                    XKB_KEY_h,           setmfact,         {.f = -0.05f} },
+diff --git a/dwl.c b/dwl.c
+index 44f3ad9..726fbdd 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -300,6 +300,7 @@ static void locksession(struct wl_listener *listener, void *data);
+ static void mapnotify(struct wl_listener *listener, void *data);
+ static void maximizenotify(struct wl_listener *listener, void *data);
+ static void monocle(Monitor *m);
++static void movestack(const Arg *arg);
+ static void motionabsolute(struct wl_listener *listener, void *data);
+ static void motionnotify(uint32_t time, struct wlr_input_device *device, double sx,
+ 		double sy, double sx_unaccel, double sy_unaccel);
+@@ -1838,6 +1839,48 @@ monocle(Monitor *m)
+ 		wlr_scene_node_raise_to_top(&c->scene->node);
+ }
+ 
++void
++movestack(const Arg *arg)
++{
++	Client *c, *sel = focustop(selmon);
++
++	if (!sel) {
++		return;
++	}
++
++	if (wl_list_length(&clients) <= 1) {
++		return;
++	}
++
++	if (arg->i > 0) {
++		wl_list_for_each(c, &sel->link, link) {
++			if (&c->link == &clients) {
++				c = wl_container_of(&clients, c, link);
++				break; /* wrap past the sentinel node */
++			}
++			if (VISIBLEON(c, selmon) || &c->link == &clients) {
++				break; /* found it */
++			}
++		}
++	} else {
++		wl_list_for_each_reverse(c, &sel->link, link) {
++			if (&c->link == &clients) {
++				c = wl_container_of(&clients, c, link);
++				break; /* wrap past the sentinel node */
++			}
++			if (VISIBLEON(c, selmon) || &c->link == &clients) {
++				break; /* found it */
++			}
++		}
++		/* backup one client */
++		c = wl_container_of(c->link.prev, c, link);
++	}
++
++	wl_list_remove(&sel->link);
++	wl_list_insert(&c->link, &sel->link);
++	arrange(selmon);
++}
++
+ void
+ motionabsolute(struct wl_listener *listener, void *data)
+ {
+-- 
+2.53.0
+