Skip to content

fix(fonts): add unicode fallback for cyrillic #145

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

Open
fbraz3 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

fix(fonts): add unicode fallback for cyrillic #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d8fd346
fix(fonts): add unicode fallback for cyrillic
fbraz3 May 20, 2026
3a28555
fix(localization): add csf label fallback
fbraz3 May 22, 2026
d7c9c74
Merge remote-tracking branch 'origin/main' into fix/issue-144-macos-c…
Copilot May 23, 2026
6b1c77e
fix(localization): harden drawable caption fallback
fbraz3 May 24, 2026
da62685
Merge remote-tracking branch 'origin/main' into fix/issue-144-macos-c…
Copilot May 27, 2026
9df81a3
fix(issue-144): add stderr diagnostics traces
fbraz3 May 27, 2026
38f0e49
fix(language-ini): implement fallback chain to restore Cyrillic font …
fbraz3 May 27, 2026
15e669d
fix(macos-fontconfig): prefer system Arial fallback
fbraz3 May 29, 2026
8de42b1
fix(fonts): break circular unicode fallback\n\nPrevent AlternateUnico…
fbraz3 May 30, 2026
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
112 changes: 92 additions & 20 deletions Core/GameEngine/Source/GameClient/GameText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ class GameTextManager : public GameTextInterface

StringInfo *m_stringInfo;
StringLookUp *m_stringLUT;
StringInfo *m_fallbackStringInfo;
StringLookUp *m_fallbackStringLUT;
Int m_fallbackTextCount;
Bool m_initialized;
#if defined(RTS_DEBUG)
Bool m_jabberWockie;
Expand All @@ -191,8 +194,8 @@ class GameTextManager : public GameTextInterface
void reverseWord ( Char *file, Char *lp );
void translateCopy( WideChar *outbuf, Char *inbuf );
Bool getStringCount( const Char *filename, Int& textCount );
Bool getCSFInfo ( const Char *filename );
Bool parseCSF( const Char *filename );
Bool getCSFInfo ( const Char *filename, Int& textCount, LanguageID& language, FileInstance instance = 0 );
Bool parseCSF( const Char *filename, StringInfo *stringInfo, Int textCount, Int& maxLabelLen, FileInstance instance = 0 );
Bool parseStringFile( const char *filename );
Bool parseMapStringFile( const char *filename );
Bool readLine( char *buffer, Int max, File *file );
Expand Down Expand Up @@ -247,6 +250,9 @@ GameTextManager::GameTextManager()
m_maxLabelLen(0),
m_stringInfo(nullptr),
m_stringLUT(nullptr),
m_fallbackStringInfo(nullptr),
m_fallbackStringLUT(nullptr),
m_fallbackTextCount(0),
m_initialized(FALSE),
m_noStringList(nullptr),
#if defined(RTS_DEBUG)
Expand Down Expand Up @@ -313,7 +319,7 @@ void GameTextManager::init()
{
format = STRING_FILE;
}
else if ( getCSFInfo ( csfFile.str() ) )
else if ( getCSFInfo ( csfFile.str(), m_textCount, m_language ) )
{
fprintf(stderr, "[CSF] init() - getCSFInfo OK, textCount=%d\n", m_textCount);
format = CSF_FILE;
Expand Down Expand Up @@ -350,7 +356,7 @@ void GameTextManager::init()
else
{
fprintf(stderr, "[CSF] init() - Calling parseCSF()...\n");
if ( !parseCSF ( csfFile.str() ) )
if ( !parseCSF ( csfFile.str(), m_stringInfo, m_textCount, m_maxLabelLen ) )
{
fprintf(stderr, "[CSF] init() - parseCSF FAILED\n");
deinit();
Expand All @@ -374,6 +380,59 @@ void GameTextManager::init()

qsort( m_stringLUT, m_textCount, sizeof(StringLookUp), compareLUT );

// GeneralsX @bugfix BenderAI 22/05/2026 Load fallback CSF instance when a mod provides an incomplete table.
if ( format == CSF_FILE )
{
Int fallbackCount = 0;
LanguageID originalLanguage = m_language;

if ( getCSFInfo(csfFile.str(), fallbackCount, m_language, 1) && fallbackCount > 0 )
{
m_fallbackStringInfo = NEW StringInfo[fallbackCount];

if ( m_fallbackStringInfo != nullptr )
{
Int fallbackMaxLabelLen = m_maxLabelLen;
if ( parseCSF(csfFile.str(), m_fallbackStringInfo, fallbackCount, fallbackMaxLabelLen, 1) )
{
m_fallbackTextCount = fallbackCount;
m_maxLabelLen = max(m_maxLabelLen, fallbackMaxLabelLen);

m_fallbackStringLUT = NEW StringLookUp[m_fallbackTextCount];

if ( m_fallbackStringLUT != nullptr )
{
StringLookUp *fallbackLut = m_fallbackStringLUT;
StringInfo *fallbackInfo = m_fallbackStringInfo;

for ( Int i = 0; i < m_fallbackTextCount; i++ )
{
fallbackLut->info = fallbackInfo;
fallbackLut->label = &fallbackInfo->label;
fallbackLut++;
fallbackInfo++;
}

qsort( m_fallbackStringLUT, m_fallbackTextCount, sizeof(StringLookUp), compareLUT );
}
else
{
delete [] m_fallbackStringInfo;
m_fallbackStringInfo = nullptr;
m_fallbackTextCount = 0;
}
}
else
{
delete [] m_fallbackStringInfo;
m_fallbackStringInfo = nullptr;
}
}
}

m_language = originalLanguage;
}

}

//============================================================================
Expand All @@ -389,7 +448,14 @@ void GameTextManager::deinit()
delete [] m_stringLUT;
m_stringLUT = nullptr;

delete [] m_fallbackStringInfo;
m_fallbackStringInfo = nullptr;

delete [] m_fallbackStringLUT;
m_fallbackStringLUT = nullptr;

m_textCount = 0;
m_fallbackTextCount = 0;

NoString *noString = m_noStringList;

Expand Down Expand Up @@ -848,11 +914,11 @@ Bool GameTextManager::getStringCount( const char *filename, Int& textCount )
// GameTextManager::getCSFInfo
//============================================================================

Bool GameTextManager::getCSFInfo ( const Char *filename )
Bool GameTextManager::getCSFInfo ( const Char *filename, Int& textCount, LanguageID& language, FileInstance instance )
{
CSFHeader header;
Int ok = FALSE;
File *file = TheFileSystem->openFile(filename, File::READ | File::BINARY);
File *file = TheFileSystem->openFile(filename, File::READ | File::BINARY, File::BUFFERSIZE, instance);
DEBUG_LOG(("Looking in %s for compiled string file", filename));

if ( file != nullptr )
Expand All @@ -861,15 +927,15 @@ Bool GameTextManager::getCSFInfo ( const Char *filename )
{
if ( header.id == CSF_ID )
{
m_textCount = header.num_labels;
textCount = header.num_labels;

if ( header.version >= 2 )
{
m_language = (LanguageID) header.langid;
language = (LanguageID) header.langid;
}
else
{
m_language = LANGUAGE_ID_US;
language = LANGUAGE_ID_US;
}

ok = TRUE;
Expand All @@ -887,7 +953,7 @@ Bool GameTextManager::getCSFInfo ( const Char *filename )
// GameTextManager::parseCSF
//============================================================================

Bool GameTextManager::parseCSF( const Char *filename )
Bool GameTextManager::parseCSF( const Char *filename, StringInfo *stringInfo, Int textCount, Int& maxLabelLen, FileInstance instance )
{
File *file;
Int id;
Expand All @@ -899,7 +965,7 @@ Bool GameTextManager::parseCSF( const Char *filename )
// GeneralsX @bugfix BenderAI 16/02/2026 - Debug parseCSF
fprintf(stderr, "[CSF] parseCSF() - START filename='%s'\n", filename);

file = TheFileSystem->openFile(filename, File::READ | File::BINARY);
file = TheFileSystem->openFile(filename, File::READ | File::BINARY, File::BUFFERSIZE, instance);

if ( file == nullptr )
{
Expand All @@ -926,7 +992,7 @@ Bool GameTextManager::parseCSF( const Char *filename )
file->seek(header.skip, File::CURRENT);
}

fprintf(stderr, "[CSF] parseCSF() - Starting main loop (textCount=%d)...\n", m_textCount);
fprintf(stderr, "[CSF] parseCSF() - Starting main loop (textCount=%d)...\n", textCount);

while( file->read ( &id, sizeof (id)) == sizeof ( id) )
{
Expand All @@ -950,12 +1016,12 @@ Bool GameTextManager::parseCSF( const Char *filename )

m_buffer[len] = 0;

m_stringInfo[listCount].label = m_buffer;
stringInfo[listCount].label = m_buffer;


if ( len > m_maxLabelLen )
if ( len > maxLabelLen )
{
m_maxLabelLen = len;
maxLabelLen = len;
}

num = 0;
Expand Down Expand Up @@ -1013,7 +1079,7 @@ Bool GameTextManager::parseCSF( const Char *filename )
}

stripSpaces ( m_tbuffer );
m_stringInfo[listCount].text = m_tbuffer;
stringInfo[listCount].text = m_tbuffer;
}

if ( id == CSF_STRINGWITHWAVE )
Expand All @@ -1028,7 +1094,7 @@ Bool GameTextManager::parseCSF( const Char *filename )
if ( num == 0 && len )
{
// only use the first string found
m_stringInfo[listCount].speech = m_buffer;
stringInfo[listCount].speech = m_buffer;
}

}
Expand All @@ -1040,17 +1106,17 @@ Bool GameTextManager::parseCSF( const Char *filename )

// GeneralsX @bugfix BenderAI 17/02/2026 Progress logging every 500 labels
if (listCount % 500 == 0) {
fprintf(stderr, "[CSF] parseCSF() - Progress: %d/%d labels processed\n", listCount, m_textCount);
fprintf(stderr, "[CSF] parseCSF() - Progress: %d/%d labels processed\n", listCount, textCount);
}
}

fprintf(stderr, "[CSF] parseCSF() - Main loop complete! Processed %d/%d labels\n", listCount, m_textCount);
fprintf(stderr, "[CSF] parseCSF() - Main loop complete! Processed %d/%d labels\n", listCount, textCount);
ok = TRUE;

quit:

fprintf(stderr, "[CSF] parseCSF() - Reached quit label: ok=%s, listCount=%d/%d\n",
ok ? "TRUE" : "FALSE", listCount, m_textCount);
ok ? "TRUE" : "FALSE", listCount, textCount);

file->close();
file = nullptr;
Expand Down Expand Up @@ -1324,6 +1390,12 @@ UnicodeString GameTextManager::fetch( const Char *label, Bool *exists )
lookUp = (StringLookUp *) bsearch( &key, (void*) m_mapStringLUT, m_mapTextCount, sizeof(StringLookUp), compareLUT );
}

// GeneralsX @bugfix BenderAI 22/05/2026 Fallback to lower-priority CSF when override tables are incomplete.
if ( lookUp == nullptr && m_fallbackStringLUT && m_fallbackTextCount )
{
lookUp = (StringLookUp *) bsearch( &key, (void*) m_fallbackStringLUT, m_fallbackTextCount, sizeof(StringLookUp), compareLUT );
}

if( lookUp == nullptr )
{

Expand Down
50 changes: 49 additions & 1 deletion Core/GameEngine/Source/GameClient/GlobalLanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
//-----------------------------------------------------------------------------
#include "PreRTS.h"

#include <stdio.h>

#include "Common/AddonCompat.h"
#include "Common/INI.h"
#include "Common/Registry.h"
Expand Down Expand Up @@ -148,12 +150,48 @@ GlobalLanguage::~GlobalLanguage()

void GlobalLanguage::init()
{
// GeneralsX @bugfix GitHubCopilot 27/05/2026 Implement Language.ini fallback chain so stock values fill missing override keys.
char log_buffer[512];
{
AsciiString registryLanguage = GetRegistryLanguage();
AsciiString fname;
fname.format("Data\\%s\\Language", GetRegistryLanguage().str());
fname.format("Data\\%s\\Language", registryLanguage.str());

sprintf(log_buffer,
"[GX-ISSUE144] GlobalLanguage init registryLanguage=%s primaryIni=%s",
registryLanguage.str(),
fname.str());
fprintf(stderr, "%s\n", log_buffer);

INI ini;
ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, nullptr );
sprintf(log_buffer,
"[GX-ISSUE144] GlobalLanguage init loaded primary unicodeFont=%s",
m_unicodeFontName.isNotEmpty() ? m_unicodeFontName.str() : "<empty>");
fprintf(stderr, "%s\n", log_buffer);

// Load stock Language.ini as fallback for missing keys (e.g., russifier may override UnicodeFontName=Arial,
// so we load stock English to restore Arial Unicode MS if not redefined)
if (registryLanguage.compare("English") != 0)
{
AsciiString stockFname("Data\\English\\Language");
sprintf(log_buffer,
"[GX-ISSUE144] GlobalLanguage init loading stock fallback=%s",
stockFname.str());
fprintf(stderr, "%s\n", log_buffer);
ini.loadFileDirectory( stockFname, INI_LOAD_MULTIFILE, nullptr );
sprintf(log_buffer,
"[GX-ISSUE144] GlobalLanguage init fallback merged unicodeFont=%s (may have been filled)",
m_unicodeFontName.isNotEmpty() ? m_unicodeFontName.str() : "<empty>");
fprintf(stderr, "%s\n", log_buffer);
}

sprintf(log_buffer,
"[GX-ISSUE144] GlobalLanguage init final unicodeFont=%s drawableCaption=%s defaultWindow=%s",
m_unicodeFontName.isNotEmpty() ? m_unicodeFontName.str() : "<empty>",
m_drawableCaptionFont.name.isNotEmpty() ? m_drawableCaptionFont.name.str() : "<empty>",
m_defaultWindowFont.name.isNotEmpty() ? m_defaultWindowFont.name.str() : "<empty>");
fprintf(stderr, "%s\n", log_buffer);
}

StringList::iterator it = m_localFonts.begin();
Expand All @@ -162,10 +200,14 @@ void GlobalLanguage::init()
AsciiString font = *it;
if(AddFontResource(font.str()) == 0)
{
sprintf(log_buffer, "[GX-ISSUE144] GlobalLanguage local font add FAILED file=%s", font.str());
fprintf(stderr, "%s\n", log_buffer);
DEBUG_CRASH(("GlobalLanguage::init Failed to add font %s", font.str()));
}
else
{
sprintf(log_buffer, "[GX-ISSUE144] GlobalLanguage local font add OK file=%s", font.str());
fprintf(stderr, "%s\n", log_buffer);
//SendMessage( HWND_BROADCAST, WM_FONTCHANGE, 0, 0);
}
++it;
Expand All @@ -174,6 +216,12 @@ void GlobalLanguage::init()
// override values with user preferences
OptionPreferences optionPref;
m_userResolutionFontSizeAdjustment = optionPref.getResolutionFontAdjustment();
sprintf(log_buffer,
"[GX-ISSUE144] GlobalLanguage resolutionAdjustment effective=%.3f user=%.3f base=%.3f",
getResolutionFontSizeAdjustment(),
m_userResolutionFontSizeAdjustment,
m_resolutionFontSizeAdjustment);
fprintf(stderr, "%s\n", log_buffer);
}

void GlobalLanguage::reset()
Expand Down
Loading
Loading