From 9d8345c8be94cc852e205dbb65a5a26190d325ba Mon Sep 17 00:00:00 2001
From: Ryan Kes <>
Date: Tue, 1 Dec 2020 11:04:57 +0100
Subject: [PATCH] feat: added rotatestack patch

---
 PKGBUILD                              |   4 +-
 README.org                            |   9 ++-
 config_desktop.h                      |   2 +
 dwm-rotatestack-20161021-ab9571b.diff | 102 ++++++++++++++++++++++++++
 4 files changed, 112 insertions(+), 5 deletions(-)
 create mode 100644 dwm-rotatestack-20161021-ab9571b.diff

diff --git a/PKGBUILD b/PKGBUILD
index ce42519..4d31a17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,6 +24,7 @@ _patches=(
         "dwm-hide_vacant_tags-6.2.diff"
         "local-scratchpad-6.2.diff"
         "local-alpha-20201019-61bb8b2.diff"
+        "dwm-rotatestack-20161021-ab9571b.diff"
         )
 
 source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz
@@ -42,7 +43,8 @@ md5sums=('9929845ccdec4d2cc191f16210dd7f3d'
          '8c3ad89cb98dd2b9152075b6e29cb579'
          'c446b71a8b8cce25db86a47805500dfa'
          '8e7bef8198d212f8c33efbf160b44b87'
-         '3f50d21e606afd5c8b3c67dbbbb9ea32')
+         '3f50d21e606afd5c8b3c67dbbbb9ea32'
+         '882e0783ccedf9fbb8b565e7681116c9')
 
 prepare() {
   cd $srcdir/dwm-$pkgver
diff --git a/README.org b/README.org
index 66381da..03751a6 100644
--- a/README.org
+++ b/README.org
@@ -5,15 +5,16 @@
 
 [[https://dwm.suckless.org][DWM]] [[https://www.archlinux.org/][Arch]] package with a few patches installed to keep things nice:
 
-- [[https://dwm.suckless.org/patches/systray/][systray]]
-- [[https://dwm.suckless.org/patches/noborder/][noborder]]
+- [[https://dwm.suckless.org/patches/alpha/][alpha]]
 - [[https://dwm.suckless.org/patches/autostart/][autostart]]
 - [[https://dwm.suckless.org/patches/cyclelayouts/][cyclelayouts]]
 - [[https://dwm.suckless.org/patches/gridmode/][gridmode]]
-- [[https://dwm.suckless.org/patches/selfrestart/][selfrestart]]
 - [[https://dwm.suckless.org/patches/hide_vacant_tags/][hide_vacant_tags]]
+- [[https://dwm.suckless.org/patches/noborder/][noborder]]
+- [[https://dwm.suckless.org/patches/rotatestack/][rotatestack]]
 - [[https://dwm.suckless.org/patches/scratchpad/][scratchpad]]
-- [[https://dwm.suckless.org/patches/alpha/][alpha]]
+- [[https://dwm.suckless.org/patches/selfrestart/][selfrestart]]
+- [[https://dwm.suckless.org/patches/systray/][systray]]
 
 ** Installation
 #+BEGIN_EXAMPLE shell
diff --git a/config_desktop.h b/config_desktop.h
index 208be73..3213e23 100644
--- a/config_desktop.h
+++ b/config_desktop.h
@@ -109,6 +109,8 @@ static Key keys[] = {
 	//{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY,                       XK_grave,  togglescratch,  {.v = scratchpadcmd } },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },
+	{ MODKEY|ShiftMask,             XK_j,      rotatestack,    {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_k,      rotatestack,    {.i = -1 } },
 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
 	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
diff --git a/dwm-rotatestack-20161021-ab9571b.diff b/dwm-rotatestack-20161021-ab9571b.diff
new file mode 100644
index 0000000..ed74c6d
--- /dev/null
+++ b/dwm-rotatestack-20161021-ab9571b.diff
@@ -0,0 +1,102 @@
+diff --git a/config.def.h b/config.def.h
+index fd77a07..09737d7 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -64,6 +64,8 @@ static Key keys[] = {
+ 	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
+ 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+ 	{ MODKEY,                       XK_b,      togglebar,      {0} },
++	{ MODKEY|ShiftMask,             XK_j,      rotatestack,    {.i = +1 } },
++	{ MODKEY|ShiftMask,             XK_k,      rotatestack,    {.i = -1 } },
+ 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+ 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+ 	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
+diff --git a/dwm.c b/dwm.c
+index 421bf27..1ec8b10 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -165,6 +165,8 @@ static void detachstack(Client *c);
+ static Monitor *dirtomon(int dir);
+ static void drawbar(Monitor *m);
+ static void drawbars(void);
++static void enqueue(Client *c);
++static void enqueuestack(Client *c);
+ static void enternotify(XEvent *e);
+ static void expose(XEvent *e);
+ static void focus(Client *c);
+@@ -194,6 +196,7 @@ static void resize(Client *c, int x, int y, int w, int h, int interact);
+ static void resizeclient(Client *c, int x, int y, int w, int h);
+ static void resizemouse(const Arg *arg);
+ static void restack(Monitor *m);
++static void rotatestack(const Arg *arg);
+ static void run(void);
+ static void scan(void);
+ static int sendevent(Client *c, Atom proto);
+@@ -765,6 +768,28 @@ drawbars(void)
+ }
+ 
+ void
++enqueue(Client *c)
++{
++	Client *l;
++	for (l = c->mon->clients; l && l->next; l = l->next);
++	if (l) {
++		l->next = c;
++		c->next = NULL;
++	}
++}
++
++void
++enqueuestack(Client *c)
++{
++	Client *l;
++	for (l = c->mon->stack; l && l->snext; l = l->snext);
++	if (l) {
++		l->snext = c;
++		c->snext = NULL;
++	}
++}
++
++void
+ enternotify(XEvent *e)
+ {
+ 	Client *c;
+@@ -1390,6 +1415,38 @@ restack(Monitor *m)
+ }
+ 
+ void
++rotatestack(const Arg *arg)
++{
++	Client *c = NULL, *f;
++
++	if (!selmon->sel)
++		return;
++	f = selmon->sel;
++	if (arg->i > 0) {
++		for (c = nexttiled(selmon->clients); c && nexttiled(c->next); c = nexttiled(c->next));
++		if (c){
++			detach(c);
++			attach(c);
++			detachstack(c);
++			attachstack(c);
++		}
++	} else {
++		if ((c = nexttiled(selmon->clients))){
++			detach(c);
++			enqueue(c);
++			detachstack(c);
++			enqueuestack(c);
++		}
++	}
++	if (c){
++		arrange(selmon);
++		//unfocus(f, 1);
++		focus(f);
++		restack(selmon);
++	}
++}
++
++void
+ run(void)
+ {
+ 	XEvent ev;