Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fontconfig windows workaround v2 #1809

Merged
merged 5 commits into from
Dec 11, 2024
Merged

Fontconfig windows workaround v2 #1809

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4cd96ed
Custom xml for windows since mingw doesn't work with the fontconfig
saurtron Dec 11, 2024
2e6f6aa
Compatible formatVar for linux so we can use the same syntax everywhere.
saurtron Dec 11, 2024
23b27ff
Initialize configFmtVar directly and remove obsolete comment.
saurtron Dec 11, 2024
dab42a1
get proper size for osFontsDir
saurtron Dec 11, 2024
279db2c
Make configFmtVar const and add extra empty line.
saurtron Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions rts/Rendering/Fonts/CFontTexture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,23 +150,28 @@ class FtLibraryHandler {
// and system fonts included. also linux actually has system config files that can be used by fontconfig.

#ifdef _WIN32
// fontconfig will resolve the special keys here.
static constexpr const char* configFmt = R"(<fontconfig><dir>WINDOWSFONTDIR</dir><cachedir>fontcache</cachedir><cachedir>LOCAL_APPDATA_FONTCONFIG_CACHE</cachedir></fontconfig>)";
static constexpr auto winFontPath = "%WINDIR%\\fonts";
const int neededSize = ExpandEnvironmentStrings(winFontPath, nullptr, 0);
std::vector <char> osFontsDir (neededSize);
ExpandEnvironmentStrings(winFontPath, osFontsDir.data(), osFontsDir.size());

static constexpr const char* configFmt = R"(<fontconfig><dir>%s</dir><cachedir>fontcache</cachedir></fontconfig>)";
const std::string configFmtVar = fmt::sprintf(configFmt, osFontsDir.data());
#else
static constexpr const char* configFmt = R"(<fontconfig><cachedir>fontcache</cachedir></fontconfig>)";
const std::string configFmtVar = R"(<fontconfig><cachedir>fontcache</cachedir></fontconfig>)";
#endif

#ifdef _WIN32
// Explicitly set the config with xml for windows.
res = FcConfigParseAndLoadFromMemory(config, reinterpret_cast<const FcChar8*>(configFmt), FcTrue);
res = FcConfigParseAndLoadFromMemory(config, reinterpret_cast<const FcChar8*>(configFmtVar.c_str()), FcTrue);
#else
// Load system configuration (passing 0 here so fc will use the default os config file if possible).
res = FcConfigParseAndLoad(config, 0, true);
#endif
if (res) {
#ifndef _WIN32
// add local cache after system config for linux
FcConfigParseAndLoadFromMemory(config, reinterpret_cast<const FcChar8*>(configFmt), FcTrue);
FcConfigParseAndLoadFromMemory(config, reinterpret_cast<const FcChar8*>(configFmtVar.c_str()), FcTrue);
#endif

LOG_MSG("[%s] Using Fontconfig light init", false, __func__);
Expand All @@ -191,7 +196,7 @@ class FtLibraryHandler {
config = fcConfig;

// add our cache at the back of the new config.
FcConfigParseAndLoadFromMemory(config, reinterpret_cast<const FcChar8*>(configFmt), FcTrue);
FcConfigParseAndLoadFromMemory(config, reinterpret_cast<const FcChar8*>(configFmtVar.c_str()), FcTrue);
} else {
LOG_MSG("%s config and fonts. No system fallbacks will be available", false, errprefix.c_str());
}
Expand Down