6.5

4 files changed, 0 insertions, 297 deletions

diff --git a/cancelled/dwm-6.2-tagintostack-onemaster.diff b/cancelled/dwm-6.2-tagintostack-onemaster.diff
deleted file mode 100644
index 18fa42b..0000000
--- a/cancelled/dwm-6.2-tagintostack-onemaster.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From 43fb204a53e3f1bee47f51a2f4e52e5bf242e314 Mon Sep 17 00:00:00 2001
-From: astier <aleksandrs.stier@uni-bielefeld.de>
-Date: Tue, 26 Feb 2019 01:04:55 +0100
-Subject: [PATCH] Attach clients from toggled tag into stack instead of master area
-
-New clients attach into the stack area when you toggle a new tag into
-view. This means your master area will remain unchanged when toggling
-views.
----
- dwm.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dwm.c b/dwm.c
-index 4465af1..567fa8b 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -1739,6 +1739,15 @@ toggleview(const Arg *arg)
- {
- 	unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
- 
-+	// the first visible client should be the same after we add a new tag
-+	// we also want to be sure not to mutate the focus
-+	Client *const c = nexttiled(selmon->clients);
-+	if (c) {
-+		Client * const selected = selmon->sel;
-+		pop(c);
-+		focus(selected);
-+	}
-+
- 	if (newtagset) {
- 		selmon->tagset[selmon->seltags] = newtagset;
- 		focus(NULL);
--- 
-2.20.1
diff --git a/cancelled/dwm-bartabgroups-20210802-138b405.diff b/cancelled/dwm-bartabgroups-20210802-138b405.diff
deleted file mode 100644
index fc275f3..0000000
--- a/cancelled/dwm-bartabgroups-20210802-138b405.diff
+++ /dev/null
@@ -1,187 +0,0 @@
-From 653c99b94cc780a2def9c7e50a87703156535f8b Mon Sep 17 00:00:00 2001
-From: Jack Bird <jack.bird@durham.ac.uk>
-Date: Mon, 2 Aug 2021 18:50:02 +0100
-Subject: [PATCH] bartabgroups updated to work with 138b405
-
----
- config.def.h |  11 +++++
- dwm.c        | 112 ++++++++++++++++++++++++++++++++++++++++++++++-----
- 2 files changed, 112 insertions(+), 11 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index a2ac963..82accf1 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -16,6 +16,8 @@ static const char *colors[][3]      = {
- 	/*               fg         bg         border   */
- 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
- 	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
-+	[SchemeTabActive]  = { col_gray2, col_gray3,  col_gray2 },
-+	[SchemeTabInactive]  = { col_gray1, col_gray3,  col_gray1 }
- };
- 
- /* tagging */
-@@ -37,6 +39,15 @@ static const int nmaster     = 1;    /* number of clients in master area */
- static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
- static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
- 
-+/* Bartabgroups properties */
-+#define BARTAB_BORDERS 1       // 0 = off, 1 = on
-+#define BARTAB_BOTTOMBORDER 1  // 0 = off, 1 = on
-+#define BARTAB_TAGSINDICATOR 1 // 0 = off, 1 = on if >1 client/view tag, 2 = always on
-+#define BARTAB_TAGSPX 5        // # pixels for tag grid boxes
-+#define BARTAB_TAGSROWS 3      // # rows in tag grid (9 tags, e.g. 3x3)
-+static void (*bartabmonfns[])(Monitor *) = { monocle /* , customlayoutfn */ };
-+static void (*bartabfloatfns[])(Monitor *) = { NULL /* , customlayoutfn */ };
-+
- static const Layout layouts[] = {
- 	/* symbol     arrange function */
- 	{ "[]=",      tile },    /* first entry is default */
-diff --git a/dwm.c b/dwm.c
-index 5e4d494..1839a56 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -59,7 +59,7 @@
- 
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
--enum { SchemeNorm, SchemeSel }; /* color schemes */
-+enum { SchemeNorm, SchemeSel, SchemeTabActive, SchemeTabInactive }; /* color schemes */
- enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
-        NetWMFullscreen, NetActiveWindow, NetWMWindowType,
-        NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-@@ -378,6 +378,98 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)
- 	return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
- }
- 
-+void
-+bartabdraw(Monitor *m, Client *c, int unused, int x, int w, int groupactive) {
-+	if (!c) return;
-+	int i, nclienttags = 0, nviewtags = 0;
-+
-+	drw_setscheme(drw, scheme[
-+		m->sel == c ? SchemeSel : (groupactive ? SchemeTabActive: SchemeTabInactive)
-+	]);
-+	drw_text(drw, x, 0, w, bh, lrpad / 2, c->name, 0);
-+
-+	// Floating win indicator
-+	if (c->isfloating) drw_rect(drw, x + 2, 2, 5, 5, 0, 0);
-+
-+	// Optional borders between tabs
-+	if (BARTAB_BORDERS) {
-+		XSetForeground(drw->dpy, drw->gc, drw->scheme[ColBorder].pixel);
-+		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, 0, 1, bh);
-+		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x + w, 0, 1, bh);
-+	}
-+
-+	// Optional tags icons
-+	for (i = 0; i < LENGTH(tags); i++) {
-+		if ((m->tagset[m->seltags] >> i) & 1) { nviewtags++; }
-+		if ((c->tags >> i) & 1) { nclienttags++; }
-+	}
-+	if (BARTAB_TAGSINDICATOR == 2 || nclienttags > 1 || nviewtags > 1) {
-+		for (i = 0; i < LENGTH(tags); i++) {
-+			drw_rect(drw,
-+				( x + w - 2 - ((LENGTH(tags) / BARTAB_TAGSROWS) * BARTAB_TAGSPX)
-+					- (i % (LENGTH(tags)/BARTAB_TAGSROWS)) + ((i % (LENGTH(tags) / BARTAB_TAGSROWS)) * BARTAB_TAGSPX)
-+				),
-+				( 2 + ((i / (LENGTH(tags)/BARTAB_TAGSROWS)) * BARTAB_TAGSPX)
-+					- ((i / (LENGTH(tags)/BARTAB_TAGSROWS)))
-+				),
-+				BARTAB_TAGSPX, BARTAB_TAGSPX, (c->tags >> i) & 1, 0
-+			);
-+		}
-+	}
-+}
-+
-+void
-+battabclick(Monitor *m, Client *c, int passx, int x, int w, int unused) {
-+	if (passx >= x && passx <= x + w) {
-+		focus(c);
-+		restack(selmon);
-+	}
-+}
-+
-+void
-+bartabcalculate(
-+	Monitor *m, int offx, int sw, int passx,
-+	void(*tabfn)(Monitor *, Client *, int, int, int, int)
-+) {
-+	Client *c;
-+	int
-+		i, clientsnmaster = 0, clientsnstack = 0, clientsnfloating = 0,
-+		masteractive = 0, fulllayout = 0, floatlayout = 0,
-+		x, w, tgactive;
-+
-+	for (i = 0, c = m->clients; c; c = c->next) {
-+		if (!ISVISIBLE(c)) continue;
-+		if (c->isfloating) { clientsnfloating++; continue; }
-+		if (m->sel == c) { masteractive = i < m->nmaster; }
-+		if (i < m->nmaster) { clientsnmaster++; } else { clientsnstack++; }
-+		i++;
-+	}
-+	for (i = 0; i < LENGTH(bartabfloatfns); i++) if (m ->lt[m->sellt]->arrange == bartabfloatfns[i]) { floatlayout = 1; break; }
-+	for (i = 0; i < LENGTH(bartabmonfns); i++) if (m ->lt[m->sellt]->arrange == bartabmonfns[i]) { fulllayout = 1; break; }
-+	for (c = m->clients, i = 0; c; c = c->next) {
-+		if (!ISVISIBLE(c)) continue;
-+		if (clientsnmaster + clientsnstack == 0 || floatlayout) {
-+			 x = offx + (((m->mw - offx - sw) / (clientsnmaster + clientsnstack + clientsnfloating)) * i);
-+			 w = (m->mw - offx - sw) / (clientsnmaster + clientsnstack + clientsnfloating);
-+			 tgactive = 1;
-+		} else if (!c->isfloating && (fulllayout || ((clientsnmaster == 0) ^ (clientsnstack == 0)))) {
-+			 x = offx + (((m->mw - offx - sw) / (clientsnmaster + clientsnstack)) * i);
-+			 w = (m->mw - offx - sw) / (clientsnmaster + clientsnstack);
-+			 tgactive = 1;
-+		} else if (i < m->nmaster && !c->isfloating) {
-+			 x = offx + ((((m->mw * m->mfact) - offx) /clientsnmaster) * i);
-+			 w = ((m->mw * m->mfact) - offx) / clientsnmaster;
-+			 tgactive = masteractive;
-+		} else if (!c->isfloating) {
-+			 x = (m->mw * m->mfact) + ((((m->mw * (1 - m->mfact)) - sw) / clientsnstack) * (i - m->nmaster));
-+			 w = ((m->mw * (1 - m->mfact)) - sw) / clientsnstack;
-+			 tgactive = !masteractive;
-+		} else continue;
-+		tabfn(m, c, passx, x, w, tgactive);
-+		i++;
-+	}
-+}
-+
- void
- arrange(Monitor *m)
- {
-@@ -442,8 +534,8 @@ buttonpress(XEvent *e)
- 			click = ClkLtSymbol;
- 		else if (ev->x > selmon->ww - (int)TEXTW(stext))
- 			click = ClkStatusText;
--		else
--			click = ClkWinTitle;
-+		else // Focus clicked tab bar item
-+			bartabcalculate(selmon, x, TEXTW(stext) - lrpad + 2, ev->x, battabclick);
- 	} else if ((c = wintoclient(ev->window))) {
- 		focus(c);
- 		restack(selmon);
-@@ -729,15 +821,13 @@ drawbar(Monitor *m)
- 	drw_setscheme(drw, scheme[SchemeNorm]);
- 	x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
- 
-+	// Draw bartabgroups
-+	drw_rect(drw, x, 0, m->ww - tw - x, bh, 1, 1);
- 	if ((w = m->ww - tw - x) > bh) {
--		if (m->sel) {
--			drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
--			drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
--			if (m->sel->isfloating)
--				drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
--		} else {
--			drw_setscheme(drw, scheme[SchemeNorm]);
--			drw_rect(drw, x, 0, w, bh, 1, 1);
-+		bartabcalculate(m, x, tw, -1, bartabdraw);
-+		if (BARTAB_BOTTOMBORDER) {
-+			drw_setscheme(drw, scheme[SchemeTabActive]);
-+			drw_rect(drw, 0, bh - 1, m->ww, 1, 1, 0);
- 		}
- 	}
- 	drw_map(drw, m->barwin, 0, 0, m->ww, bh);
--- 
-2.32.0
-
diff --git a/cancelled/dwm-noborder-6.2.diff b/cancelled/dwm-noborder-6.2.diff
deleted file mode 100644
index f381eb8..0000000
--- a/cancelled/dwm-noborder-6.2.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9102fdb9c670218373bbe83c891c8e8138d6a6f4 Mon Sep 17 00:00:00 2001
-From: redacted <redacted@example.com>
-Date: Tue, 23 Apr 2019 00:39:27 +0100
-Subject: [PATCH] added noborder patch
-
----
- dwm.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/dwm.c b/dwm.c
-index 4465af1..685eca1 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -1282,6 +1282,13 @@ resizeclient(Client *c, int x, int y, int w, int h)
- 	c->oldw = c->w; c->w = wc.width = w;
- 	c->oldh = c->h; c->h = wc.height = h;
- 	wc.border_width = c->bw;
-+	if (((nexttiled(c->mon->clients) == c && !nexttiled(c->next))
-+	    || &monocle == c->mon->lt[c->mon->sellt]->arrange)
-+	    && !c->isfullscreen && !c->isfloating) {
-+		c->w = wc.width += c->bw * 2;
-+		c->h = wc.height += c->bw * 2;
-+		wc.border_width = 0;
-+	}
- 	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
- 	configure(c);
- 	XSync(dpy, False);
--- 
-2.21.0
-
diff --git a/cancelled/dwm-showselmon-6.2.diff b/cancelled/dwm-showselmon-6.2.diff
deleted file mode 100644
index bbf837e..0000000
--- a/cancelled/dwm-showselmon-6.2.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -up a/config.def.h b/config.def.h
---- a/config.def.h	2020-07-04 13:56:23.316739958 +0200
-+++ b/config.def.h	2020-07-04 13:57:58.020554340 +0200
-@@ -15,6 +15,7 @@ static const char col_cyan[]        = "#
- static const char *colors[][3]      = {
- 	/*               fg         bg         border   */
- 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-+	[SchemeInv]  = { col_gray1, col_gray3, col_gray2 },
- 	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
- };
- 
-diff -up a/dwm.c b/dwm.c
---- a/dwm.c	2020-07-04 13:56:23.316739958 +0200
-+++ b/dwm.c	2020-07-04 14:14:54.124590755 +0200
-@@ -59,7 +59,7 @@
- 
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
--enum { SchemeNorm, SchemeSel }; /* color schemes */
-+enum { SchemeNorm, SchemeInv, SchemeSel }; /* color schemes */
- enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
-        NetWMFullscreen, NetActiveWindow, NetWMWindowType,
-        NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-@@ -716,7 +716,12 @@ drawbar(Monitor *m)
- 	x = 0;
- 	for (i = 0; i < LENGTH(tags); i++) {
- 		w = TEXTW(tags[i]);
--		drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
-+		if (m == selmon) {
-+			drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
-+		}
-+		else {
-+			drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeInv : SchemeNorm]);
-+		}
- 		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
- 		if (occ & 1 << i)
- 			drw_rect(drw, x + boxs, boxs, boxw, boxw,
-@@ -730,7 +735,7 @@ drawbar(Monitor *m)
- 
- 	if ((w = m->ww - sw - x) > bh) {
- 		if (m->sel) {
--			drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
-+			drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeInv]);
- 			drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
- 			if (m->sel->isfloating)
- 				drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);