mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: [Win32] Font detection didn't work for locales not supporting code pages (#13306)

pull/13311/head
Loïc Guilloux 2025-01-12 17:23:41 +01:00 committed by GitHub
parent 11529d865b
commit 4670a62342
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/os/windows/font_win32.cpp
View File

@ -64,7 +64,18 @@ static int CALLBACK EnumFontCallback(const ENUMLOGFONTEX *logfont, const NEWTEXT
if (info->callback->Monospace() && (logfont->elfLogFont.lfPitchAndFamily & (FF_MODERN | FIXED_PITCH)) != (FF_MODERN | FIXED_PITCH)) return 1; if (info->callback->Monospace() && (logfont->elfLogFont.lfPitchAndFamily & (FF_MODERN | FIXED_PITCH)) != (FF_MODERN | FIXED_PITCH)) return 1;
/* The font has to have at least one of the supported locales to be usable. */ /* The font has to have at least one of the supported locales to be usable. */
if ((metric->ntmFontSig.fsCsb[0] & info->locale.lsCsbSupported[0]) == 0 && (metric->ntmFontSig.fsCsb[1] & info->locale.lsCsbSupported[1]) == 0) return 1; auto check_bitfields = [&]() {
/* First try Unicode Subset Bitfield. */
for (uint8_t i = 0; i < 4; i++) {
if ((metric->ntmFontSig.fsUsb[i] & info->locale.lsUsb[i]) != 0) return true;
}
/* Keep Code Page Bitfield as a fallback. */
for (uint8_t i = 0; i < 2; i++) {
if ((metric->ntmFontSig.fsCsb[i] & info->locale.lsCsbSupported[i]) != 0) return true;
}
return false;
};
if (!check_bitfields()) return 1;
char font_name[MAX_PATH]; char font_name[MAX_PATH];
convert_from_fs(logfont->elfFullName, font_name); convert_from_fs(logfont->elfFullName, font_name);