Use the full Symbola font; don't embed resources

The fonts are too large to embed comfortably.

5 files changed, 30 insertions, 19 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42e70ef8..de97bf0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,8 @@ pkg_check_modules (SDL2 REQUIRED sdl2)
 
 # Embedded resources are written to a generated source file.
 message (STATUS "Preparing embedded resources...")
+# Fonts are too large to comfortably embed as a C source.
+set (EMBED_IN_EXECUTABLE OFF CACHE BOOL "Embed resources inside the executable")
 set (EMBED_RESOURCES 
     res/SourceSansPro-Regular.ttf
     res/FiraSans-Regular.ttf
@@ -21,15 +23,19 @@ set (EMBED_RESOURCES
     res/FiraSans-Italic.ttf
     res/FiraMono-Regular.ttf
     res/NotoEmoji-Regular.ttf
-    res/SymbolaSubset.ttf
+    res/Symbola.ttf
 )
 # if (UNIX AND NOT APPLE)
 #     list (APPEND EMBED_RESOURCES res/appicon-64.png)
 # endif ()
 embed_make (${EMBED_RESOURCES})
 
+set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.bin)
+set_source_files_properties (${EMB_BIN} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+
 # Source files.
 set (SOURCES
+    ${CMAKE_CURRENT_BINARY_DIR}/resources.bin
     ${CMAKE_CURRENT_BINARY_DIR}/embedded.c
     ${CMAKE_CURRENT_BINARY_DIR}/embedded.h
     src/main.c
diff --git a/res/Symbola.ttf b/res/Symbola.ttf
new file mode 100644
index 00000000..59e428fe
--- /dev/null
+++ b/res/Symbola.ttf
diff --git a/src/app.c b/src/app.c
index f7f0b044..8be503de 100644
--- a/src/app.c
+++ b/src/app.c
@@ -32,12 +32,15 @@
 iDeclareType(App)
 
 #if defined (iPlatformApple)
+#define EMB_BIN "../../Resources/resources.bin"
 static const char *dataDir_App_ = "~/Library/Application Support/fi.skyjake.Lagrange";
 #endif
 #if defined (iPlatformMsys)
+#define EMB_BIN "../resources.bin"
 static const char *dataDir_App_ = "~/AppData/Roaming/fi.skyjake.Lagrange";
 #endif
 #if defined (iPlatformLinux)
+#define EMB_BIN "../../share/lagrange/resources.bin"
 static const char *dataDir_App_ = "~/.config/lagrange";
 #endif
 static const char *prefsFileName_App_   = "prefs.cfg";
@@ -146,8 +149,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     load_History(d->history, dataDir_App_);
 #if defined (iHaveLoadEmbed)
     /* Load the resources from a file. */ {
-        if (!load_Embed(
-                cstr_String(collect_String(concatCStr_Path(execPath_App(), "../resources.bin"))))) {
+        if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
             fprintf(stderr, "failed to load resources.bin\n");
             exit(-1);
         }
diff --git a/src/history.c b/src/history.c
index 884e8592..edffd485 100644
--- a/src/history.c
+++ b/src/history.c
@@ -66,12 +66,12 @@ static void writeItems_(const iArray *items, iFile *f) {
 }
 
 void save_History(const iHistory *d, const char *dirPath) {
-    iFile *f = new_File(concatPath_CStr(dirPath, "recent.txt"));
+    iFile *f = newCStr_File(concatPath_CStr(dirPath, "recent.txt"));
     if (open_File(f, writeOnly_FileMode | text_FileMode)) {
         writeItems_(&d->stack, f);
     }
     iRelease(f);
-    f = new_File(concatPath_CStr(dirPath, "visited.txt"));
+    f = newCStr_File(concatPath_CStr(dirPath, "visited.txt"));
     if (open_File(f, writeOnly_FileMode | text_FileMode)) {
         writeItems_(&d->visitedUrls.values, f);
     }
@@ -101,12 +101,12 @@ static void loadItems_(iArray *items, iFile *f, double maxAge) {
 }
 
 void load_History(iHistory *d, const char *dirPath) {
-    iFile *f = new_File(concatPath_CStr(dirPath, "recent.txt"));
+    iFile *f = newCStr_File(concatPath_CStr(dirPath, "recent.txt"));
     if (open_File(f, readOnly_FileMode | text_FileMode)) {
         loadItems_(&d->stack, f, 0);
     }
     iRelease(f);
-    f = new_File(concatPath_CStr(dirPath, "visited.txt"));
+    f = newCStr_File(concatPath_CStr(dirPath, "visited.txt"));
     if (open_File(f, readOnly_FileMode | text_FileMode)) {
         loadItems_(&d->visitedUrls.values, f, maxAgeVisited_History_);
     }
@@ -222,6 +222,7 @@ iTime urlVisitTime_History(const iHistory *d, const iString *url) {
 }
 
 void print_History(const iHistory *d) {
+    iUnused(d);
 #if 0
     iConstForEach(Array, i, &d->history) {
         const size_t idx = index_ArrayConstIterator(&i);
diff --git a/src/ui/text.c b/src/ui/text.c
index 40008963..dee693e4 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -155,11 +155,11 @@ void init_Text(SDL_Renderer *render) {
             { &fontFiraSansBold_Embedded,         fontSize_UI * 1.333f, mediumSymbols_FontId },
             { &fontFiraSansBold_Embedded,         fontSize_UI * 1.666f, largeSymbols_FontId },
             { &fontFiraSansBold_Embedded,         fontSize_UI * 2.000f, hugeSymbols_FontId },
-            { &fontSymbolaSubset_Embedded,        fontSize_UI,          symbols_FontId },
-            { &fontSymbolaSubset_Embedded,        fontSize_UI * 1.333f, mediumSymbols_FontId },
-            { &fontSymbolaSubset_Embedded,        fontSize_UI * 1.666f, largeSymbols_FontId },
-            { &fontSymbolaSubset_Embedded,        fontSize_UI * 2.000f, hugeSymbols_FontId },
-            { &fontSymbolaSubset_Embedded,        fontSize_UI * 0.866f, smallSymbols_FontId },
+            { &fontSymbola_Embedded,              fontSize_UI,          symbols_FontId },
+            { &fontSymbola_Embedded,              fontSize_UI * 1.333f, mediumSymbols_FontId },
+            { &fontSymbola_Embedded,              fontSize_UI * 1.666f, largeSymbols_FontId },
+            { &fontSymbola_Embedded,              fontSize_UI * 2.000f, hugeSymbols_FontId },
+            { &fontSymbola_Embedded,              fontSize_UI * 0.866f, smallSymbols_FontId },
             { &fontNotoEmojiRegular_Embedded,     fontSize_UI,          symbols_FontId },
             { &fontNotoEmojiRegular_Embedded,     fontSize_UI * 1.333f, mediumSymbols_FontId },
             { &fontNotoEmojiRegular_Embedded,     fontSize_UI * 1.666f, largeSymbols_FontId },
@@ -280,17 +280,19 @@ static void cache_Font_(iFont *d, iGlyph *glyph, int hoff) {
     }
 }
 
-iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch) {
+iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch) {    
     if (stbtt_FindGlyphIndex(&d->font, ch) != 0) {
         return d;
     }
-    /* Not defined in current font, try symbols. */
-    iFont *symbols = font_Text_(d->symbolsFont);
-    if (symbols != d && stbtt_FindGlyphIndex(&symbols->font, ch)) {
-        return symbols;
+    /* Not defined in current font, try Noto Emoji (for selected characters). */
+    if ((ch >= 0x1f300 && ch < 0x1f600) || (ch >= 0x1f680 && ch <= 0x1f6c5)) {
+        iFont *emoji = font_Text_(d->symbolsFont + fromSymbolsToEmojiOffset_FontId);
+        if (emoji != d && stbtt_FindGlyphIndex(&emoji->font, ch)) {
+            return emoji;
+        }
     }
-    /* Perhaps it's Emoji. */
-    return font_Text_(d->symbolsFont + fromSymbolsToEmojiOffset_FontId);
+    /* Fall back to Symbola for anything else. */
+    return font_Text_(d->symbolsFont);
 }
 
 static const iGlyph *glyph_Font_(iFont *d, iChar ch) {