mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-30 07:29:54 +00:00
Code Issues Releases Wiki Activity

fixed FONTCONFIG compilation

Browse Source
This commit is contained in:
Zeno Rogue 2024-11-03 21:35:05 +01:00
parent d6ec3b1fcc
commit bd9e0a7469
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
basegraph.cpp
View File

@ -250,10 +250,26 @@ EX int font_id = 0;
#ifdef FONTCONFIG #ifdef FONTCONFIG
TTF_Font* findfont(int siz) { TTF_Font* findfont(int siz) {
auto orig = cfont->filename;
FcPattern *pat; FcPattern *pat;
FcResult result; FcResult result;
if (!FcInit()) return nullptr; if (!FcInit()) return nullptr;
pat = FcNameParse((FcChar8 *)cfont->filename.c_str());
string s =cfont->filename;
auto rep = [&] (string what, string by) {
int pos = s.size() - what.size();
if(pos < 0) return;
if(s.substr(pos) == what) s = s.substr(0, pos) + by;
};
rep(".ttf", "");
rep(".otf", "");
rep(".TTF", "");
rep(".OTF", "");
rep("-Bold", ":weight=bold");
rep("-Regular", ":weight=regular");
pat = FcNameParse((FcChar8 *)s.c_str());
FcConfigSubstitute(0, pat, FcMatchPattern); FcConfigSubstitute(0, pat, FcMatchPattern);
FcDefaultSubstitute(pat); FcDefaultSubstitute(pat);
@ -270,7 +286,7 @@ TTF_Font* findfont(int siz) {
FcFini(); FcFini();
cfont->use_fontconfig = false; cfont->use_fontconfig = false;
if(debugflags & DF_INIT) println(hlog, "fontpath is: ", cfont->filename); if(debugflags & DF_INIT) println(hlog, "fontpath is: ", cfont->filename);
return TTF_OpenFont(cfont->filename, siz); return TTF_OpenFont(cfont->filename.c_str(), siz);
} }
#endif #endif
@ -282,7 +298,7 @@ void loadfont(int siz) {
#ifdef FONTCONFIG #ifdef FONTCONFIG
if(cf == NULL && cfont->use_fontconfig) if(cf == NULL && cfont->use_fontconfig)
cf = find_font_using_fontconfig(siz); cf = findfont(siz);
#endif #endif
if(cf == NULL) { if(cf == NULL) {