From 6dc116c9a4f692c6a1cfff537f639d0d260b93e2 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 22 Aug 2024 21:08:45 -0400
Subject: [PATCH] dwm: Add adjacent tags patch

---
 assets/dwm-adjacenttag.patch | 112 +++++++++++++++++++++++++++++++++++
 specializations/dwm.nix      |  10 ++--
 2 files changed, 117 insertions(+), 5 deletions(-)
 create mode 100644 assets/dwm-adjacenttag.patch

diff --git a/assets/dwm-adjacenttag.patch b/assets/dwm-adjacenttag.patch
new file mode 100644
index 00000000..ed57eff8
--- /dev/null
+++ b/assets/dwm-adjacenttag.patch
@@ -0,0 +1,112 @@
+diff --git a/config.def.h b/config.def.h
+index 9efa774..8d45ea7 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -85,6 +85,10 @@ static const Key keys[] = {
+ 	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+ 	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
+ 	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
++	{ MODKEY,                       XK_Right,  viewnext,       {0} },
++	{ MODKEY,                       XK_Left,   viewprev,       {0} },
++	{ MODKEY|ShiftMask,             XK_Right,  tagtonext,      {0} },
++	{ MODKEY|ShiftMask,             XK_Left,   tagtoprev,      {0} },
+ 	TAGKEYS(                        XK_1,                      0)
+ 	TAGKEYS(                        XK_2,                      1)
+ 	TAGKEYS(                        XK_3,                      2)
+diff --git a/dwm.c b/dwm.c
+index 67c6b2b..6fd967c 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -227,6 +227,12 @@ static void updatetitle(Client *c);
+ static void updatewindowtype(Client *c);
+ static void updatewmhints(Client *c);
+ static void view(const Arg *arg);
++static unsigned int nexttag(void);
++static unsigned int prevtag(void);
++static void tagtonext(const Arg *arg);
++static void tagtoprev(const Arg *arg);
++static void viewnext(const Arg *arg);
++static void viewprev(const Arg *arg);
+ static Client *wintoclient(Window w);
+ static Monitor *wintomon(Window w);
+ static int xerror(Display *dpy, XErrorEvent *ee);
+@@ -1202,6 +1208,13 @@ movemouse(const Arg *arg)
+ 	}
+ }
+ 
++unsigned int
++nexttag(void)
++{
++	unsigned int seltag = selmon->tagset[selmon->seltags];
++	return seltag == (1 << (LENGTH(tags) - 1)) ? 1 : seltag << 1;
++}
++
+ Client *
+ nexttiled(Client *c)
+ {
+@@ -1218,6 +1231,13 @@ pop(Client *c)
+ 	arrange(c->mon);
+ }
+ 
++unsigned int
++prevtag(void)
++{
++	unsigned int seltag = selmon->tagset[selmon->seltags];
++	return seltag == 1 ? (1 << (LENGTH(tags) - 1)) : seltag >> 1;
++}
++
+ void
+ propertynotify(XEvent *e)
+ {
+@@ -1684,6 +1704,32 @@ tagmon(const Arg *arg)
+ 	sendmon(selmon->sel, dirtomon(arg->i));
+ }
+ 
++void
++tagtonext(const Arg *arg)
++{
++	unsigned int tmp;
++
++	if (selmon->sel == NULL)
++		return;
++
++	tmp = nexttag();
++	tag(&(const Arg){.ui = tmp });
++	view(&(const Arg){.ui = tmp });
++}
++
++void
++tagtoprev(const Arg *arg)
++{
++	unsigned int tmp;
++
++	if (selmon->sel == NULL)
++		return;
++
++	tmp = prevtag();
++	tag(&(const Arg){.ui = tmp });
++	view(&(const Arg){.ui = tmp });
++}
++
+ void
+ tile(Monitor *m)
+ {
+@@ -2062,6 +2108,18 @@ view(const Arg *arg)
+ 	arrange(selmon);
+ }
+ 
++void
++viewnext(const Arg *arg)
++{
++	view(&(const Arg){.ui = nexttag()});
++}
++
++void
++viewprev(const Arg *arg)
++{
++	view(&(const Arg){.ui = prevtag()});
++}
++
+ Client *
+ wintoclient(Window w)
+ {
diff --git a/specializations/dwm.nix b/specializations/dwm.nix
index 36d301c4..d86971e4 100644
--- a/specializations/dwm.nix
+++ b/specializations/dwm.nix
@@ -181,14 +181,13 @@ in
                 { MODKEY, XK_k, focusstack, {.i = -1 } },
                 { MODKEY, XK_h, setmfact, {.f = -0.05} },
                 { MODKEY, XK_l, setmfact, {.f = +0.05} },
-                { MODKEY, XK_4, view, {.ui = ~0 } },
                 { MODKEY, XK_Return, zoom, {0} },
                 { MODKEY, XK_comma, focusmon, {.i = -1 } },
                 { MODKEY, XK_period, focusmon, {.i = +1 } },
-                TAGKEYS(XK_1, 0)
-                TAGKEYS(XK_2, 1)
-                TAGKEYS(XK_3, 2)
-                { MODKEY|ShiftMask, XK_4, tag, {.ui = ~0 } },
+                { MODKEY, XK_1, viewprev, {0} },
+                { MODKEY, XK_2, viewnext, {0} },
+                { MODKEY|ShiftMask, XK_1, tagtoprev, {0} },
+                { MODKEY|ShiftMask, XK_2, tagtonext, {0} },
                 { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
                 { MODKEY|ShiftMask, XK_c, killclient, {0} },
                 { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
@@ -205,6 +204,7 @@ in
 
           patches = [
             ../assets/dwm-actualfullscreen.patch
+            ../assets/dwm-adjacenttag.patch
 
             (pkgs.fetchpatch {
               url = "https://dwm.suckless.org/patches/hide_vacant_tags/dwm-hide_vacant_tags-6.4.diff";