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 #1808

Closed
wants to merge 3 commits into from
+12 −12
Closed

Fontconfig windows workaround #1808

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
505e6ca
Original workaround fontconfig init for windows.
saurtron Dec 11, 2024
8154021
Remove extra load fonts.
saurtron Dec 11, 2024
1489f8f
Load right var.
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
24 changes: 12 additions & 12 deletions rts/Rendering/Fonts/CFontTexture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,28 +146,27 @@ class FtLibraryHandler {
FcConfigEnableHome(FcFalse);
config = FcConfigCreate();

#ifdef _WIN32
std::array<char, 4096> osFontsDir;
ExpandEnvironmentStrings("%WINDIR%\\fonts", osFontsDir.data(), osFontsDir.size()); // expands %HOME% etc.
static constexpr const char* configFmt = R"(<fontconfig><dir>%s</dir><cachedir>fontcache</cachedir></fontconfig>)";
std::string configFmtVar = fmt::sprintf(configFmt, osFontsDir.data());

FcConfigParseAndLoadFromMemory(config, reinterpret_cast<const FcChar8*>(configFmtVar.c_str()), FcTrue);

FcConfigBuildFonts(config);
#else

// we cant directly use the usual fontconfig methods because those won't let us have both first our cache
// 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>)";
#else
static constexpr const char* configFmt = 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);
#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);
#endif

LOG_MSG("[%s] Using Fontconfig light init", false, __func__);

Expand Down Expand Up @@ -196,6 +195,7 @@ class FtLibraryHandler {
LOG_MSG("%s config and fonts. No system fallbacks will be available", false, errprefix.c_str());
}
}
#endif

// init app fonts dir
res = FcConfigAppFontAddDir(config, reinterpret_cast<const FcChar8*>("fonts"));
Expand Down