From 1a518da8ececa6624cc4d2233f2eb56698c20c4e Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Fri, 4 Dec 2020 13:10:44 -0500
Subject: [PATCH] big catchup

---
 README.md       |  7 +++++++
 cgi.d           |  3 +++
 http2.d         | 16 ++++++++++++----
 simpledisplay.d | 19 ++++++++++++++-----
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 2ffc46f..df1f3c2 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,12 @@ See the full list of (at least slightly) documented module here: http://arsd-off
 
 I have [a patreon](https://www.patreon.com/adam_d_ruppe) and my (almost) [weekly blog](http://dpldocs.info/this-week-in-d/) you can check out if you'd like to financially support this work or see the updates and tips I write about.
 
+# Breaking Changelog
+
+This only lists changes that broke things and got a major version bump. I didn't start keeping track here until 9.0.
+
+9.0 - simpledisplay's OperatingSystemFont, which is also used by terminalemulator.d (which is used by terminal.d's -version=TerminalDirectToEmulator function) would previously only load X Core Fonts. It now prefers TrueType fonts via Xft. This loads potentially different fonts and the sizes are interpreted differently, so you may need to adjust your preferences there. To restore previous behavior, prefix your font name strings with "core:".
+
 ## Credits
 
 Thanks go to Nick Sabalausky, Trass3r, Stanislav Blinov, ketmar, maartenvd, and many others over the years for input and patches.
@@ -35,3 +41,4 @@ With http2.d, use
 	Uri("http://whatever_host/path?args").viaUnixSocket("/path/here")
 
 any time you are constructing a client. Note that `navigateTo` may lose the unix socket unless you specify it again.
+
diff --git a/cgi.d b/cgi.d
index c58be27..551cf58 100644
--- a/cgi.d
+++ b/cgi.d
@@ -4178,6 +4178,9 @@ void doThreadScgiConnection(CustomCgi, alias fun, long maxContentLength)(Socket
 		if(!handleException(cgi, t)) {
 			connection.close();
 			return;
+		} else {
+			connection.close();
+			return;
 		}
 	}
 }
diff --git a/http2.d b/http2.d
index 31e3414..bad2a68 100644
--- a/http2.d
+++ b/http2.d
@@ -3,6 +3,7 @@
 // FIXME: eaders are supposed to be case insensitive. ugh.
 
 // FIXME: need timeout controls
+// FIXME: 100 continue. tho we never Expect it so should never happen, never kno,
 
 /++
 	This is version 2 of my http/1.1 client implementation.
@@ -1508,13 +1509,20 @@ enum HttpVerb {
 /**
 	Usage:
 
+	---
 	auto client = new HttpClient("localhost", 80);
 	// relative links work based on the current url
-	client.get("foo/bar");
-	client.get("baz"); // gets foo/baz
+	HttpRequest request = client.get("foo/bar");
+	request = client.get("baz"); // gets foo/baz
 
-	auto request = client.get("rofl");
-	auto response = request.waitForCompletion();
+	// requests are not sent until you tell them to;
+	// they are just objects representing potential.
+	// to realize it and fetch the response, use waitForCompletion:
+
+	HttpResponse response = request.waitForCompletion();
+
+	// now you can use response.headers, response.contentText, etc
+	---
 */
 
 /// HttpClient keeps cookies, location, and some other state to reuse connections, when possible, like a web browser.
diff --git a/simpledisplay.d b/simpledisplay.d
index a29bf40..4b2a3c0 100644
--- a/simpledisplay.d
+++ b/simpledisplay.d
@@ -6946,7 +6946,7 @@ class OperatingSystemFont {
 		}
 
 		if(!XftLibrary.loadSuccessful)
-			return loadCoreX(name, size, weight, italic);
+			return false;
 
 		auto display = XDisplayConnection.get;
 
@@ -7070,13 +7070,19 @@ class OperatingSystemFont {
 	/++
 		`name` is a font name, but it can also be a more complicated string parsed in an OS-specific way.
 
-		On X, you may prefix a name with `core:` to bypass the freetype engine and call [loadCoreX]. Otherwise,
-		it calls [loadXft] if the library is available. If the library is not available, it falls back on [loadCoreX].
+		On X, you may prefix a name with `core:` to bypass the freetype engine causing this function to forward to [loadCoreX]. Otherwise,
+		it calls [loadXft] if the library is available. If the library or font is not available on Xft, it falls back on [loadCoreX].
 
 		On Windows, it forwards directly to [loadWin32].
 
+		Params:
+			name = font name. This is looked up by the operating system and may be interpreted differently across platforms or user machines and their preferences.
+			size = font size. This may be interpreted differently by different systems and different fonts. Size 0 means load a default, which may not exist and cause [isNull] to become true.
+			weight = approximate boldness, results may vary.
+			italic = try to get a slanted version of the given font.
+
 		History:
-			Xft support was added on November 13, 2020. It would only load core fonts.
+			Xft support was added on November 13, 2020. It would only load core fonts. Xft inclusion changed font lookup and interpretation of the `size` parameter, requiring a major version bump. This caused release v9.0.
 	+/
 	bool load(string name, int size = 0, FontWeight weight = FontWeight.dontcare, bool italic = false) {
 		version(X11) {
@@ -7085,7 +7091,10 @@ class OperatingSystemFont {
 					goto core;
 				}
 
-				return loadXft(name, size, weight, italic);
+				if(loadXft(name, size, weight, italic))
+					return true;
+				// if xft fails, fallback to core to avoid breaking
+				// code that already depended on this.
 			}
 
 			core: