Remove new dwm

5 files changed, 0 insertions, 971 deletions

diff --git a/wm/dwm-6.4/patches/dwm-alpha-20201019-61bb8b2.diff b/wm/dwm-6.4/patches/dwm-alpha-20201019-61bb8b2.diff
deleted file mode 100644
index 9a8e92a..0000000
--- a/wm/dwm-6.4/patches/dwm-alpha-20201019-61bb8b2.diff
+++ /dev/null
@@ -1,289 +0,0 @@
-From 51f9c34480b984e261a738e5295f518b42c2f29c Mon Sep 17 00:00:00 2001
-From: Petrus Karell <pk@petruskarell.fi>
-Date: Mon, 19 Oct 2020 19:15:24 +0300
-Subject: [PATCH] Allow dwm to have translucent bars, while keeping all
- the  text on it opaque, just like the alpha-patch for st. Updated for 61bb8b2
-
----
- config.def.h |  7 ++++++
- config.mk    |  2 +-
- drw.c        | 26 ++++++++++++-----------
- drw.h        |  9 +++++---
- dwm.c        | 60 ++++++++++++++++++++++++++++++++++++++++++++++------
- 5 files changed, 82 insertions(+), 22 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 1c0b587..4f68fe8 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -12,11 +12,18 @@ static const char col_gray2[]       = "#444444";
- static const char col_gray3[]       = "#bbbbbb";
- static const char col_gray4[]       = "#eeeeee";
- static const char col_cyan[]        = "#005577";
-+static const unsigned int baralpha = 0xd0;
-+static const unsigned int borderalpha = OPAQUE;
- static const char *colors[][3]      = {
- 	/*               fg         bg         border   */
- 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
- 	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
- };
-+static const unsigned int alphas[][3]      = {
-+	/*               fg      bg        border     */
-+	[SchemeNorm] = { OPAQUE, baralpha, borderalpha },
-+	[SchemeSel]  = { OPAQUE, baralpha, borderalpha },
-+};
- 
- /* tagging */
- static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-diff --git a/config.mk b/config.mk
-index 7084c33..21b5404 100644
---- a/config.mk
-+++ b/config.mk
-@@ -22,7 +22,7 @@ FREETYPEINC = /usr/include/freetype2
- 
- # includes and libs
- INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender
- 
- # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-diff --git a/drw.c b/drw.c
-index 4cdbcbe..fe3aadd 100644
---- a/drw.c
-+++ b/drw.c
-@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_t clen)
- }
- 
- Drw *
--drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
- {
- 	Drw *drw = ecalloc(1, sizeof(Drw));
- 
-@@ -70,8 +70,11 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
- 	drw->root = root;
- 	drw->w = w;
- 	drw->h = h;
--	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
--	drw->gc = XCreateGC(dpy, root, 0, NULL);
-+	drw->visual = visual;
-+	drw->depth = depth;
-+	drw->cmap = cmap;
-+	drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
-+	drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
- 	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
- 
- 	return drw;
-@@ -87,7 +90,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
- 	drw->h = h;
- 	if (drw->drawable)
- 		XFreePixmap(drw->dpy, drw->drawable);
--	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-+	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
- }
- 
- void
-@@ -194,21 +197,22 @@ drw_fontset_free(Fnt *font)
- }
- 
- void
--drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
-+drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha)
- {
- 	if (!drw || !dest || !clrname)
- 		return;
- 
--	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
--	                       DefaultColormap(drw->dpy, drw->screen),
-+	if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
- 	                       clrname, dest))
- 		die("error, cannot allocate color '%s'", clrname);
-+
-+	dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
- }
- 
- /* Wrapper to create color schemes. The caller has to call free(3) on the
-  * returned color scheme when done using it. */
- Clr *
--drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
-+drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount)
- {
- 	size_t i;
- 	Clr *ret;
-@@ -218,7 +222,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
- 		return NULL;
- 
- 	for (i = 0; i < clrcount; i++)
--		drw_clr_create(drw, &ret[i], clrnames[i]);
-+		drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]);
- 	return ret;
- }
- 
-@@ -274,9 +278,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
- 	} else {
- 		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
- 		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
--		d = XftDrawCreate(drw->dpy, drw->drawable,
--		                  DefaultVisual(drw->dpy, drw->screen),
--		                  DefaultColormap(drw->dpy, drw->screen));
-+		d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
- 		x += lpad;
- 		w -= lpad;
- 	}
-diff --git a/drw.h b/drw.h
-index 4bcd5ad..a56f523 100644
---- a/drw.h
-+++ b/drw.h
-@@ -20,6 +20,9 @@ typedef struct {
- 	Display *dpy;
- 	int screen;
- 	Window root;
-+	Visual *visual;
-+	unsigned int depth;
-+	Colormap cmap;
- 	Drawable drawable;
- 	GC gc;
- 	Clr *scheme;
-@@ -27,7 +30,7 @@ typedef struct {
- } Drw;
- 
- /* Drawable abstraction */
--Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
-+Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap);
- void drw_resize(Drw *drw, unsigned int w, unsigned int h);
- void drw_free(Drw *drw);
- 
-@@ -38,8 +41,8 @@ unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
- void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
- 
- /* Colorscheme abstraction */
--void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
--Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
-+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
-+Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount);
- 
- /* Cursor abstraction */
- Cur *drw_cur_create(Drw *drw, int shape);
-diff --git a/dwm.c b/dwm.c
-index 664c527..d8005c7 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -57,6 +57,8 @@
- #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
- 
-+#define OPAQUE                  0xffU
-+
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
- enum { SchemeNorm, SchemeSel }; /* color schemes */
-@@ -233,6 +235,7 @@ static Monitor *wintomon(Window w);
- static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
-+static void xinitvisual();
- static void zoom(const Arg *arg);
- 
- /* variables */
-@@ -269,6 +272,11 @@ static Drw *drw;
- static Monitor *mons, *selmon;
- static Window root, wmcheckwin;
- 
-+static int useargb = 0;
-+static Visual *visual;
-+static int depth;
-+static Colormap cmap;
-+
- /* configuration, allows nested code to access above variables */
- #include "config.h"
- 
-@@ -1542,7 +1550,8 @@ setup(void)
- 	sw = DisplayWidth(dpy, screen);
- 	sh = DisplayHeight(dpy, screen);
- 	root = RootWindow(dpy, screen);
--	drw = drw_create(dpy, screen, root, sw, sh);
-+	xinitvisual();
-+	drw = drw_create(dpy, screen, root, sw, sh, visual, depth, cmap);
- 	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
- 		die("no fonts could be loaded.");
- 	lrpad = drw->fonts->h;
-@@ -1570,7 +1579,7 @@ setup(void)
- 	/* init appearance */
- 	scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
- 	for (i = 0; i < LENGTH(colors); i++)
--		scheme[i] = drw_scm_create(drw, colors[i], 3);
-+		scheme[i] = drw_scm_create(drw, colors[i], alphas[i], 3);
- 	/* init bars */
- 	updatebars();
- 	updatestatus();
-@@ -1807,16 +1816,18 @@ updatebars(void)
- 	Monitor *m;
- 	XSetWindowAttributes wa = {
- 		.override_redirect = True,
--		.background_pixmap = ParentRelative,
-+		.background_pixel = 0,
-+		.border_pixel = 0,
-+		.colormap = cmap,
- 		.event_mask = ButtonPressMask|ExposureMask
- 	};
- 	XClassHint ch = {"dwm", "dwm"};
- 	for (m = mons; m; m = m->next) {
- 		if (m->barwin)
- 			continue;
--		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
--				CopyFromParent, DefaultVisual(dpy, screen),
--				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-+		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, depth,
-+		                          InputOutput, visual,
-+		                          CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
- 		XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
- 		XMapRaised(dpy, m->barwin);
- 		XSetClassHint(dpy, m->barwin, &ch);
-@@ -2113,6 +2124,43 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
- 	return -1;
- }
- 
-+void
-+xinitvisual()
-+{
-+	XVisualInfo *infos;
-+	XRenderPictFormat *fmt;
-+	int nitems;
-+	int i;
-+
-+	XVisualInfo tpl = {
-+		.screen = screen,
-+		.depth = 32,
-+		.class = TrueColor
-+	};
-+	long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
-+
-+	infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
-+	visual = NULL;
-+	for(i = 0; i < nitems; i ++) {
-+		fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
-+		if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
-+			visual = infos[i].visual;
-+			depth = infos[i].depth;
-+			cmap = XCreateColormap(dpy, root, visual, AllocNone);
-+			useargb = 1;
-+			break;
-+		}
-+	}
-+
-+	XFree(infos);
-+
-+	if (! visual) {
-+		visual = DefaultVisual(dpy, screen);
-+		depth = DefaultDepth(dpy, screen);
-+		cmap = DefaultColormap(dpy, screen);
-+	}
-+}
-+
- void
- zoom(const Arg *arg)
- {
--- 
-2.28.0
-
diff --git a/wm/dwm-6.4/patches/dwm-cool-autostart-6.2.diff b/wm/dwm-6.4/patches/dwm-cool-autostart-6.2.diff
deleted file mode 100644
index 84a93ea..0000000
--- a/wm/dwm-6.4/patches/dwm-cool-autostart-6.2.diff
+++ /dev/null
@@ -1,116 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 1c0b587..ed056a4 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -18,6 +18,11 @@ static const char *colors[][3]      = {
- 	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
- };
- 
-+static const char *const autostart[] = {
-+	"st", NULL,
-+	NULL /* terminate */
-+};
-+
- /* tagging */
- static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
- 
-diff --git a/dwm.c b/dwm.c
-index 9fd0286..1facd56 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -234,6 +234,7 @@ static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
- static void zoom(const Arg *arg);
-+static void autostart_exec(void);
- 
- /* variables */
- static const char broken[] = "broken";
-@@ -275,6 +276,34 @@ static Window root, wmcheckwin;
- /* compile-time check if all tags fit into an unsigned int bit array. */
- struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
- 
-+/* dwm will keep pid's of processes from autostart array and kill them at quit */
-+static pid_t *autostart_pids;
-+static size_t autostart_len;
-+
-+/* execute command from autostart array */
-+static void
-+autostart_exec() {
-+	const char *const *p;
-+	size_t i = 0;
-+
-+	/* count entries */
-+	for (p = autostart; *p; autostart_len++, p++)
-+		while (*++p);
-+
-+	autostart_pids = malloc(autostart_len * sizeof(pid_t));
-+	for (p = autostart; *p; i++, p++) {
-+		if ((autostart_pids[i] = fork()) == 0) {
-+			setsid();
-+			execvp(*p, (char *const *)p);
-+			fprintf(stderr, "dwm: execvp %s\n", *p);
-+			perror(" failed");
-+			_exit(EXIT_FAILURE);
-+		}
-+		/* skip arguments */
-+		while (*++p);
-+	}
-+}
-+
- /* function implementations */
- void
- applyrules(Client *c)
-@@ -1249,6 +1278,16 @@ propertynotify(XEvent *e)
- void
- quit(const Arg *arg)
- {
-+	size_t i;
-+
-+	/* kill child processes */
-+	for (i = 0; i < autostart_len; i++) {
-+		if (0 < autostart_pids[i]) {
-+			kill(autostart_pids[i], SIGTERM);
-+			waitpid(autostart_pids[i], NULL, 0);
-+		}
-+	}
-+
- 	running = 0;
- }
- 
-@@ -1632,9 +1671,25 @@ showhide(Client *c)
- void
- sigchld(int unused)
- {
-+	pid_t pid;
-+
- 	if (signal(SIGCHLD, sigchld) == SIG_ERR)
- 		die("can't install SIGCHLD handler:");
--	while (0 < waitpid(-1, NULL, WNOHANG));
-+	while (0 < (pid = waitpid(-1, NULL, WNOHANG))) {
-+		pid_t *p, *lim;
-+
-+		if (!(p = autostart_pids))
-+			continue;
-+		lim = &p[autostart_len];
-+
-+		for (; p < lim; p++) {
-+			if (*p == pid) {
-+				*p = -1;
-+				break;
-+			}
-+		}
-+
-+	}
- }
- 
- void
-@@ -2139,6 +2194,7 @@ main(int argc, char *argv[])
- 	if (!(dpy = XOpenDisplay(NULL)))
- 		die("dwm: cannot open display");
- 	checkotherwm();
-+	autostart_exec();
- 	setup();
- #ifdef __OpenBSD__
- 	if (pledge("stdio rpath proc exec", NULL) == -1)
-
diff --git a/wm/dwm-6.4/patches/dwm-gaps-6.0.diff b/wm/dwm-6.4/patches/dwm-gaps-6.0.diff
deleted file mode 100644
index 80e1c8d..0000000
--- a/wm/dwm-6.4/patches/dwm-gaps-6.0.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 77ff358..a4e496b 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -9,6 +9,7 @@ static const char selbordercolor[]  = "#005577";
- static const char selbgcolor[]      = "#005577";
- static const char selfgcolor[]      = "#eeeeee";
- static const unsigned int borderpx  = 1;        /* border pixel of windows */
-+static const unsigned int gappx     = 1;        /* gap pixel between windows */
- static const unsigned int snap      = 32;       /* snap pixel */
- static const Bool showbar           = True;     /* False means no bar */
- static const Bool topbar            = True;     /* False means bottom bar */
-diff --git a/dwm.c b/dwm.c
-index 1d78655..6cc96ff 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -1703,7 +1703,7 @@ textnw(const char *text, unsigned int len) {
- 
- void
- tile(Monitor *m) {
--	unsigned int i, n, h, mw, my, ty;
-+	unsigned int i, n, h, r, g = 0, mw, my, ty;
- 	Client *c;
- 
- 	for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-@@ -1711,19 +1711,21 @@ tile(Monitor *m) {
- 		return;
- 
- 	if(n > m->nmaster)
--		mw = m->nmaster ? m->ww * m->mfact : 0;
-+		mw = m->nmaster ? (m->ww - (g = gappx)) * m->mfact : 0;
- 	else
- 		mw = m->ww;
- 	for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
- 		if(i < m->nmaster) {
--			h = (m->wh - my) / (MIN(n, m->nmaster) - i);
-+			r = MIN(n, m->nmaster) - i;
-+			h = (m->wh - my - gappx * (r - 1)) / r;
- 			resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False);
--			my += HEIGHT(c);
-+			my += HEIGHT(c) + gappx;
- 		}
- 		else {
--			h = (m->wh - ty) / (n - i);
--			resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False);
--			ty += HEIGHT(c);
-+			r = n - i;
-+			h = (m->wh - ty - gappx * (r - 1)) / r;
-+			resize(c, m->wx + mw + g, m->wy + ty, m->ww - mw - g - (2*c->bw), h - (2*c->bw), False);
-+			ty += HEIGHT(c) + gappx;
- 		}
- }
- 
diff --git a/wm/dwm-6.4/patches/dwm-swallow-6.3.diff b/wm/dwm-6.4/patches/dwm-swallow-6.3.diff
deleted file mode 100644
index 47586a0..0000000
--- a/wm/dwm-6.4/patches/dwm-swallow-6.3.diff
+++ /dev/null
@@ -1,412 +0,0 @@
-From 0cf9a007511f7dfd7dd94171b172562ebac9b6d5 Mon Sep 17 00:00:00 2001
-From: Tom Schwindl <schwindl@posteo.de>
-Date: Sat, 10 Sep 2022 12:51:09 +0200
-Subject: [PATCH] 6.3 swallow patch
-
----
- config.def.h |   9 +-
- config.mk    |   3 +-
- dwm.c        | 235 +++++++++++++++++++++++++++++++++++++++++++++++++--
- 3 files changed, 237 insertions(+), 10 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 061ad662f82a..0b2b8ffd30d5 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -3,6 +3,7 @@
- /* appearance */
- static const unsigned int borderpx  = 1;        /* border pixel of windows */
- static const unsigned int snap      = 32;       /* snap pixel */
-+static const int swallowfloating    = 0;        /* 1 means swallow floating windows by default */
- static const int showbar            = 1;        /* 0 means no bar */
- static const int topbar             = 1;        /* 0 means bottom bar */
- static const char *fonts[]          = { "monospace:size=10" };
-@@ -26,9 +27,11 @@ static const Rule rules[] = {
- 	 *	WM_CLASS(STRING) = instance, class
- 	 *	WM_NAME(STRING) = title
- 	 */
--	/* class      instance    title       tags mask     isfloating   monitor */
--	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
--	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
-+	/* class     instance  title           tags mask  isfloating  isterminal  noswallow  monitor */
-+	{ "Gimp",    NULL,     NULL,           0,         1,          0,           0,        -1 },
-+	{ "Firefox", NULL,     NULL,           1 << 8,    0,          0,          -1,        -1 },
-+	{ "St",      NULL,     NULL,           0,         0,          1,           0,        -1 },
-+	{ NULL,      NULL,     "Event Tester", 0,         0,          0,           1,        -1 }, /* xev */
- };
- 
- /* layout(s) */
-diff --git a/config.mk b/config.mk
-index 81c493ef4aff..52d1ebf30bec 100644
---- a/config.mk
-+++ b/config.mk
-@@ -20,10 +20,11 @@ FREETYPEINC = /usr/include/freetype2
- # OpenBSD (uncomment)
- #FREETYPEINC = ${X11INC}/freetype2
- #MANPREFIX = ${PREFIX}/man
-+#KVMLIB = -lkvm
- 
- # includes and libs
- INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res ${KVMLIB}
- 
- # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-diff --git a/dwm.c b/dwm.c
-index e5efb6a22806..e68294b6b679 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -40,6 +40,12 @@
- #include <X11/extensions/Xinerama.h>
- #endif /* XINERAMA */
- #include <X11/Xft/Xft.h>
-+#include <X11/Xlib-xcb.h>
-+#include <xcb/res.h>
-+#ifdef __OpenBSD__
-+#include <sys/sysctl.h>
-+#include <kvm.h>
-+#endif /* __OpenBSD */
- 
- #include "drw.h"
- #include "util.h"
-@@ -92,9 +98,11 @@ struct Client {
- 	int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
- 	int bw, oldbw;
- 	unsigned int tags;
--	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-+	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow;
-+	pid_t pid;
- 	Client *next;
- 	Client *snext;
-+	Client *swallowing;
- 	Monitor *mon;
- 	Window win;
- };
-@@ -138,6 +146,8 @@ typedef struct {
- 	const char *title;
- 	unsigned int tags;
- 	int isfloating;
-+	int isterminal;
-+	int noswallow;
- 	int monitor;
- } Rule;
- 
-@@ -235,6 +245,12 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
- static void zoom(const Arg *arg);
- 
-+static pid_t getparentprocess(pid_t p);
-+static int isdescprocess(pid_t p, pid_t c);
-+static Client *swallowingclient(Window w);
-+static Client *termforwin(const Client *c);
-+static pid_t winpid(Window w);
-+
- /* variables */
- static const char broken[] = "broken";
- static char stext[256];
-@@ -269,6 +285,8 @@ static Drw *drw;
- static Monitor *mons, *selmon;
- static Window root, wmcheckwin;
- 
-+static xcb_connection_t *xcon;
-+
- /* configuration, allows nested code to access above variables */
- #include "config.h"
- 
-@@ -298,6 +316,8 @@ applyrules(Client *c)
- 		&& (!r->class || strstr(class, r->class))
- 		&& (!r->instance || strstr(instance, r->instance)))
- 		{
-+			c->isterminal = r->isterminal;
-+			c->noswallow  = r->noswallow;
- 			c->isfloating = r->isfloating;
- 			c->tags |= r->tags;
- 			for (m = mons; m && m->num != r->monitor; m = m->next);
-@@ -416,6 +436,53 @@ attachstack(Client *c)
- 	c->mon->stack = c;
- }
- 
-+void
-+swallow(Client *p, Client *c)
-+{
-+
-+	if (c->noswallow || c->isterminal)
-+		return;
-+	if (c->noswallow && !swallowfloating && c->isfloating)
-+		return;
-+
-+	detach(c);
-+	detachstack(c);
-+
-+	setclientstate(c, WithdrawnState);
-+	XUnmapWindow(dpy, p->win);
-+
-+	p->swallowing = c;
-+	c->mon = p->mon;
-+
-+	Window w = p->win;
-+	p->win = c->win;
-+	c->win = w;
-+	updatetitle(p);
-+	XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
-+	arrange(p->mon);
-+	configure(p);
-+	updateclientlist();
-+}
-+
-+void
-+unswallow(Client *c)
-+{
-+	c->win = c->swallowing->win;
-+
-+	free(c->swallowing);
-+	c->swallowing = NULL;
-+
-+	/* unfullscreen the client */
-+	setfullscreen(c, 0);
-+	updatetitle(c);
-+	arrange(c->mon);
-+	XMapWindow(dpy, c->win);
-+	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-+	setclientstate(c, NormalState);
-+	focus(NULL);
-+	arrange(c->mon);
-+}
-+
- void
- buttonpress(XEvent *e)
- {
-@@ -656,6 +723,9 @@ destroynotify(XEvent *e)
- 
- 	if ((c = wintoclient(ev->window)))
- 		unmanage(c, 1);
-+
-+	else if ((c = swallowingclient(ev->window)))
-+		unmanage(c->swallowing, 1);
- }
- 
- void
-@@ -1022,12 +1092,13 @@ killclient(const Arg *arg)
- void
- manage(Window w, XWindowAttributes *wa)
- {
--	Client *c, *t = NULL;
-+	Client *c, *t = NULL, *term = NULL;
- 	Window trans = None;
- 	XWindowChanges wc;
- 
- 	c = ecalloc(1, sizeof(Client));
- 	c->win = w;
-+	c->pid = winpid(w);
- 	/* geometry */
- 	c->x = c->oldx = wa->x;
- 	c->y = c->oldy = wa->y;
-@@ -1042,6 +1113,7 @@ manage(Window w, XWindowAttributes *wa)
- 	} else {
- 		c->mon = selmon;
- 		applyrules(c);
-+		term = termforwin(c);
- 	}
- 
- 	if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
-@@ -1076,6 +1148,8 @@ manage(Window w, XWindowAttributes *wa)
- 	c->mon->sel = c;
- 	arrange(c->mon);
- 	XMapWindow(dpy, c->win);
-+	if (term)
-+		swallow(term, c);
- 	focus(NULL);
- }
- 
-@@ -1763,6 +1837,20 @@ unmanage(Client *c, int destroyed)
- 	Monitor *m = c->mon;
- 	XWindowChanges wc;
- 
-+	if (c->swallowing) {
-+		unswallow(c);
-+		return;
-+	}
-+
-+	Client *s = swallowingclient(c->win);
-+	if (s) {
-+		free(s->swallowing);
-+		s->swallowing = NULL;
-+		arrange(m);
-+		focus(NULL);
-+		return;
-+	}
-+
- 	detach(c);
- 	detachstack(c);
- 	if (!destroyed) {
-@@ -1778,9 +1866,12 @@ unmanage(Client *c, int destroyed)
- 		XUngrabServer(dpy);
- 	}
- 	free(c);
--	focus(NULL);
--	updateclientlist();
--	arrange(m);
-+
-+	if (!s) {
-+		arrange(m);
-+		focus(NULL);
-+		updateclientlist();
-+	}
- }
- 
- void
-@@ -2044,6 +2135,136 @@ view(const Arg *arg)
- 	arrange(selmon);
- }
- 
-+pid_t
-+winpid(Window w)
-+{
-+
-+	pid_t result = 0;
-+
-+#ifdef __linux__
-+	xcb_res_client_id_spec_t spec = {0};
-+	spec.client = w;
-+	spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
-+
-+	xcb_generic_error_t *e = NULL;
-+	xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec);
-+	xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e);
-+
-+	if (!r)
-+		return (pid_t)0;
-+
-+	xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r);
-+	for (; i.rem; xcb_res_client_id_value_next(&i)) {
-+		spec = i.data->spec;
-+		if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) {
-+			uint32_t *t = xcb_res_client_id_value_value(i.data);
-+			result = *t;
-+			break;
-+		}
-+	}
-+
-+	free(r);
-+
-+	if (result == (pid_t)-1)
-+		result = 0;
-+
-+#endif /* __linux__ */
-+
-+#ifdef __OpenBSD__
-+        Atom type;
-+        int format;
-+        unsigned long len, bytes;
-+        unsigned char *prop;
-+        pid_t ret;
-+
-+        if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 0), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop)
-+               return 0;
-+
-+        ret = *(pid_t*)prop;
-+        XFree(prop);
-+        result = ret;
-+
-+#endif /* __OpenBSD__ */
-+	return result;
-+}
-+
-+pid_t
-+getparentprocess(pid_t p)
-+{
-+	unsigned int v = 0;
-+
-+#ifdef __linux__
-+	FILE *f;
-+	char buf[256];
-+	snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p);
-+
-+	if (!(f = fopen(buf, "r")))
-+		return 0;
-+
-+	fscanf(f, "%*u %*s %*c %u", &v);
-+	fclose(f);
-+#endif /* __linux__*/
-+
-+#ifdef __OpenBSD__
-+	int n;
-+	kvm_t *kd;
-+	struct kinfo_proc *kp;
-+
-+	kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL);
-+	if (!kd)
-+		return 0;
-+
-+	kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n);
-+	v = kp->p_ppid;
-+#endif /* __OpenBSD__ */
-+
-+	return (pid_t)v;
-+}
-+
-+int
-+isdescprocess(pid_t p, pid_t c)
-+{
-+	while (p != c && c != 0)
-+		c = getparentprocess(c);
-+
-+	return (int)c;
-+}
-+
-+Client *
-+termforwin(const Client *w)
-+{
-+	Client *c;
-+	Monitor *m;
-+
-+	if (!w->pid || w->isterminal)
-+		return NULL;
-+
-+	for (m = mons; m; m = m->next) {
-+		for (c = m->clients; c; c = c->next) {
-+			if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid))
-+				return c;
-+		}
-+	}
-+
-+	return NULL;
-+}
-+
-+Client *
-+swallowingclient(Window w)
-+{
-+	Client *c;
-+	Monitor *m;
-+
-+	for (m = mons; m; m = m->next) {
-+		for (c = m->clients; c; c = c->next) {
-+			if (c->swallowing && c->swallowing->win == w)
-+				return c;
-+		}
-+	}
-+
-+	return NULL;
-+}
-+
- Client *
- wintoclient(Window w)
- {
-@@ -2133,10 +2354,12 @@ main(int argc, char *argv[])
- 		fputs("warning: no locale support\n", stderr);
- 	if (!(dpy = XOpenDisplay(NULL)))
- 		die("dwm: cannot open display");
-+	if (!(xcon = XGetXCBConnection(dpy)))
-+		die("dwm: cannot get xcb connection\n");
- 	checkotherwm();
- 	setup();
- #ifdef __OpenBSD__
--	if (pledge("stdio rpath proc exec", NULL) == -1)
-+	if (pledge("stdio rpath proc exec ps", NULL) == -1)
- 		die("pledge");
- #endif /* __OpenBSD__ */
- 	scan();
--- 
-2.37.2
-
diff --git a/wm/dwm-6.4/patches/dwm-uselessgap-20211119-58414bee958f2.diff b/wm/dwm-6.4/patches/dwm-uselessgap-20211119-58414bee958f2.diff
deleted file mode 100644
index f8a3aec..0000000
--- a/wm/dwm-6.4/patches/dwm-uselessgap-20211119-58414bee958f2.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-From 58414bee958f2e7ed91d6fe31f503ec4a406981b Mon Sep 17 00:00:00 2001
-From: cirala <thim@cederlund.de>
-Date: Fri, 19 Nov 2021 18:14:07 +0100
-Subject: [PATCH] Fix for dwm-uselessgap
-Previous versions of the patch doubles the
-gap between the master and slave stacks.
-
----
- config.def.h |  3 ++-
- dwm.c        | 38 +++++++++++++++++++++++++++++++-------
- 2 files changed, 33 insertions(+), 8 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index a2ac963..17a205f 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -2,6 +2,7 @@
-
- /* appearance */
- static const unsigned int borderpx  = 1;        /* border pixel of windows */
-+static const unsigned int gappx     = 6;        /* gaps between windows */
- static const unsigned int snap      = 32;       /* snap pixel */
- static const int showbar            = 1;        /* 0 means no bar */
- static const int topbar             = 1;        /* 0 means bottom bar */
-@@ -34,7 +35,7 @@ static const Rule rules[] = {
- /* layout(s) */
- static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
- 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 resizehints = 0;    /* 1 means respect size hints in tiled resizals */
- static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
-
- static const Layout layouts[] = {
-diff --git a/dwm.c b/dwm.c
-index 5e4d494..b626e89 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -52,8 +52,8 @@
- #define ISVISIBLE(C)            ((C->tags & 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)
--#define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
-+#define WIDTH(X)                ((X)->w + 2 * (X)->bw + gappx)
-+#define HEIGHT(X)               ((X)->h + 2 * (X)->bw + gappx)
- #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
-
-@@ -1277,12 +1277,36 @@ void
- resizeclient(Client *c, int x, int y, int w, int h)
- {
- 	XWindowChanges wc;
-+	unsigned int n;
-+	unsigned int gapoffset;
-+	unsigned int gapincr;
-+	Client *nbc;
-
--	c->oldx = c->x; c->x = wc.x = x;
--	c->oldy = c->y; c->y = wc.y = y;
--	c->oldw = c->w; c->w = wc.width = w;
--	c->oldh = c->h; c->h = wc.height = h;
- 	wc.border_width = c->bw;
-+
-+	/* Get number of clients for the client's monitor */
-+	for (n = 0, nbc = nexttiled(c->mon->clients); nbc; nbc = nexttiled(nbc->next), n++);
-+
-+	/* Do nothing if layout is floating */
-+	if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
-+		gapincr = gapoffset = 0;
-+	} else {
-+		/* Remove border and gap if layout is monocle or only one client */
-+		if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
-+			gapoffset = 0;
-+			gapincr = -2 * borderpx;
-+			wc.border_width = 0;
-+		} else {
-+			gapoffset = gappx;
-+			gapincr = 2 * gappx;
-+		}
-+	}
-+
-+	c->oldx = c->x; c->x = wc.x = x + gapoffset;
-+	c->oldy = c->y; c->y = wc.y = y + gapoffset;
-+	c->oldw = c->w; c->w = wc.width = w - gapincr;
-+	c->oldh = c->h; c->h = wc.height = h - gapincr;
-+
- 	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
- 	configure(c);
- 	XSync(dpy, False);
-@@ -1688,7 +1712,7 @@ tile(Monitor *m)
- 	for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
- 		if (i < m->nmaster) {
- 			h = (m->wh - my) / (MIN(n, m->nmaster) - i);
--			resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
-+			resize(c, m->wx, m->wy + my, mw - (2*c->bw) + (n > 1 ? gappx : 0), h - (2*c->bw), 0);
- 			if (my + HEIGHT(c) < m->wh)
- 				my += HEIGHT(c);
- 		} else {
---
-2.33.1
-