Skip to content

Fix Japanese/etc fonts not rendering on linux #5992

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

Closed
nibbbl wants to merge 1 commit into from
+50 −3
Closed

Fix Japanese/etc fonts not rendering on linux #5992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 50 additions & 3 deletions indra/llwindow/llwindowsdl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
#include <glib.h>
#endif

#include <algorithm>

extern "C" {
# include "fontconfig/fontconfig.h"
}
Expand Down Expand Up @@ -1934,6 +1936,44 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
return rtns;
}

// Ask FontConfig directly for common living scripts first, so they aren't
// crowded out of max_font_count_cutoff by other fonts.
static const char* const important_langs[] = {

@nibbbl nibbbl Jul 12, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This list is non-exhaustive and best effort. A handful of other languages are candidates for inclusion: he, ar, bn, etc.

"ja", "zh-cn", "zh-tw", "ko", // CJK / Korean
"th", "hi", "ta", "te", "kn", "ml", "gu", "pa", // South/Southeast Asian
"km", "lo", "my", "si", // Southeast Asian
"ka", "am", // Georgian, Ethiopic
};
for (const char* lang : important_langs)
{
std::string lang_pattern = "slant=0:index=0:weight=80:spacing=0:lang=" + std::string(lang);
FcPattern *lang_pat = FcNameParse((FcChar8*) lang_pattern.c_str());
if (!lang_pat)
{
continue;
}
FcConfigSubstitute(nullptr, lang_pat, FcMatchPattern);
FcDefaultSubstitute(lang_pat);
FcResult lang_result;
FcPattern *match = FcFontMatch(nullptr, lang_pat, &lang_result);
FcPatternDestroy(lang_pat);
if (match)
{
FcChar8 *filename;
if (FcResultMatch == FcPatternGetString(match, FC_FILE, 0, &filename) && filename)
{
std::string path((const char*)filename);
if (std::find(rtns.begin(), rtns.end(), path) == rtns.end())
{
LL_DEBUGS() << "Guaranteed fallback for lang '" << lang << "': " << path << LL_ENDL;
rtns.push_back(path);
}
}
FcPatternDestroy(match);
}
}
const size_t guaranteed_font_count = rtns.size();

sortpat = FcNameParse((FcChar8*) sort_order.c_str());
if (sortpat)
{
Expand All @@ -1949,13 +1989,18 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
// Get the full pathnames to the fonts, where available,
// which is what we really want.
found_font_count = fs->nfont;
size_t general_count = 0;
for (int i=0; i<fs->nfont; ++i)
{
FcChar8 *filename;
if (FcResultMatch == FcPatternGetString(fs->fonts[i], FC_FILE, 0, &filename) && filename)
{
rtns.push_back(std::string((const char*)filename));
if (rtns.size() >= max_font_count_cutoff)
std::string path((const char*)filename);
if (std::find(rtns.begin(), rtns.end(), path) != rtns.end())
continue; // already guaranteed above, don't load it twice

rtns.push_back(path);
if (++general_count >= max_font_count_cutoff)
break; // hit limit
}
}
Expand All @@ -1968,7 +2013,9 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
LL_DEBUGS() << " file: " << *it << LL_ENDL;
}

LL_INFOS() << "Using " << rtns.size() << "/" << found_font_count << " system fonts." << LL_ENDL;
LL_INFOS() << "Using " << rtns.size() << " system fonts (" << guaranteed_font_count
<< " guaranteed script matches + " << (rtns.size() - guaranteed_font_count)
<< "/" << found_font_count << " from general scan)." << LL_ENDL;

rtns.push_back(final_fallback);
#endif
Expand Down
Loading