fix(issue-144): macOS Cyrillic text fix

[fbraz3]

Description

Clean re-application of the Issue #144 macOS Cyrillic text fix, started from a fresh main (a7279e6) and cherry-picking only the font/caption related commits. The previous branch fix/issue-144-macos-cyrillic-text had accumulated upstream sync, CI work, diagnostic instrumentation, and a critical Drawable::calcPhysicsXformWheels regression (broken roll clamp (unclampedRoll > 0.5f && unclampedRoll < -0.5f) + autolevel branch + wheel consolidation) that broke the macOS replay-CI CRC at frames 1700/6900.

Approach

• Branched from clean main (a7279e682).
• Cherry-picked 9 Issue macOS: Cyrillic text labels not rendered (numbers work, English labels work) #144 commits in dependency order (see commits).
• For commit 6b1c77e72 fix(localization): harden drawable caption fallback, manually extracted the safe font/caption work and dropped the physics changes from Drawable::calcPhysicsXformWheels (autolevel branch, broken roll clamp, wheel offset consolidation, commented-out roll-height block, cosmetic edits in drawEnthusiastic/drawBombed). Verified the resulting diff has zero matches for m_totalRoll|unclampedRoll|Autolevel|m_pitchRate|m_rollRate|m_wheelInfo|REAL_TO_INT|rasing up|calcPhysics.
• Used main's .github/ folder as-is, then applied the 3 echo "$OUTPUT" changes from 0bc3a40d0 feat(ci): show full debug (replaces filtered grep with full output for replay debugging).
• Skipped e38c00a2f perf(headless): skip drawable caption + alternate-unicode chain (locally verified: does not fix CRC, not the actual root cause).
• Skipped 15e669dcf fix(macos-fontconfig): prefer system Arial fallback (deploy-script only, not on the user's list).
• Skipped 5b8b43697 (blog) and 4e9387ae7 (branch analysis report) — both refer to the old branch structure.

Commits

• 4d7e6e841 fix(fonts): add unicode fallback for cyrillic
• 292bb8c51 fix(localization): add csf label fallback
• f28e9ef19 fix(localization): harden drawable caption fallback (cleaned: physics hunks removed)
• 00f0d56a7 fix(issue-144): add stderr diagnostics traces
• 45dd89b21 fix(language-ini): implement fallback chain to restore Cyrillic font descriptors (Issue macOS: Cyrillic text labels not rendered (numbers work, English labels work) #144)
• 6f4534f7a fix(fonts): break circular unicode fallback
• 68f79fd26 fix(unicode-format): allow Cyrillic in vswprintf on macOS
• 7f6cb7558 fix(unicode-format): make locale.h include portable for Linux
• 62b25e736 fix(language): only fall back to English when UnicodeFontName is missing
• 2e74fee81 feat(ci): show full debug

Diff size

• 12 code files (was 86 in the old branch)
• +795 / -62 lines of code (was +2338 / -1853 in the old branch)
• 0 physics-related changes (was 90 lines of physics in the old branch)

Local validation

• macos_2p_vanilla_map.rep — exit 0 (was CRC mismatch at frame 6900)
• macos_6p_custom_map.rep — exit 0 (was CRC mismatch at frame 1700)
• macos_2p_custom_map.rep — exit 0 (was already passing)

What was confirmed

• The vswprintf uselocale(newlocale(LC_CTYPE_MASK, "UTF-8", 0)) wrap is the root cause fix for the 3D construction caption Строительство: 57% not rendering on macOS.
• The font fallback chain (LoadUnicodeFallbackFont + circular fallback break) ensures the localized Arial resolves to a Unicode-capable font on macOS.
• The Drawable::calcPhysicsXformWheels change in 6b1c77e72 was the regression source for the replay CI CRC mismatch and has been removed.

Why not just fix the old branch?

The old branch had grown to 86 changed code files and 2,338 / 1,853 line changes, much of it upstream sync from thesuperhackers, CI infrastructure, and diagnostic instrumentation. A clean re-apply is simpler to review and bisect than surgical fixes on the old branch.

Related

• Fixes macOS: Cyrillic text labels not rendered (numbers work, English labels work) #144
• Supersedes fix/issue-144-macos-cyrillic-text branch

Game screenshot

[w1semannn]

Sorry for the late reply! Tested build from run 26990397402 — Cyrillic text is now rendering correctly ✅
One separate issue observed: tooltip text is clipped at the bottom — the tooltip box does not expand to fit the full description (see screenshot). This appears to be a UI layout issue, unrelated to the font fix.

[w1semannn]

Tooltip text clipping — root cause found
Confirmed Cyrillic rendering works ✅. The bottom clip is a separate pre-existing bug, but I tracked it down to the exact line.
In populateBuildTooltipLayout (both Generals/ and GeneralsMD/ copies of ControlBarPopupDescription.cpp), the height measurement for the description box does this:
cppoverrideTooltipGadgetFont(win); // sets Arial Unicode MS via GadgetStaticTextSetFont()
...
GameFont tooltipFont = win->winGetFont(); // ← still returns old Arial
tempDString->setFont(tooltipFont); // measurement uses wrong font
tempDString->getSize(&newSize.x, &newSize.y); // height underestimated
diffSize = newSize.y - size.y; // window not tall enough → clip
GadgetStaticTextSetFont updates the gadget's internal DisplayString but not the window's m_font pointer, so win->winGetFont() returns the old "Arial". The measurement underestimates height because Cyrillic in Arial Unicode MS uses different metrics than Latin Arial.
Minimal fix — change overrideTooltipGadgetFont from void to GameFont (return newFont on success, oldFont on failure), then in the description block replace:
cppoverrideTooltipGadgetFont(win);
...
GameFont *tooltipFont = win->winGetFont();
with:
cppGameFont *tooltipFont = overrideTooltipGadgetFont(win);
if (!tooltipFont) tooltipFont = win->winGetFont();
The temp DisplayString then measures with the exact same font the renderer uses → correct height → no clip. The other three call sites (Name, Cost gadgets) keep their existing void-call style unchanged.

[fbraz3]

I believe now the tooltip clipping issue was solved. Not perfectly aligned but is seems all text are now visible.

Can you please tes from 27107941094 and confirm? thanks!

EDIT: I'm trying to fix alignment in build 27109976197, but it I not tested it on my local computer yet.