summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/ci-build.yml2
-rw-r--r--.github/workflows/release.yml2
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/bootstrap_gui.cpp4
-rw-r--r--src/fontcache.cpp7
-rw-r--r--src/os/macosx/CMakeLists.txt1
-rw-r--r--src/os/macosx/font_osx.cpp279
-rw-r--r--src/os/macosx/font_osx.h40
-rw-r--r--src/os/macosx/string_osx.cpp16
-rw-r--r--src/settings.cpp4
-rw-r--r--src/strings.cpp4
-rw-r--r--src/textfile_gui.cpp2
12 files changed, 345 insertions, 18 deletions
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 029c0416e..0d93ce944 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -161,7 +161,7 @@ jobs:
vcpkgDirectory: '/usr/local/share/vcpkg'
doNotUpdateVcpkg: false
vcpkgGitCommitId: 2a42024b53ebb512fb5dd63c523338bf26c8489c
- vcpkgArguments: 'freetype liblzma lzo'
+ vcpkgArguments: 'liblzma lzo'
vcpkgTriplet: '${{ matrix.arch }}-osx'
- name: Install OpenGFX
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 07feba918..d31df95ca 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -482,7 +482,7 @@ jobs:
vcpkgDirectory: '/usr/local/share/vcpkg'
doNotUpdateVcpkg: false
vcpkgGitCommitId: 2a42024b53ebb512fb5dd63c523338bf26c8489c
- vcpkgArguments: 'freetype:x64-osx liblzma:x64-osx lzo:x64-osx freetype:arm64-osx liblzma:arm64-osx lzo:arm64-osx'
+ vcpkgArguments: 'liblzma:x64-osx lzo:x64-osx liblzma:arm64-osx lzo:arm64-osx'
- name: Build tools
run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2af3d30da..24496f459 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,8 +116,8 @@ find_package(PNG)
if(NOT WIN32)
find_package(Allegro)
- find_package(Freetype)
if(NOT APPLE)
+ find_package(Freetype)
find_package(SDL2)
if(NOT SDL2_FOUND)
find_package(SDL)
diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp
index a0f040d1a..7ec391b47 100644
--- a/src/bootstrap_gui.cpp
+++ b/src/bootstrap_gui.cpp
@@ -11,7 +11,7 @@
#include "base_media_base.h"
#include "blitter/factory.hpp"
-#if defined(WITH_FREETYPE) || defined(WITH_UNISCRIBE)
+#if defined(WITH_FREETYPE) || defined(WITH_UNISCRIBE) || defined(WITH_COCOA)
#include "core/geometry_func.hpp"
#include "fontcache.h"
@@ -218,7 +218,7 @@ bool HandleBootstrap()
if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 0) goto failure;
/* If there is no network or no freetype, then there is nothing we can do. Go straight to failure. */
-#if (defined(_WIN32) && defined(WITH_UNISCRIBE)) || (defined(WITH_FREETYPE) && (defined(WITH_FONTCONFIG) || defined(__APPLE__)))
+#if (defined(_WIN32) && defined(WITH_UNISCRIBE)) || (defined(WITH_FREETYPE) && (defined(WITH_FONTCONFIG) || defined(__APPLE__))) || defined(WITH_COCOA)
if (!_network_available) goto failure;
/* First tell the game we're bootstrapping. */
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 50d2cf22e..be36ac107 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -697,6 +697,9 @@ void InitFreeType(bool monospace)
#elif defined(_WIN32)
extern void LoadWin32Font(FontSize fs);
LoadWin32Font(fs);
+#elif defined(WITH_COCOA)
+ extern void LoadCoreTextFont(FontSize fs);
+ LoadCoreTextFont(fs);
#endif
}
}
@@ -717,11 +720,11 @@ void UninitFreeType()
#endif /* WITH_FREETYPE */
}
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(WITH_FONTCONFIG)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(WITH_FONTCONFIG) && !defined(WITH_COCOA)
#ifdef WITH_FREETYPE
FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) { return FT_Err_Cannot_Open_Resource; }
#endif /* WITH_FREETYPE */
bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, int winlangid, MissingGlyphSearcher *callback) { return false; }
-#endif /* !defined(_WIN32) && !defined(__APPLE__) && !defined(WITH_FONTCONFIG) */
+#endif /* !defined(_WIN32) && !defined(__APPLE__) && !defined(WITH_FONTCONFIG) && !defined(WITH_COCOA) */
diff --git a/src/os/macosx/CMakeLists.txt b/src/os/macosx/CMakeLists.txt
index 6b4f2f279..645a057c7 100644
--- a/src/os/macosx/CMakeLists.txt
+++ b/src/os/macosx/CMakeLists.txt
@@ -1,6 +1,7 @@
add_files(
crashlog_osx.cpp
font_osx.cpp
+ font_osx.h
macos.h
macos.mm
osx_stdafx.h
diff --git a/src/os/macosx/font_osx.cpp b/src/os/macosx/font_osx.cpp
index f9436312b..4ce2b24e0 100644
--- a/src/os/macosx/font_osx.cpp
+++ b/src/os/macosx/font_osx.cpp
@@ -9,13 +9,21 @@
#include "../../stdafx.h"
#include "../../debug.h"
+#include "font_osx.h"
+#include "../../blitter/factory.hpp"
+#include "../../fileio_func.h"
#include "../../fontdetection.h"
#include "../../string_func.h"
#include "../../strings_func.h"
+#include "../../zoom_func.h"
#include "macos.h"
+#include <cmath>
+
+#include "../../table/control_codes.h"
#include "safeguards.h"
+
#ifdef WITH_FREETYPE
#include <ft2build.h>
@@ -136,3 +144,274 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
callback->FindMissingGlyphs();
return result;
}
+
+
+CoreTextFontCache::CoreTextFontCache(FontSize fs, CFAutoRelease<CTFontDescriptorRef> &&font, int pixels) : TrueTypeFontCache(fs, pixels), font_desc(std::move(font))
+{
+ this->SetFontSize(pixels);
+}
+
+/**
+ * Reset cached glyphs.
+ */
+void CoreTextFontCache::ClearFontCache()
+{
+ /* GUI scaling might have changed, determine font size anew if it was automatically selected. */
+ if (this->font) this->SetFontSize(this->req_size);
+
+ this->TrueTypeFontCache::ClearFontCache();
+}
+
+void CoreTextFontCache::SetFontSize(int pixels)
+{
+ if (pixels == 0) {
+ /* Try to determine a good height based on the height recommended by the font. */
+ int scaled_height = ScaleFontTrad(this->GetDefaultFontHeight(this->fs));
+ pixels = scaled_height;
+
+ CFAutoRelease<CTFontRef> font(CTFontCreateWithFontDescriptor(this->font_desc.get(), 0.0f, nullptr));
+ if (font) {
+ float min_size = 0.0f;
+
+ /* The 'head' TrueType table contains information about the
+ * 'smallest readable size in pixels'. Try to read it, if
+ * that doesn't work, we use the default OS font size instead.
+ *
+ * Reference: https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6head.html */
+ CFAutoRelease<CFDataRef> data(CTFontCopyTable(font.get(), kCTFontTableHead, kCTFontTableOptionNoOptions));
+ if (data) {
+ uint16_t lowestRecPPEM; // At offset 46 of the 'head' TrueType table.
+ CFDataGetBytes(data.get(), CFRangeMake(46, sizeof(lowestRecPPEM)), (UInt8 *)&lowestRecPPEM);
+ min_size = CFSwapInt16BigToHost(lowestRecPPEM); // TrueType data is always big-endian.
+ } else {
+ CFAutoRelease<CFNumberRef> size((CFNumberRef)CTFontCopyAttribute(font.get(), kCTFontSizeAttribute));
+ CFNumberGetValue(size.get(), kCFNumberFloatType, &min_size);
+ }
+
+ /* Font height is minimum height plus the difference between the default
+ * height for this font size and the small size. */
+ int diff = scaled_height - ScaleFontTrad(this->GetDefaultFontHeight(FS_SMALL));
+ pixels = Clamp(std::min<int>(min_size, MAX_FONT_MIN_REC_SIZE) + diff, scaled_height, MAX_FONT_SIZE);
+ }
+ } else {
+ pixels = ScaleFontTrad(pixels);
+ }
+ this->used_size = pixels;
+
+ this->font.reset(CTFontCreateWithFontDescriptor(this->font_desc.get(), pixels, nullptr));
+
+ /* Query the font metrics we needed. We generally round all values up to
+ * make sure we don't inadvertently cut off a row or column of pixels,
+ * except when determining glyph to glyph advances. */
+ this->units_per_em = CTFontGetUnitsPerEm(this->font.get());
+ this->ascender = (int)std::ceil(CTFontGetAscent(this->font.get()));
+ this->descender = -(int)std::ceil(CTFontGetDescent(this->font.get()));
+ this->height = this->ascender - this->descender;
+
+ /* Get real font name. */
+ char name[128];
+ CFAutoRelease<CFStringRef> font_name((CFStringRef)CTFontCopyAttribute(this->font.get(), kCTFontDisplayNameAttribute));
+ CFStringGetCString(font_name.get(), name, lengthof(name), kCFStringEncodingUTF8);
+ this->font_name = name;
+
+ DEBUG(freetype, 2, "Loaded font '%s' with size %d", this->font_name.c_str(), pixels);
+}
+
+GlyphID CoreTextFontCache::MapCharToGlyph(WChar key)
+{
+ assert(IsPrintable(key));
+
+ if (key >= SCC_SPRITE_START && key <= SCC_SPRITE_END) {
+ return this->parent->MapCharToGlyph(key);
+ }
+
+ /* Convert characters outside of the Basic Multilingual Plane into surrogate pairs. */
+ UniChar chars[2];
+ if (key >= 0x010000U) {
+ chars[0] = (UniChar)(((key - 0x010000U) >> 10) + 0xD800);
+ chars[1] = (UniChar)(((key - 0x010000U) & 0x3FF) + 0xDC00);
+ } else {
+ chars[0] = (UniChar)(key & 0xFFFF);
+ }
+
+ CGGlyph glyph[2] = {0, 0};
+ if (CTFontGetGlyphsForCharacters(this->font.get(), chars, glyph, key >= 0x010000U ? 2 : 1)) {
+ return glyph[0];
+ }
+
+ return 0;
+}
+
+const void *CoreTextFontCache::InternalGetFontTable(uint32 tag, size_t &length)
+{
+ CFAutoRelease<CFDataRef> data(CTFontCopyTable(this->font.get(), (CTFontTableTag)tag, kCTFontTableOptionNoOptions));
+ if (!data) return nullptr;
+
+ length = CFDataGetLength(data.get());
+ auto buf = MallocT<UInt8>(length);
+
+ CFDataGetBytes(data.get(), CFRangeMake(0, (CFIndex)length), buf);
+ return buf;
+}
+
+const Sprite *CoreTextFontCache::InternalGetGlyph(GlyphID key, bool use_aa)
+{
+ /* Get glyph size. */
+ CGGlyph glyph = (CGGlyph)key;
+ CGRect bounds = CGRectNull;
+ if (MacOSVersionIsAtLeast(10, 8, 0)) {
+ bounds = CTFontGetOpticalBoundsForGlyphs(this->font.get(), &glyph, nullptr, 1, 0);
+ } else {
+ bounds = CTFontGetBoundingRectsForGlyphs(this->font.get(), kCTFontOrientationDefault, &glyph, nullptr, 1);
+ }
+ if (CGRectIsNull(bounds)) usererror("Unable to render font glyph");
+
+ uint bb_width = (uint)std::ceil(bounds.size.width) + 1; // Sometimes the glyph bounds are too tight and cut of the last pixel after rounding.
+ uint bb_height = (uint)std::ceil(bounds.size.height);
+
+ /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel. */
+ uint width = std::max(1U, bb_width + (this->fs == FS_NORMAL ? 1 : 0));
+ uint height = std::max(1U, bb_height + (this->fs == FS_NORMAL ? 1 : 0));
+
+ /* Limit glyph size to prevent overflows later on. */
+ if (width > MAX_GLYPH_DIM || height > MAX_GLYPH_DIM) usererror("Font glyph is too large");
+
+ SpriteLoader::Sprite sprite;
+ sprite.AllocateData(ZOOM_LVL_NORMAL, width * height);
+ sprite.type = ST_FONT;
+ sprite.width = width;
+ sprite.height = height;
+ sprite.x_offs = (int16)std::round(CGRectGetMinX(bounds));
+ sprite.y_offs = this->ascender - (int16)std::ceil(CGRectGetMaxY(bounds));
+
+ if (bounds.size.width > 0) {
+ /* Glyph is not a white-space glyph. Render it to a bitmap context. */
+
+ /* We only need the alpha channel, as we apply our own colour constants to the sprite. */
+ int pitch = Align(bb_width, 16);
+ byte *bmp = CallocT<byte>(bb_height * pitch);
+ CFAutoRelease<CGContextRef> context(CGBitmapContextCreate(bmp, bb_width, bb_height, 8, pitch, nullptr, kCGImageAlphaOnly));
+ /* Set antialias according to requirements. */
+ CGContextSetAllowsAntialiasing(context.get(), use_aa);
+ CGContextSetAllowsFontSubpixelPositioning(context.get(), use_aa);
+ CGContextSetAllowsFontSubpixelQuantization(context.get(), !use_aa);
+ CGContextSetShouldSmoothFonts(context.get(), false);
+
+ float offset = 0.5f; // CoreText uses 0.5 as pixel centers. We want pixel alignment.
+ CGPoint pos{offset - bounds.origin.x, offset - bounds.origin.y};
+ CTFontDrawGlyphs(this->font.get(), &glyph, &pos, 1, context.get());
+
+ /* Draw shadow for medium size. */
+ if (this->fs == FS_NORMAL && !use_aa) {
+ for (uint y = 0; y < bb_height; y++) {
+ for (uint x = 0; x < bb_width; x++) {
+ if (bmp[y * pitch + x] > 0) {
+ sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR;
+ sprite.data[1 + x + (1 + y) * sprite.width].a = use_aa ? bmp[x + y * pitch] : 0xFF;
+ }
+ }
+ }
+ }
+
+ /* Extract pixel data. */
+ for (uint y = 0; y < bb_height; y++) {
+ for (uint x = 0; x < bb_width; x++) {
+ if (bmp[y * pitch + x] > 0) {
+ sprite.data[x + y * sprite.width].m = FACE_COLOUR;
+ sprite.data[x + y * sprite.width].a = use_aa ? bmp[x + y * pitch] : 0xFF;
+ }
+ }
+ }
+ }
+
+ GlyphEntry new_glyph;
+ new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, AllocateFont);
+ new_glyph.width = (byte)std::round(CTFontGetAdvancesForGlyphs(this->font.get(), kCTFontOrientationDefault, &glyph, nullptr, 1));
+ this->SetGlyphPtr(key, &new_glyph);
+
+ return new_glyph.sprite;
+}
+
+/**
+ * Loads the TrueType font.
+ * If a CoreText font description is present, e.g. from the automatic font
+ * fallback search, use it. Otherwise, try to resolve it by font name.
+ * @param fs The font size to load.
+ */
+void LoadCoreTextFont(FontSize fs)
+{
+ static const char *SIZE_TO_NAME[] = { "medium", "small", "large", "mono" };
+
+ FreeTypeSubSetting *settings = nullptr;
+ switch (fs) {
+ default: NOT_REACHED();
+ case FS_SMALL: settings = &_freetype.small; break;
+ case FS_NORMAL: settings = &_freetype.medium; break;
+ case FS_LARGE: settings = &_freetype.large; break;
+ case FS_MONO: settings = &_freetype.mono; break;
+ }
+
+ if (StrEmpty(settings->font)) return;
+
+ CFAutoRelease<CTFontDescriptorRef> font_ref;
+
+ if (settings->os_handle != nullptr) {
+ font_ref.reset(static_cast<CTFontDescriptorRef>(const_cast<void *>(settings->os_handle)));
+ CFRetain(font_ref.get()); // Increase ref count to match a later release.
+ }
+
+ if (!font_ref && MacOSVersionIsAtLeast(10, 6, 0)) {
+ /* Might be a font file name, try load it. Direct font loading is
+ * only supported starting on OSX 10.6. */
+ CFAutoRelease<CFStringRef> path;
+
+ /* See if this is an absolute path. */
+ if (FileExists(settings->font)) {
+ path.reset(CFStringCreateWithCString(kCFAllocatorDefault, settings->font, kCFStringEncodingUTF8));
+ } else {
+ /* Scan the search-paths to see if it can be found. */
+ std::string full_font = FioFindFullPath(BASE_DIR, settings->font);
+ if (!full_font.empty()) {
+ path.reset(CFStringCreateWithCString(kCFAllocatorDefault, full_font.c_str(), kCFStringEncodingUTF8));
+ }
+ }
+
+ if (path) {
+ /* Try getting a font descriptor to see if the system can use it. */
+ CFAutoRelease<CFURLRef> url(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path.get(), kCFURLPOSIXPathStyle, false));
+ CFAutoRelease<CFArrayRef> descs(CTFontManagerCreateFontDescriptorsFromURL(url.get()));
+
+ if (descs && CFArrayGetCount(descs.get()) > 0) {
+ font_ref.reset((CTFontDescriptorRef)CFArrayGetValueAtIndex(descs.get(), 0));
+ CFRetain(font_ref.get());
+ } else {
+ ShowInfoF("Unable to load file '%s' for %s font, using default OS font selection instead", settings->font, SIZE_TO_NAME[fs]);
+ }
+ }
+ }
+
+ if (!font_ref) {
+ CFAutoRelease<CFStringRef> name(CFStringCreateWithCString(kCFAllocatorDefault, settings->font, kCFStringEncodingUTF8));
+
+ /* Simply creating the font using CTFontCreateWithNameAndSize will *always* return
+ * something, no matter the name. As such, we can't use it to check for existence.
+ * We instead query the list of all font descriptors that match the given name which
+ * does not do this stupid name fallback. */
+ CFAutoRelease<CTFontDescriptorRef> name_desc(CTFontDescriptorCreateWithNameAndSize(name.get(), 0.0));
+ CFAutoRelease<CFSetRef> mandatory_attribs(CFSetCreate(kCFAllocatorDefault, const_cast<const void **>(reinterpret_cast<const void * const *>(&kCTFontNameAttribute)), 1, &kCFTypeSetCallBacks));
+ CFAutoRelease<CFArrayRef> descs(CTFontDescriptorCreateMatchingFontDescriptors(name_desc.get(), mandatory_attribs.get()));
+
+ /* Assume the first result is the one we want. */
+ if (descs && CFArrayGetCount(descs.get()) > 0) {
+ font_ref.reset((CTFontDescriptorRef)CFArrayGetValueAtIndex(descs.get(), 0));
+ CFRetain(font_ref.get());
+ }
+ }
+
+ if (!font_ref) {
+ ShowInfoF("Unable to use '%s' for %s font, using sprite font instead", settings->font, SIZE_TO_NAME[fs]);
+ return;
+ }
+
+ new CoreTextFontCache(fs, std::move(font_ref), settings->size);
+}
diff --git a/src/os/macosx/font_osx.h b/src/os/macosx/font_osx.h
new file mode 100644
index 000000000..bdfd7316d
--- /dev/null
+++ b/src/os/macosx/font_osx.h
@@ -0,0 +1,40 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file font_osx.h Functions related to font handling on MacOS. */
+
+#ifndef FONT_OSX_H
+#define FONT_OSX_H
+
+#include "../../fontcache_internal.h"
+#include "os/macosx/macos.h"
+
+#include <CoreFoundation/CoreFoundation.h>
+
+class CoreTextFontCache : public TrueTypeFontCache {
+ CFAutoRelease<CTFontDescriptorRef> font_desc; ///< Font descriptor exlcuding font size.
+ CFAutoRelease<CTFontRef> font; ///< CoreText font handle.
+
+ std::string font_name; ///< Cached font name.
+
+ void SetFontSize(int pixels);
+ const Sprite *InternalGetGlyph(GlyphID key, bool use_aa) override;
+ const void *InternalGetFontTable(uint32 tag, size_t &length) override;
+public:
+ CoreTextFontCache(FontSize fs, CFAutoRelease<CTFontDescriptorRef> &&font, int pixels);
+ ~CoreTextFontCache() {}
+
+ void ClearFontCache() override;
+ GlyphID MapCharToGlyph(WChar key) override;
+ const char *GetFontName() override { return font_name.c_str(); }
+ bool IsBuiltInFont() override { return false; }
+ const void *GetOSHandle() override { return font.get(); }
+};
+
+void LoadCoreTextFont(FontSize fs);
+
+#endif /* FONT_OSX_H */
diff --git a/src/os/macosx/string_osx.cpp b/src/os/macosx/string_osx.cpp
index 12440e1e1..5cd14e8e1 100644
--- a/src/os/macosx/string_osx.cpp
+++ b/src/os/macosx/string_osx.cpp
@@ -174,12 +174,16 @@ static CTRunDelegateCallbacks _sprite_font_callback = {
for (const auto &i : fontMapping) {
if (i.first - last == 0) continue;
- if (!_font_cache[i.second->fc->GetSize()]) {
- /* Cache font information. */
- CFAutoRelease<CFStringRef> font_name(CFStringCreateWithCString(kCFAllocatorDefault, i.second->fc->GetFontName(), kCFStringEncodingUTF8));
- _font_cache[i.second->fc->GetSize()].reset(CTFontCreateWithName(font_name.get(), i.second->fc->GetFontSize(), nullptr));
+ CTFontRef font = (CTFontRef)i.second->fc->GetOSHandle();
+ if (font == nullptr) {
+ if (!_font_cache[i.second->fc->GetSize()]) {
+ /* Cache font information. */
+ CFAutoRelease<CFStringRef> font_name(CFStringCreateWithCString(kCFAllocatorDefault, i.second->fc->GetFontName(), kCFStringEncodingUTF8));
+ _font_cache[i.second->fc->GetSize()].reset(CTFontCreateWithName(font_name.get(), i.second->fc->GetFontSize(), nullptr));
+ }
+ font = _font_cache[i.second->fc->GetSize()].get();
}
- CFAttributedStringSetAttribute(str.get(), CFRangeMake(last, i.first - last), kCTFontAttributeName, _font_cache[i.second->fc->GetSize()].get());
+ CFAttributedStringSetAttribute(str.get(), CFRangeMake(last, i.first - last), kCTFontAttributeName, font);
CGColorRef color = CGColorCreateGenericGray((uint8)i.second->colour / 255.0f, 1.0f); // We don't care about the real colours, just that they are different.
CFAttributedStringSetAttribute(str.get(), CFRangeMake(last, i.first - last), kCTForegroundColorAttributeName, color);
@@ -300,7 +304,7 @@ void MacOSRegisterExternalFont(const char *file_path)
CTFontManagerRegisterFontsForURL(url.get(), kCTFontManagerScopeProcess, nullptr);
}
-/** Store current language locale as a CoreFounation locale. */
+/** Store current language locale as a CoreFoundation locale. */
void MacOSSetCurrentLocaleName(const char *iso_code)
{
if (!MacOSVersionIsAtLeast(10, 5, 0)) return;
diff --git a/src/settings.cpp b/src/settings.cpp
index b5a07fbb2..d3be59692 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -38,7 +38,7 @@
#include "sound_func.h"
#include "company_func.h"
#include "rev.h"
-#if defined(WITH_FREETYPE) || defined(_WIN32)
+#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
#include "fontcache.h"
#endif
#include "textbuf_gui.h"
@@ -67,7 +67,7 @@
#include "void_map.h"
#include "station_base.h"
-#if defined(WITH_FREETYPE) || defined(_WIN32)
+#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
#define HAS_TRUETYPE_FONT
#endif
diff --git a/src/strings.cpp b/src/strings.cpp
index 1d6fca8b6..acebf88ee 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -2073,7 +2073,7 @@ class LanguagePackGlyphSearcher : public MissingGlyphSearcher {
void SetFontNames(FreeTypeSettings *settings, const char *font_name, const void *os_data) override
{
-#if defined(WITH_FREETYPE) || defined(_WIN32)
+#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
strecpy(settings->small.font, font_name, lastof(settings->small.font));
strecpy(settings->medium.font, font_name, lastof(settings->medium.font));
strecpy(settings->large.font, font_name, lastof(settings->large.font));
@@ -2103,7 +2103,7 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher)
static LanguagePackGlyphSearcher pack_searcher;
if (searcher == nullptr) searcher = &pack_searcher;
bool bad_font = !base_font || searcher->FindMissingGlyphs();
-#if defined(WITH_FREETYPE) || defined(_WIN32)
+#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
if (bad_font) {
/* We found an unprintable character... lets try whether we can find
* a fallback font that can print the characters in the current language. */
diff --git a/src/textfile_gui.cpp b/src/textfile_gui.cpp
index fd544f5fc..075898fd7 100644
--- a/src/textfile_gui.cpp
+++ b/src/textfile_gui.cpp
@@ -194,7 +194,7 @@ void TextfileWindow::SetupScrollbars()
/* virtual */ void TextfileWindow::SetFontNames(FreeTypeSettings *settings, const char *font_name, const void *os_data)
{
-#if defined(WITH_FREETYPE) || defined(_WIN32)
+#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
strecpy(settings->mono.font, font_name, lastof(settings->mono.font));
settings->mono.os_handle = os_data;
#endif
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-26 09:57:00 +0000