From 082875899a2d411838a5cf98e30bf3f7b9378021 Mon Sep 17 00:00:00 2001
From: Aryadev Chavali <aryadev@aryadevchavali.com>
Date: Mon, 24 Jun 2024 00:25:25 +0100
Subject: Remove attachaside

---
 dwm.c                            | 25 -----------
 patches/dwm-attachaside-6.1.diff | 92 ----------------------------------------
 2 files changed, 117 deletions(-)
 delete mode 100644 patches/dwm-attachaside-6.1.diff

diff --git a/dwm.c b/dwm.c
index 0705c4a..46e6f84 100644
--- a/dwm.c
+++ b/dwm.c
@@ -151,7 +151,6 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac
 static void arrange(Monitor *m);
 static void arrangemon(Monitor *m);
 static void attach(Client *c);
-static void attachaside(Client *c);
 static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
 static void checkotherwm(void);
@@ -192,7 +191,6 @@ static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void motionnotify(XEvent *e);
 static void movemouse(const Arg *arg);
-static Client *nexttagged(Client *c);
 static Client *nexttiled(Client *c);
 static void pop(Client *c);
 static void propertynotify(XEvent *e);
@@ -438,17 +436,6 @@ attach(Client *c)
 	c->mon->clients = c;
 }
 
-void
-attachaside(Client *c) {
-	Client *at = nexttagged(c);
-	if(!at) {
-		attach(c);
-		return;
- 	}
-	c->next = at->next;
-	at->next = c;
-}
-
 void
 attachstack(Client *c)
 {
@@ -1206,7 +1193,6 @@ manage(Window w, XWindowAttributes *wa)
 		c->isfloating = c->oldstate = trans != None || c->isfixed;
 	if (c->isfloating)
 		XRaiseWindow(dpy, c->win);
-	/* attachaside(c); */
 	attach(c);
 	attachstack(c);
 	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
@@ -1339,16 +1325,6 @@ movemouse(const Arg *arg)
 	}
 }
 
-Client *
-nexttagged(Client *c) {
-	Client *walked = c->mon->clients;
-	for(;
-		walked && (walked->isfloating || !ISVISIBLEONTAG(walked, c->tags));
-		walked = walked->next
-	);
-	return walked;
-}
-
 Client *
 nexttiled(Client *c)
 {
@@ -1574,7 +1550,6 @@ sendmon(Client *c, Monitor *m)
 	detachstack(c);
 	c->mon = m;
 	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
-	/* attachaside(c); */
 	attach(c);
 	attachstack(c);
 	focus(NULL);
diff --git a/patches/dwm-attachaside-6.1.diff b/patches/dwm-attachaside-6.1.diff
deleted file mode 100644
index 176cdb0..0000000
--- a/patches/dwm-attachaside-6.1.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index 0362114..be7e7a6 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -49,7 +49,8 @@
- #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
- #define INTERSECT(x,y,w,h,m)    (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
-                                * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
--#define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
-+#define ISVISIBLEONTAG(C, T)    ((C->tags & T))
-+#define ISVISIBLE(C)            ISVISIBLEONTAG(C, C->mon->tagset[C->mon->seltags])
- #define LENGTH(X)               (sizeof X / sizeof X[0])
- #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
- #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
-@@ -147,6 +148,7 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac
- static void arrange(Monitor *m);
- static void arrangemon(Monitor *m);
- static void attach(Client *c);
-+static void attachaside(Client *c);
- static void attachstack(Client *c);
- static void buttonpress(XEvent *e);
- static void checkotherwm(void);
-@@ -184,6 +186,7 @@ static void maprequest(XEvent *e);
- static void monocle(Monitor *m);
- static void motionnotify(XEvent *e);
- static void movemouse(const Arg *arg);
-+static Client *nexttagged(Client *c);
- static Client *nexttiled(Client *c);
- static void pop(Client *);
- static void propertynotify(XEvent *e);
-@@ -406,6 +409,17 @@ attach(Client *c)
- }
- 
- void
-+attachaside(Client *c) {
-+	Client *at = nexttagged(c);
-+	if(!at) {
-+		attach(c);
-+		return;
-+ 	}
-+	c->next = at->next;
-+	at->next = c;
-+}
-+
-+void
- attachstack(Client *c)
- {
- 	c->snext = c->mon->stack;
-@@ -1076,7 +1090,7 @@ manage(Window w, XWindowAttributes *wa)
- 		c->isfloating = c->oldstate = trans != None || c->isfixed;
- 	if (c->isfloating)
- 		XRaiseWindow(dpy, c->win);
--	attach(c);
-+	attachaside(c);
- 	attachstack(c);
- 	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
- 	                (unsigned char *) &(c->win), 1);
-@@ -1210,6 +1224,16 @@ movemouse(const Arg *arg)
- }
- 
- Client *
-+nexttagged(Client *c) {
-+	Client *walked = c->mon->clients;
-+	for(;
-+		walked && (walked->isfloating || !ISVISIBLEONTAG(walked, c->tags));
-+		walked = walked->next
-+	);
-+	return walked;
-+}
-+
-+Client *
- nexttiled(Client *c)
- {
- 	for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
-@@ -1434,7 +1458,7 @@ sendmon(Client *c, Monitor *m)
- 	detachstack(c);
- 	c->mon = m;
- 	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
--	attach(c);
-+	attachaside(c);
- 	attachstack(c);
- 	focus(NULL);
- 	arrange(NULL);
-@@ -1891,7 +1915,7 @@ updategeom(void)
- 					m->clients = c->next;
- 					detachstack(c);
- 					c->mon = mons;
--					attach(c);
-+					attachaside(c);
- 					attachstack(c);
- 				}
- 				if (m == selmon)
-- 
cgit v1.2.3-13-gbd6f