cpp/openttd-patchpack/source Changeset - r27482:151ee53cd970

Changeset - r27482:151ee53cd970

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Patric Stout - 14 months ago 2023-06-03 19:09:02
truebrain@openttd.org

Fix: Wayland crash on startup due to Pango also using FontConfig (#10916)

Basically, we haven't been a good neighbour. Turns out you shouldn't
actually call FcFini when you are done, as some library might still
want to use FontConfig. And they use a shared instance for their
administration.

The idea is that you call FcInit once, and use FcConfigReference
after that to get an instance, you can release. This entry is
ref-counted, and things happen automatically based on that.

At least, I think.

1 file changed with 58 insertions and 51 deletions:

src/os/unix/font_unix.cpp

0 comments (0 inline, 0 general)

src/os/unix/font_unix.cpp

➞

Show inline comments

@@ @@ -31,64 +31,68 @@ FT_Error GetFontByFaceName(const char *f @@
 	if (!FcInit()) {
 		ShowInfo("Unable to load font configuration");
 	} else {
 		FcPattern *match;
 		FcPattern *pat;
 		FcFontSet *fs;
 		FcResult  result;
 		char *font_style;
 		char *font_family;
 		return err;
+	}
 	auto fc_instance = FcConfigReference(nullptr);
 	assert(fc_instance != nullptr);
 		/* Split & strip the font's style */
 		font_family = stredup(font_name);
 		font_style = strchr(font_family, ',');
 		if (font_style != nullptr) {
 			font_style[0] = '\0';
 			font_style++;
 			while (*font_style == ' ' || *font_style == '\t') font_style++;
+		}
 	FcPattern *match;
 	FcPattern *pat;
 	FcFontSet *fs;
 	FcResult  result;
 	char *font_style;
 	char *font_family;
 		/* Resolve the name and populate the information structure */
 		pat = FcNameParse((FcChar8 *)font_family);
 		if (font_style != nullptr) FcPatternAddString(pat, FC_STYLE, (FcChar8 *)font_style);
 		FcConfigSubstitute(nullptr, pat, FcMatchPattern);
 		FcDefaultSubstitute(pat);
 		fs = FcFontSetCreate();
 		match = FcFontMatch(nullptr, pat, &result);
 	/* Split & strip the font's style */
 	font_family = stredup(font_name);
 	font_style = strchr(font_family, ',');
 	if (font_style != nullptr) {
 		font_style[0] = '\0';
 		font_style++;
 		while (*font_style == ' ' || *font_style == '\t') font_style++;
+	}
 		if (fs != nullptr && match != nullptr) {
 			int i;
 			FcChar8 *family;
 			FcChar8 *style;
 			FcChar8 *file;
 			int32_t index;
 			FcFontSetAdd(fs, match);
 	/* Resolve the name and populate the information structure */
 	pat = FcNameParse((FcChar8 *)font_family);
 	if (font_style != nullptr) FcPatternAddString(pat, FC_STYLE, (FcChar8 *)font_style);
 	FcConfigSubstitute(nullptr, pat, FcMatchPattern);
 	FcDefaultSubstitute(pat);
 	fs = FcFontSetCreate();
 	match = FcFontMatch(nullptr, pat, &result);
 	if (fs != nullptr && match != nullptr) {
 		int i;
 		FcChar8 *family;
 		FcChar8 *style;
 		FcChar8 *file;
 		int32_t index;
 		FcFontSetAdd(fs, match);
 			for (i = 0; err != FT_Err_Ok && i < fs->nfont; i++) {
 				/* Try the new filename */
 				if (FcPatternGetString(fs->fonts[i], FC_FILE, 0, &file) == FcResultMatch &&
 					FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch &&
 					FcPatternGetString(fs->fonts[i], FC_STYLE, 0, &style) == FcResultMatch &&
 					FcPatternGetInteger(fs->fonts[i], FC_INDEX, 0, &index) == FcResultMatch) {
 		for (i = 0; err != FT_Err_Ok && i < fs->nfont; i++) {
 			/* Try the new filename */
 			if (FcPatternGetString(fs->fonts[i], FC_FILE, 0, &file) == FcResultMatch &&
 				FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch &&
 				FcPatternGetString(fs->fonts[i], FC_STYLE, 0, &style) == FcResultMatch &&
 				FcPatternGetInteger(fs->fonts[i], FC_INDEX, 0, &index) == FcResultMatch) {
 					/* The correct style? */
 					if (font_style != nullptr && !StrEqualsIgnoreCase(font_style, (char *)style)) continue;
 				/* The correct style? */
 				if (font_style != nullptr && !StrEqualsIgnoreCase(font_style, (char *)style)) continue;
 					/* Font config takes the best shot, which, if the family name is spelled
 					 * wrongly a 'random' font, so check whether the family name is the
 					 * same as the supplied name */
 					if (StrEqualsIgnoreCase(font_family, (char *)family)) {
 						err = FT_New_Face(_library, (char *)file, index, face);
+					}
 				/* Font config takes the best shot, which, if the family name is spelled
 					* wrongly a 'random' font, so check whether the family name is the
 					* same as the supplied name */
 				if (StrEqualsIgnoreCase(font_family, (char *)family)) {
 					err = FT_New_Face(_library, (char *)file, index, face);
+				}
+			}
+		}
+	}
 		free(font_family);
 		FcPatternDestroy(pat);
 		FcFontSetDestroy(fs);
 		FcFini();
+	}
 	free(font_family);
 	FcPatternDestroy(pat);
 	FcFontSetDestroy(fs);
 	FcConfigDestroy(fc_instance);
 	return err;
+}
@@ @@ -98,9 +102,12 @@ FT_Error GetFontByFaceName(const char *f @@
 bool SetFallbackFont(FontCacheSettings *settings, const char *language_isocode, int winlangid, MissingGlyphSearcher *callback)
+{
-	if (!FcInit()) return false;
+	bool ret = false;
 	bool ret = false;
 	if (!FcInit()) return ret;
 	auto fc_instance = FcConfigReference(nullptr);
 	assert(fc_instance != nullptr);
 	/* Fontconfig doesn't handle full language isocodes, only the part
 	 * before the _ of e.g. en_GB is used, so "remove" everything after
@@ @@ -168,6 +175,6 @@ bool SetFallbackFont(FontCacheSettings * @@
 		FcFontSetDestroy(fs);
+	}
-	FcFini();
+	FcConfigDestroy(fc_instance);
 	return ret;
+}

0 comments (0 inline, 0 general)