From 99dfaf066f97d2262a2e13351ca5cdf4a0f1c2f6 Mon Sep 17 00:00:00 2001
From: speedie <speedie@duck.com>
Date: Mon, 5 Dec 2022 20:10:13 +0100
Subject: [PATCH] dpy is now computed
 (https://git.suckless.org/st/commit/528241aa3835e2f1f052abeeaf891737712955a0.html#h0-0-4)

---
 options.h    | 7 ++++---
 x.c          | 6 +-----
 xresources.h | 1 +
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/options.h b/options.h
index bf33bb3..035e5cf 100644
--- a/options.h
+++ b/options.h
@@ -12,8 +12,9 @@
  */
 static char *font[]                    = { 
                                            "Fantasque Sans Mono:size=8:style=Bold:antialias=true:autohint=true",
+                                           "Terminus:size=8:style=Bold:antialias=true:autohint=true",
 										   "DejaVu Sans Mono:size=8:antialias=true:autohint=true",
-										   "Noto Color Emoji:size=8:antialias=true:autohint=true", 
+										   "Noto Color Emoji:size=7:antialias=true:autohint=true", 
 										   "fontawesome:size=8:antialias=true:autohint=true",
 };
 
@@ -62,8 +63,8 @@ static unsigned int cursorthickness	   = 2; /* Cursor thickness in pixels */
  *    Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
  * 0: Disable boxdraw (render all U25XX glyphs normally from the font).
  */
-int boxdraw							   = 0; /* Enable boxdraw */
-int boxdraw_bold					   = 0; /* Draw boxdraw bold */
+int boxdraw							   = 1; /* Enable boxdraw */
+int boxdraw_bold					   = 1; /* Draw boxdraw bold */
 int boxdraw_braille					   = 0; /* Render braille as adjecent pixels */
 
 /* Undercurl options
diff --git a/x.c b/x.c
index 5e79828..a8841ee 100644
--- a/x.c
+++ b/x.c
@@ -1144,7 +1144,7 @@ xloadsparefont(FcPattern *pattern, int flags)
 	FcPattern *match;
 	FcResult result;
 
-	match = FcFontMatch(NULL, pattern, &result);
+	match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
 	if (!match) {
 		return 1;
 	}
@@ -1574,10 +1574,6 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 					fccharset);
 			FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
 
-			FcConfigSubstitute(0, fcpattern,
-					FcMatchPattern);
-			FcDefaultSubstitute(fcpattern);
-
 			fontpattern = FcFontSetMatch(0, fcsets, 1,
 					fcpattern, &fcres);
 
diff --git a/xresources.h b/xresources.h
index 98c68ad..a76484e 100644
--- a/xresources.h
+++ b/xresources.h
@@ -20,6 +20,7 @@ ResourcePref resources[] = {
 		{ "background",		 STRING,  &colorname[256] },
 		{ "foreground",		 STRING,  &colorname[257] },
 		{ "curcolor",		 STRING,  &colorname[258] },
+		{ "cursorColor",	 STRING,  &colorname[258] },
 		{ "termname",        STRING,  &termname },
 		{ "shell",           STRING,  &shell },
 		{ "understyle",      STRING,  &understyle },