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

(svn r21197) -Fix [FS#4001] (r17794): [OSX] Finding a fallback font failed when compiling for OSX 10.4 as it tried to match also OpenTTD-specific control characters

release/1.1
planetmaker 2010-11-15 08:31:07 +00:00
parent 89592772c3
commit b7d8001202
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/fontcache.cpp
View File

@ -46,6 +46,11 @@ static const byte SHADOW_COLOUR = 2;
* Get the font loaded into a Freetype face by using a font-name. * Get the font loaded into a Freetype face by using a font-name.
* If no appropiate font is found, the function returns an error * If no appropiate font is found, the function returns an error
*/ */
/* ========================================================================================
* Windows support
* ======================================================================================== */
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#include <shlobj.h> /* SHGetFolderPath */ #include <shlobj.h> /* SHGetFolderPath */
@ -371,7 +376,10 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
return ret == 0; return ret == 0;
} }
#elif defined(__APPLE__) #elif defined(__APPLE__) /* end ifdef Win32 */
/* ========================================================================================
* OSX support
* ======================================================================================== */
#include "os/macosx/macos.h" #include "os/macosx/macos.h"
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
@ -497,8 +505,15 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
* ATSUI was deprecated with 10.6 and is only partially available in * ATSUI was deprecated with 10.6 and is only partially available in
* 64-bit mode. */ * 64-bit mode. */
/* Remove all control characters in the range from SCC_CONTROL_START to
* SCC_CONTROL_END as well as all ASCII < 0x20 from the string as it will
* mess with the automatic font detection */
char buff[256]; // This length is enough to find a suitable replacement font
strecpy(buff, str, lastof(buff));
str_validate(buff, lastof(buff), true, false);
/* Extract a UniChar represenation of the sample string. */ /* Extract a UniChar represenation of the sample string. */
CFStringRef cf_str = CFStringCreateWithCString(kCFAllocatorDefault, str, kCFStringEncodingUTF8); CFStringRef cf_str = CFStringCreateWithCString(kCFAllocatorDefault, buff, kCFStringEncodingUTF8);
if (cf_str == NULL) { if (cf_str == NULL) {
/* Something went wrong. Corrupt/invalid sample string? */ /* Something went wrong. Corrupt/invalid sample string? */
return false; return false;
@ -592,7 +607,10 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
return result; return result;
} }
#elif defined(WITH_FONTCONFIG) #elif defined(WITH_FONTCONFIG) /* end ifdef __APPLE__ */
/* ========================================================================================
* FontConfig (unix) support
* ======================================================================================== */
static FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) static FT_Error GetFontByFaceName(const char *font_name, FT_Face *face)
{ {
FT_Error err = FT_Err_Cannot_Open_Resource; FT_Error err = FT_Err_Cannot_Open_Resource;