update readme

6 files changed, 6 insertions, 858 deletions

diff --git a/README.md b/README.md
index c1aac45..b05af75 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 ## st - simple terminal
 
-This is my personal build of the simple terminal emulator from suckless.
+My st configuration uses the following patches:
+
+- alpha
+- alpha focus highlight
+- externalpipe
+- font2
 
-Using font2 patch and [libXft.so.2.3.7](https://gitlab.freedesktop.org/xorg/lib/libxft/-/tree/libXft-2.3.7/) to display colored glyphs.
diff --git a/patch/st-alpha-20220206-0.8.5.diff b/patch/st-alpha-20220206-0.8.5.diff
deleted file mode 100644
index ab029f6..0000000
--- a/patch/st-alpha-20220206-0.8.5.diff
+++ /dev/null
@@ -1,146 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 91ab8ca..6af616e 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -93,6 +93,9 @@ char *termname = "st-256color";
-  */
- unsigned int tabspaces = 8;
- 
-+/* bg opacity */
-+float alpha = 0.8;
-+
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
- 	/* 8 normal colors */
-diff --git a/config.mk b/config.mk
-index 4c4c5d5..0114bad 100644
---- a/config.mk
-+++ b/config.mk
-@@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config
- INCS = -I$(X11INC) \
-        `$(PKG_CONFIG) --cflags fontconfig` \
-        `$(PKG_CONFIG) --cflags freetype2`
--LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
-        `$(PKG_CONFIG) --libs fontconfig` \
-        `$(PKG_CONFIG) --libs freetype2`
- 
-diff --git a/st.h b/st.h
-index 519b9bd..8bb533d 100644
---- a/st.h
-+++ b/st.h
-@@ -126,3 +126,4 @@ extern unsigned int tabspaces;
- extern unsigned int defaultfg;
- extern unsigned int defaultbg;
- extern unsigned int defaultcs;
-+extern float alpha;
-diff --git a/x.c b/x.c
-index 8a16faa..ddf4178 100644
---- a/x.c
-+++ b/x.c
-@@ -105,6 +105,7 @@ typedef struct {
- 	XSetWindowAttributes attrs;
- 	int scr;
- 	int isfixed; /* is fixed geometry? */
-+	int depth; /* bit depth */
- 	int l, t; /* left and top offset */
- 	int gm; /* geometry mask */
- } XWindow;
-@@ -243,6 +244,7 @@ static char *usedfont = NULL;
- static double usedfontsize = 0;
- static double defaultfontsize = 0;
- 
-+static char *opt_alpha = NULL;
- static char *opt_class = NULL;
- static char **opt_cmd  = NULL;
- static char *opt_embed = NULL;
-@@ -736,7 +738,7 @@ xresize(int col, int row)
- 
- 	XFreePixmap(xw.dpy, xw.buf);
- 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
--			DefaultDepth(xw.dpy, xw.scr));
-+			xw.depth);
- 	XftDrawChange(xw.draw, xw.buf);
- 	xclear(0, 0, win.w, win.h);
- 
-@@ -796,6 +798,13 @@ xloadcols(void)
- 			else
- 				die("could not allocate color %d\n", i);
- 		}
-+
-+	/* set alpha value of bg color */
-+	if (opt_alpha)
-+		alpha = strtof(opt_alpha, NULL);
-+	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
-+	dc.col[defaultbg].pixel &= 0x00FFFFFF;
-+	dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
- 	loaded = 1;
- }
- 
-@@ -1118,11 +1127,23 @@ xinit(int cols, int rows)
- 	Window parent;
- 	pid_t thispid = getpid();
- 	XColor xmousefg, xmousebg;
-+	XWindowAttributes attr;
-+	XVisualInfo vis;
- 
- 	if (!(xw.dpy = XOpenDisplay(NULL)))
- 		die("can't open display\n");
- 	xw.scr = XDefaultScreen(xw.dpy);
--	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-+
-+	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
-+		parent = XRootWindow(xw.dpy, xw.scr);
-+		xw.depth = 32;
-+	} else {
-+		XGetWindowAttributes(xw.dpy, parent, &attr);
-+		xw.depth = attr.depth;
-+	}
-+
-+	XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
-+	xw.vis = vis.visual;
- 
- 	/* font */
- 	if (!FcInit())
-@@ -1132,7 +1153,7 @@ xinit(int cols, int rows)
- 	xloadfonts(usedfont, 0);
- 
- 	/* colors */
--	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-+	xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
- 	xloadcols();
- 
- 	/* adjust fixed window geometry */
-@@ -1152,19 +1173,15 @@ xinit(int cols, int rows)
- 		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
- 	xw.attrs.colormap = xw.cmap;
- 
--	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
--		parent = XRootWindow(xw.dpy, xw.scr);
- 	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
--			win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
-+			win.w, win.h, 0, xw.depth, InputOutput,
- 			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
- 			| CWEventMask | CWColormap, &xw.attrs);
- 
- 	memset(&gcvalues, 0, sizeof(gcvalues));
- 	gcvalues.graphics_exposures = False;
--	dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
--			&gcvalues);
--	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
--			DefaultDepth(xw.dpy, xw.scr));
-+	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
-+	dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
- 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
- 
-@@ -2019,6 +2036,9 @@ main(int argc, char *argv[])
- 	case 'a':
- 		allowaltscreen = 0;
- 		break;
-+	case 'A':
-+		opt_alpha = EARGF(usage());
-+		break;
- 	case 'c':
- 		opt_class = EARGF(usage());
- 		break;
diff --git a/patch/st-externalpipe-0.8.4.diff b/patch/st-externalpipe-0.8.4.diff
deleted file mode 100644
index 297d746..0000000
--- a/patch/st-externalpipe-0.8.4.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/st.c b/st.c
-index 76b7e0d..0e9a614 100644
---- a/st.c
-+++ b/st.c
-@@ -723,8 +723,14 @@ sigchld(int a)
- 	if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
- 		die("waiting for pid %hd failed: %s\n", pid, strerror(errno));
- 
--	if (pid != p)
-+	if (pid != p) {
-+		if (p == 0 && wait(&stat) < 0)
-+			die("wait: %s\n", strerror(errno));
-+
-+		/* reinstall sigchld handler */
-+		signal(SIGCHLD, sigchld);
- 		return;
-+	}
- 
- 	if (WIFEXITED(stat) && WEXITSTATUS(stat))
- 		die("child exited with status %d\n", WEXITSTATUS(stat));
-@@ -1926,6 +1932,59 @@ strparse(void)
- 	}
- }
- 
-+void
-+externalpipe(const Arg *arg)
-+{
-+	int to[2];
-+	char buf[UTF_SIZ];
-+	void (*oldsigpipe)(int);
-+	Glyph *bp, *end;
-+	int lastpos, n, newline;
-+
-+	if (pipe(to) == -1)
-+		return;
-+
-+	switch (fork()) {
-+	case -1:
-+		close(to[0]);
-+		close(to[1]);
-+		return;
-+	case 0:
-+		dup2(to[0], STDIN_FILENO);
-+		close(to[0]);
-+		close(to[1]);
-+		execvp(((char **)arg->v)[0], (char **)arg->v);
-+		fprintf(stderr, "st: execvp %s\n", ((char **)arg->v)[0]);
-+		perror("failed");
-+		exit(0);
-+	}
-+
-+	close(to[0]);
-+	/* ignore sigpipe for now, in case child exists early */
-+	oldsigpipe = signal(SIGPIPE, SIG_IGN);
-+	newline = 0;
-+	for (n = 0; n < term.row; n++) {
-+		bp = term.line[n];
-+		lastpos = MIN(tlinelen(n) + 1, term.col) - 1;
-+		if (lastpos < 0)
-+			break;
-+		end = &bp[lastpos + 1];
-+		for (; bp < end; ++bp)
-+			if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
-+				break;
-+		if ((newline = term.line[n][lastpos].mode & ATTR_WRAP))
-+			continue;
-+		if (xwrite(to[1], "\n", 1) < 0)
-+			break;
-+		newline = 0;
-+	}
-+	if (newline)
-+		(void)xwrite(to[1], "\n", 1);
-+	close(to[1]);
-+	/* restore */
-+	signal(SIGPIPE, oldsigpipe);
-+}
-+
- void
- strdump(void)
- {
-diff --git a/st.h b/st.h
-index 3d351b6..392b64e 100644
---- a/st.h
-+++ b/st.h
-@@ -81,6 +81,7 @@ void die(const char *, ...);
- void redraw(void);
- void draw(void);
- 
-+void externalpipe(const Arg *);
- void printscreen(const Arg *);
- void printsel(const Arg *);
- void sendbreak(const Arg *);
diff --git a/patch/st-focus-20200731-43a395a.diff b/patch/st-focus-20200731-43a395a.diff
deleted file mode 100644
index 809cb46..0000000
--- a/patch/st-focus-20200731-43a395a.diff
+++ /dev/null
@@ -1,271 +0,0 @@
-From 10fa2b6aebceb3a12219ef25376297b063638bd9 Mon Sep 17 00:00:00 2001
-From: Julius Huelsmann <juliusHuelsmann@gmail.com>
-Date: Fri, 31 Jul 2020 10:13:35 +0200
-Subject: [PATCH] patch: focus
-
----
- config.def.h |  5 ++++
- config.mk    |  2 +-
- st.c         |  1 -
- st.h         |  2 ++
- x.c          | 72 +++++++++++++++++++++++++++++++++++++++-------------
- 5 files changed, 62 insertions(+), 20 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 0895a1f..577d1f1 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -84,6 +84,9 @@ char *termname = "st-256color";
-  */
- unsigned int tabspaces = 8;
- 
-+/* bg opacity */
-+float alpha = 0.8, alphaUnfocused = 0.6;
-+
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
- 	/* 8 normal colors */
-@@ -111,6 +114,7 @@ static const char *colorname[] = {
- 	/* more colors can be added after 255 to use with DefaultXX */
- 	"#cccccc",
- 	"#555555",
-+	"black",
- };
- 
- 
-@@ -122,6 +126,7 @@ unsigned int defaultfg = 7;
- unsigned int defaultbg = 0;
- static unsigned int defaultcs = 256;
- static unsigned int defaultrcs = 257;
-+unsigned int bg = 17, bgUnfocused = 16;
- 
- /*
-  * Default shape of cursor
-diff --git a/config.mk b/config.mk
-index beafc35..ddc65ae 100644
---- a/config.mk
-+++ b/config.mk
-@@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config
- INCS = -I$(X11INC) \
-        `$(PKG_CONFIG) --cflags fontconfig` \
-        `$(PKG_CONFIG) --cflags freetype2`
--LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
-        `$(PKG_CONFIG) --libs fontconfig` \
-        `$(PKG_CONFIG) --libs freetype2`
- 
-diff --git a/st.c b/st.c
-index 0ce6ac2..c7f40c8 100644
---- a/st.c
-+++ b/st.c
-@@ -194,7 +194,6 @@ static void tsetscroll(int, int);
- static void tswapscreen(void);
- static void tsetmode(int, int, int *, int);
- static int twrite(const char *, int, int);
--static void tfulldirt(void);
- static void tcontrolcode(uchar );
- static void tdectest(char );
- static void tdefutf8(char);
-diff --git a/st.h b/st.h
-index d978458..44cb3fd 100644
---- a/st.h
-+++ b/st.h
-@@ -79,6 +79,7 @@ typedef union {
- 
- void die(const char *, ...);
- void redraw(void);
-+void tfulldirt(void);
- void draw(void);
- 
- void printscreen(const Arg *);
-@@ -122,3 +123,4 @@ extern char *termname;
- extern unsigned int tabspaces;
- extern unsigned int defaultfg;
- extern unsigned int defaultbg;
-+extern float alpha, alphaUnfocused;
-diff --git a/x.c b/x.c
-index e5f1737..a2e820f 100644
---- a/x.c
-+++ b/x.c
-@@ -105,6 +105,7 @@ typedef struct {
- 	XSetWindowAttributes attrs;
- 	int scr;
- 	int isfixed; /* is fixed geometry? */
-+	int depth; /* bit depth */
- 	int l, t; /* left and top offset */
- 	int gm; /* geometry mask */
- } XWindow;
-@@ -243,6 +244,7 @@ static char *usedfont = NULL;
- static double usedfontsize = 0;
- static double defaultfontsize = 0;
- 
-+static char *opt_alpha = NULL;
- static char *opt_class = NULL;
- static char **opt_cmd  = NULL;
- static char *opt_embed = NULL;
-@@ -252,6 +254,8 @@ static char *opt_line  = NULL;
- static char *opt_name  = NULL;
- static char *opt_title = NULL;
- 
-+static int focused = 0;
-+
- static int oldbutton = 3; /* button event on startup: 3 = release */
- 
- void
-@@ -734,7 +738,7 @@ xresize(int col, int row)
- 
- 	XFreePixmap(xw.dpy, xw.buf);
- 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
--			DefaultDepth(xw.dpy, xw.scr));
-+			xw.depth);
- 	XftDrawChange(xw.draw, xw.buf);
- 	xclear(0, 0, win.w, win.h);
- 
-@@ -772,28 +776,38 @@ xloadcolor(int i, const char *name, Color *ncolor)
- 	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
- }
- 
-+void
-+xloadalpha(void)
-+{
-+	float const usedAlpha = focused ? alpha : alphaUnfocused;
-+	if (opt_alpha) alpha = strtof(opt_alpha, NULL);
-+	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * usedAlpha);
-+	dc.col[defaultbg].pixel &= 0x00FFFFFF;
-+	dc.col[defaultbg].pixel |= (unsigned char)(0xff * usedAlpha) << 24;
-+}
-+
- void
- xloadcols(void)
- {
--	int i;
- 	static int loaded;
- 	Color *cp;
- 
--	if (loaded) {
--		for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
--			XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
--	} else {
--		dc.collen = MAX(LEN(colorname), 256);
--		dc.col = xmalloc(dc.collen * sizeof(Color));
-+	if (!loaded) {
-+		dc.collen = 1 + (defaultbg = MAX(LEN(colorname), 256));
-+		dc.col = xmalloc((dc.collen) * sizeof(Color));
- 	}
- 
--	for (i = 0; i < dc.collen; i++)
-+	for (int i = 0; i+1 < dc.collen; ++i)
- 		if (!xloadcolor(i, NULL, &dc.col[i])) {
- 			if (colorname[i])
- 				die("could not allocate color '%s'\n", colorname[i]);
- 			else
- 				die("could not allocate color %d\n", i);
- 		}
-+	if (dc.collen) // cannot die, as the color is already loaded.
-+		xloadcolor(focused ?bg :bgUnfocused, NULL, &dc.col[defaultbg]);
-+
-+	xloadalpha();
- 	loaded = 1;
- }
- 
-@@ -1103,11 +1117,23 @@ xinit(int cols, int rows)
- 	Window parent;
- 	pid_t thispid = getpid();
- 	XColor xmousefg, xmousebg;
-+	XWindowAttributes attr;
-+	XVisualInfo vis;
- 
- 	if (!(xw.dpy = XOpenDisplay(NULL)))
- 		die("can't open display\n");
- 	xw.scr = XDefaultScreen(xw.dpy);
--	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-+
-+	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
-+		parent = XRootWindow(xw.dpy, xw.scr);
-+		xw.depth = 32;
-+	} else {
-+		XGetWindowAttributes(xw.dpy, parent, &attr);
-+		xw.depth = attr.depth;
-+	}
-+
-+	XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
-+	xw.vis = vis.visual;
- 
- 	/* font */
- 	if (!FcInit())
-@@ -1117,7 +1143,7 @@ xinit(int cols, int rows)
- 	xloadfonts(usedfont, 0);
- 
- 	/* colors */
--	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-+	xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
- 	xloadcols();
- 
- 	/* adjust fixed window geometry */
-@@ -1137,19 +1163,15 @@ xinit(int cols, int rows)
- 		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
- 	xw.attrs.colormap = xw.cmap;
- 
--	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
--		parent = XRootWindow(xw.dpy, xw.scr);
- 	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
--			win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
-+			win.w, win.h, 0, xw.depth, InputOutput,
- 			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
- 			| CWEventMask | CWColormap, &xw.attrs);
- 
- 	memset(&gcvalues, 0, sizeof(gcvalues));
- 	gcvalues.graphics_exposures = False;
--	dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
--			&gcvalues);
--	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
--			DefaultDepth(xw.dpy, xw.scr));
-+	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
-+	dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
- 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
- 
-@@ -1730,12 +1752,22 @@ focus(XEvent *ev)
- 		xseturgency(0);
- 		if (IS_SET(MODE_FOCUS))
- 			ttywrite("\033[I", 3, 0);
-+		if (!focused) {
-+			focused = 1;
-+			xloadcols();
-+			tfulldirt();
-+		}
- 	} else {
- 		if (xw.ime.xic)
- 			XUnsetICFocus(xw.ime.xic);
- 		win.mode &= ~MODE_FOCUSED;
- 		if (IS_SET(MODE_FOCUS))
- 			ttywrite("\033[O", 3, 0);
-+		if (focused) {
-+			focused = 0;
-+			xloadcols();
-+			tfulldirt();
-+		}
- 	}
- }
- 
-@@ -1994,6 +2026,9 @@ main(int argc, char *argv[])
- 	case 'a':
- 		allowaltscreen = 0;
- 		break;
-+	case 'A':
-+		opt_alpha = EARGF(usage());
-+		break;
- 	case 'c':
- 		opt_class = EARGF(usage());
- 		break;
-@@ -2045,6 +2080,7 @@ run:
- 	XSetLocaleModifiers("");
- 	cols = MAX(cols, 1);
- 	rows = MAX(rows, 1);
-+	defaultbg = MAX(LEN(colorname), 256);
- 	tnew(cols, rows);
- 	xinit(cols, rows);
- 	xsetenv();
--- 
-2.28.0
-
diff --git a/patch/st-font2-0.8.5.diff b/patch/st-font2-0.8.5.diff
deleted file mode 100644
index 9b22b8a..0000000
--- a/patch/st-font2-0.8.5.diff
+++ /dev/null
@@ -1,163 +0,0 @@
-From 1635e04d3643dd4caa0c7c2043b585c6d7e4705f Mon Sep 17 00:00:00 2001
-From: Rizqi Nur Assyaufi <bandithijo@gmail.com>
-Date: Mon, 18 Jul 2022 01:15:45 +0800
-Subject: [PATCH] [st][patch][font2] Add patch for st-0.8.5
-
----
- config.def.h |   6 +++
- x.c          | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 107 insertions(+)
-
-diff --git a/config.def.h b/config.def.h
-index 91ab8ca..717b2f0 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -6,6 +6,12 @@
-  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
-  */
- static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
-+/* Spare fonts */
-+static char *font2[] = {
-+/*	"Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */
-+/*	"Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
-+};
-+
- static int borderpx = 2;
-
- /*
-diff --git a/x.c b/x.c
-index 8a16faa..220fc4f 100644
---- a/x.c
-+++ b/x.c
-@@ -157,6 +157,8 @@ static void xhints(void);
- static int xloadcolor(int, const char *, Color *);
- static int xloadfont(Font *, FcPattern *);
- static void xloadfonts(const char *, double);
-+static int xloadsparefont(FcPattern *, int);
-+static void xloadsparefonts(void);
- static void xunloadfont(Font *);
- static void xunloadfonts(void);
- static void xsetenv(void);
-@@ -306,6 +308,7 @@ zoomabs(const Arg *arg)
- {
- 	xunloadfonts();
- 	xloadfonts(usedfont, arg->f);
-+	xloadsparefonts();
- 	cresize(0, 0);
- 	redraw();
- 	xhints();
-@@ -1034,6 +1037,101 @@ xloadfonts(const char *fontstr, double fontsize)
- 	FcPatternDestroy(pattern);
- }
-
-+int
-+xloadsparefont(FcPattern *pattern, int flags)
-+{
-+	FcPattern *match;
-+	FcResult result;
-+
-+	match = FcFontMatch(NULL, pattern, &result);
-+	if (!match) {
-+		return 1;
-+	}
-+
-+	if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) {
-+		FcPatternDestroy(match);
-+		return 1;
-+	}
-+
-+	frc[frclen].flags = flags;
-+	/* Believe U+0000 glyph will present in each default font */
-+	frc[frclen].unicodep = 0;
-+	frclen++;
-+
-+	return 0;
-+}
-+
-+void
-+xloadsparefonts(void)
-+{
-+	FcPattern *pattern;
-+	double sizeshift, fontval;
-+	int fc;
-+	char **fp;
-+
-+	if (frclen != 0)
-+		die("can't embed spare fonts. cache isn't empty");
-+
-+	/* Calculate count of spare fonts */
-+	fc = sizeof(font2) / sizeof(*font2);
-+	if (fc == 0)
-+		return;
-+
-+	/* Allocate memory for cache entries. */
-+	if (frccap < 4 * fc) {
-+		frccap += 4 * fc - frccap;
-+		frc = xrealloc(frc, frccap * sizeof(Fontcache));
-+	}
-+
-+	for (fp = font2; fp - font2 < fc; ++fp) {
-+
-+		if (**fp == '-')
-+			pattern = XftXlfdParse(*fp, False, False);
-+		else
-+			pattern = FcNameParse((FcChar8 *)*fp);
-+
-+		if (!pattern)
-+			die("can't open spare font %s\n", *fp);
-+
-+		if (defaultfontsize > 0) {
-+			sizeshift = usedfontsize - defaultfontsize;
-+			if (sizeshift != 0 &&
-+					FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
-+					FcResultMatch) {
-+				fontval += sizeshift;
-+				FcPatternDel(pattern, FC_PIXEL_SIZE);
-+				FcPatternDel(pattern, FC_SIZE);
-+				FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
-+			}
-+		}
-+
-+		FcPatternAddBool(pattern, FC_SCALABLE, 1);
-+
-+		FcConfigSubstitute(NULL, pattern, FcMatchPattern);
-+		XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
-+
-+		if (xloadsparefont(pattern, FRC_NORMAL))
-+			die("can't open spare font %s\n", *fp);
-+
-+		FcPatternDel(pattern, FC_SLANT);
-+		FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
-+		if (xloadsparefont(pattern, FRC_ITALIC))
-+			die("can't open spare font %s\n", *fp);
-+
-+		FcPatternDel(pattern, FC_WEIGHT);
-+		FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
-+		if (xloadsparefont(pattern, FRC_ITALICBOLD))
-+			die("can't open spare font %s\n", *fp);
-+
-+		FcPatternDel(pattern, FC_SLANT);
-+		FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
-+		if (xloadsparefont(pattern, FRC_BOLD))
-+			die("can't open spare font %s\n", *fp);
-+
-+		FcPatternDestroy(pattern);
-+	}
-+}
-+
- void
- xunloadfont(Font *f)
- {
-@@ -1131,6 +1229,9 @@ xinit(int cols, int rows)
- 	usedfont = (opt_font == NULL)? font : opt_font;
- 	xloadfonts(usedfont, 0);
-
-+	/* spare fonts */
-+	xloadsparefonts();
-+
- 	/* colors */
- 	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
- 	xloadcols();
---
-2.37.1
-
diff --git a/patch/st-xresources-20200604-9ba7ecf.diff b/patch/st-xresources-20200604-9ba7ecf.diff
deleted file mode 100644
index 78ba00a..0000000
--- a/patch/st-xresources-20200604-9ba7ecf.diff
+++ /dev/null
@@ -1,184 +0,0 @@
-From 2752a599ee01305a435729bfacf43b1dde7cf0ef Mon Sep 17 00:00:00 2001
-From: Benji Encalada Mora <benji@encalada.dev>
-Date: Thu, 4 Jun 2020 00:41:10 -0500
-Subject: [PATCH] fix: replace xfps and actionfps variables
-
----
- config.def.h | 36 ++++++++++++++++++++++++
- x.c          | 78 +++++++++++++++++++++++++++++++++++++++++++++++++---
- 2 files changed, 110 insertions(+), 4 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 6f05dce..9b99782 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -168,6 +168,42 @@ static unsigned int defaultattr = 11;
-  */
- static uint forcemousemod = ShiftMask;
- 
-+/*
-+ * Xresources preferences to load at startup
-+ */
-+ResourcePref resources[] = {
-+		{ "font",         STRING,  &font },
-+		{ "color0",       STRING,  &colorname[0] },
-+		{ "color1",       STRING,  &colorname[1] },
-+		{ "color2",       STRING,  &colorname[2] },
-+		{ "color3",       STRING,  &colorname[3] },
-+		{ "color4",       STRING,  &colorname[4] },
-+		{ "color5",       STRING,  &colorname[5] },
-+		{ "color6",       STRING,  &colorname[6] },
-+		{ "color7",       STRING,  &colorname[7] },
-+		{ "color8",       STRING,  &colorname[8] },
-+		{ "color9",       STRING,  &colorname[9] },
-+		{ "color10",      STRING,  &colorname[10] },
-+		{ "color11",      STRING,  &colorname[11] },
-+		{ "color12",      STRING,  &colorname[12] },
-+		{ "color13",      STRING,  &colorname[13] },
-+		{ "color14",      STRING,  &colorname[14] },
-+		{ "color15",      STRING,  &colorname[15] },
-+		{ "background",   STRING,  &colorname[256] },
-+		{ "foreground",   STRING,  &colorname[257] },
-+		{ "cursorColor",  STRING,  &colorname[258] },
-+		{ "termname",     STRING,  &termname },
-+		{ "shell",        STRING,  &shell },
-+		{ "minlatency",   INTEGER, &minlatency },
-+		{ "maxlatency",   INTEGER, &maxlatency },
-+		{ "blinktimeout", INTEGER, &blinktimeout },
-+		{ "bellvolume",   INTEGER, &bellvolume },
-+		{ "tabspaces",    INTEGER, &tabspaces },
-+		{ "borderpx",     INTEGER, &borderpx },
-+		{ "cwscale",      FLOAT,   &cwscale },
-+		{ "chscale",      FLOAT,   &chscale },
-+};
-+
- /*
-  * Internal mouse shortcuts.
-  * Beware that overloading Button1 will disable the selection.
-diff --git a/x.c b/x.c
-index 210f184..76f167f 100644
---- a/x.c
-+++ b/x.c
-@@ -14,6 +14,7 @@
- #include <X11/keysym.h>
- #include <X11/Xft/Xft.h>
- #include <X11/XKBlib.h>
-+#include <X11/Xresource.h>
- 
- char *argv0;
- #include "arg.h"
-@@ -45,6 +46,19 @@ typedef struct {
- 	signed char appcursor; /* application cursor */
- } Key;
- 
-+/* Xresources preferences */
-+enum resource_type {
-+	STRING = 0,
-+	INTEGER = 1,
-+	FLOAT = 2
-+};
-+
-+typedef struct {
-+	char *name;
-+	enum resource_type type;
-+	void *dst;
-+} ResourcePref;
-+
- /* X modifiers */
- #define XK_ANY_MOD    UINT_MAX
- #define XK_NO_MOD     0
-@@ -828,8 +842,8 @@ xclear(int x1, int y1, int x2, int y2)
- void
- xhints(void)
- {
--	XClassHint class = {opt_name ? opt_name : termname,
--	                    opt_class ? opt_class : termname};
-+	XClassHint class = {opt_name ? opt_name : "st",
-+	                    opt_class ? opt_class : "St"};
- 	XWMHints wm = {.flags = InputHint, .input = 1};
- 	XSizeHints *sizeh;
- 
-@@ -1104,8 +1118,6 @@ xinit(int cols, int rows)
- 	pid_t thispid = getpid();
- 	XColor xmousefg, xmousebg;
- 
--	if (!(xw.dpy = XOpenDisplay(NULL)))
--		die("can't open display\n");
- 	xw.scr = XDefaultScreen(xw.dpy);
- 	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
- 
-@@ -1964,6 +1976,59 @@ run(void)
- 	}
- }
- 
-+int
-+resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
-+{
-+	char **sdst = dst;
-+	int *idst = dst;
-+	float *fdst = dst;
-+
-+	char fullname[256];
-+	char fullclass[256];
-+	char *type;
-+	XrmValue ret;
-+
-+	snprintf(fullname, sizeof(fullname), "%s.%s",
-+			opt_name ? opt_name : "st", name);
-+	snprintf(fullclass, sizeof(fullclass), "%s.%s",
-+			opt_class ? opt_class : "St", name);
-+	fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0';
-+
-+	XrmGetResource(db, fullname, fullclass, &type, &ret);
-+	if (ret.addr == NULL || strncmp("String", type, 64))
-+		return 1;
-+
-+	switch (rtype) {
-+	case STRING:
-+		*sdst = ret.addr;
-+		break;
-+	case INTEGER:
-+		*idst = strtoul(ret.addr, NULL, 10);
-+		break;
-+	case FLOAT:
-+		*fdst = strtof(ret.addr, NULL);
-+		break;
-+	}
-+	return 0;
-+}
-+
-+void
-+config_init(void)
-+{
-+	char *resm;
-+	XrmDatabase db;
-+	ResourcePref *p;
-+
-+	XrmInitialize();
-+	resm = XResourceManagerString(xw.dpy);
-+	if (!resm)
-+		return;
-+
-+	db = XrmGetStringDatabase(resm);
-+	for (p = resources; p < resources + LEN(resources); p++)
-+		resource_load(db, p->name, p->type, p->dst);
-+}
-+
- void
- usage(void)
- {
-@@ -2037,6 +2102,11 @@ run:
- 
- 	setlocale(LC_CTYPE, "");
- 	XSetLocaleModifiers("");
-+
-+	if(!(xw.dpy = XOpenDisplay(NULL)))
-+		die("Can't open display\n");
-+
-+	config_init();
- 	cols = MAX(cols, 1);
- 	rows = MAX(rows, 1);
- 	tnew(cols, rows);
--- 
-2.26.2
-