Merge branch 'dev' into work/typesetter

# Conflicts:
#	src/gmdocument.c
#	src/ui/documentwidget.c
#	src/ui/inputwidget.h

1 files changed, 117 insertions, 49 deletions

diff --git a/src/ui/text.c b/src/ui/text.c
index 889aa2e4..ffe08fca 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include <the_Foundation/array.h>
 #include <the_Foundation/file.h>
+#include <the_Foundation/fileinfo.h>
 #include <the_Foundation/hash.h>
 #include <the_Foundation/math.h>
 #include <the_Foundation/stringlist.h>
@@ -124,10 +125,6 @@ struct Impl_Font {
     iBool          isMonospaced;
     iBool          manualKernOnly;
     enum iFontSize sizeId;  /* used to look up different fonts of matching size */
-//    enum iFontId
-//    enum iFontId   japaneseFont; /* font to use for Japanese glyphs */
-//    enum iFontId   chineseFont;  /* font to use for Simplified Chinese glyphs */
-//    enum iFontId   koreanFont;   /* font to use for Korean glyphs */
     uint32_t       indexTable[128 - 32]; /* quick ASCII lookup */
 };
 
@@ -155,13 +152,17 @@ static void init_Font(iFont *d, const iBlock *data, int height, float scale,
             d->xScale *= floorf(advance) / advance;
         }
     }
-    d->vertOffset   = height * (1.0f - scale) / 2;
-    d->baseline     = ascent * d->yScale;
-    d->sizeId       = sizeId;
-//    d->symbolsFont  = symbolsFont;
-//    d->japaneseFont = regularJapanese_FontId;
-//    d->chineseFont  = regularChinese_FontId;
-//    d->koreanFont   = regularKorean_FontId;
+    d->baseline   = ascent * d->yScale;
+    d->vertOffset = height * (1.0f - scale) / 2;
+    /* Custom tweaks. */
+    if (data == &fontNotoSansSymbolsRegular_Embedded ||
+        data == &fontNotoSansSymbols2Regular_Embedded) {
+        d->vertOffset /= 2; 
+    }
+    else if (data == &fontNotoEmojiRegular_Embedded) {
+        //d->vertOffset -= height / 30;
+    }
+    d->sizeId = sizeId;
     memset(d->indexTable, 0xff, sizeof(d->indexTable));
 }
 
@@ -215,7 +216,8 @@ struct Impl_Text {
     iRegExp *      ansiEscape;
 };
 
-static iText text_;
+static iText   text_;
+static iBlock *userFont_;
 
 static void initFonts_Text_(iText *d) {
     const float textSize = fontSize_UI * d->contentFontSize;
@@ -321,27 +323,31 @@ static void initFonts_Text_(iText *d) {
         { &fontIosevkaTermExtended_Embedded,  smallMonoSize,        1.0f,         contentMonoSmall_FontSize },
         { &fontIosevkaTermExtended_Embedded,  monoSize,             1.0f,         contentMono_FontSize },
         /* extra content fonts */
-        { &fontSourceSans3Regular_Embedded, textSize,             scaling, contentRegular_FontSize },
-        { &fontIosevkaTermExtended_Embedded,  textSize,             0.866f,  contentRegular_FontSize },
+        { &fontSourceSans3Regular_Embedded,   textSize,             scaling, contentRegular_FontSize },
+        { &fontSourceSans3Regular_Embedded,   textSize * 0.80f,     scaling, contentRegular_FontSize },
         /* symbols and scripts */
-#define DEFINE_FONT_SET(data) \
-        { &data, uiSize,            1.0f, uiNormal_FontSize }, \
-        { &data, uiSize * 1.125f,   1.0f, uiMedium_FontSize }, \
-        { &data, uiSize * 1.333f,   1.0f, uiBig_FontSize }, \
-        { &data, uiSize * 1.666f,   1.0f, uiLarge_FontSize }, \
-        { &data, textSize,          1.0f, contentRegular_FontSize }, \
-        { &data, textSize * 1.200f, 1.0f, contentMedium_FontSize }, \
-        { &data, textSize * 1.333f, 1.0f, contentBig_FontSize }, \
-        { &data, textSize * 1.666f, 1.0f, contentLarge_FontSize }, \
-        { &data, textSize * 2.000f, 1.0f, contentHuge_FontSize }, \
-        { &data, smallMonoSize,     1.0f, contentMonoSmall_FontSize }, \
-        { &data, monoSize,          1.0f, contentMono_FontSize }
-        DEFINE_FONT_SET(fontSymbola_Embedded),
-        DEFINE_FONT_SET(fontNotoEmojiRegular_Embedded),
-        DEFINE_FONT_SET(fontNotoSansJPRegular_Embedded),
-        DEFINE_FONT_SET(fontNotoSansSCRegular_Embedded),
-        DEFINE_FONT_SET(fontNanumGothicRegular_Embedded), /* TODO: should use Noto Sans here, too */
-        DEFINE_FONT_SET(fontNotoSansArabicUIRegular_Embedded),
+#define DEFINE_FONT_SET(data, glyphScale) \
+        { (data), uiSize,            glyphScale, uiNormal_FontSize }, \
+        { (data), uiSize * 1.125f,   glyphScale, uiMedium_FontSize }, \
+        { (data), uiSize * 1.333f,   glyphScale, uiBig_FontSize }, \
+        { (data), uiSize * 1.666f,   glyphScale, uiLarge_FontSize }, \
+        { (data), textSize,          glyphScale, contentRegular_FontSize }, \
+        { (data), textSize * 1.200f, glyphScale, contentMedium_FontSize }, \
+        { (data), textSize * 1.333f, glyphScale, contentBig_FontSize }, \
+        { (data), textSize * 1.666f, glyphScale, contentLarge_FontSize }, \
+        { (data), textSize * 2.000f, glyphScale, contentHuge_FontSize }, \
+        { (data), smallMonoSize,     glyphScale, contentMonoSmall_FontSize }, \
+        { (data), monoSize,          glyphScale, contentMono_FontSize }
+        DEFINE_FONT_SET(userFont_ ? userFont_ : &fontIosevkaTermExtended_Embedded, 1.0f),
+        DEFINE_FONT_SET(&fontIosevkaTermExtended_Embedded, 0.866f),
+        DEFINE_FONT_SET(&fontNotoSansSymbolsRegular_Embedded, 1.45f),
+        DEFINE_FONT_SET(&fontNotoSansSymbols2Regular_Embedded, 1.45f),
+        DEFINE_FONT_SET(&fontSmolEmojiRegular_Embedded, 1.0f),
+        DEFINE_FONT_SET(&fontNotoEmojiRegular_Embedded, 1.10f),
+        DEFINE_FONT_SET(&fontNotoSansJPRegular_Embedded, 1.0f),
+        DEFINE_FONT_SET(&fontNotoSansSCRegular_Embedded, 1.0f),
+        DEFINE_FONT_SET(&fontNanumGothicRegular_Embedded, 1.0f), /* TODO: should use Noto Sans here, too */
+        DEFINE_FONT_SET(&fontNotoSansArabicUIRegular_Embedded, 1.0f),
     };
     iForIndices(i, fontData) {
         iFont *font = &d->fonts[i];
@@ -401,8 +407,28 @@ static void deinitCache_Text_(iText *d) {
     SDL_DestroyTexture(d->cache);
 }
 
+void loadUserFonts_Text(void) {
+    if (userFont_) {
+        delete_Block(userFont_);
+        userFont_ = NULL;
+    }
+    /* Load the system font. */
+    const iPrefs *prefs = prefs_App();
+    if (!isEmpty_String(&prefs->symbolFontPath)) {
+        iFile *f = new_File(&prefs->symbolFontPath);
+        if (open_File(f, readOnly_FileMode)) {
+            userFont_ = readAll_File(f);
+        }
+        else {
+            fprintf(stderr, "[Text] failed to open: %s\n", cstr_String(&prefs->symbolFontPath));
+        }
+        iRelease(f);
+    }
+}
+
 void init_Text(SDL_Renderer *render) {
     iText *d = &text_;
+    loadUserFonts_Text();
     d->contentFont     = nunito_TextFont;
     d->headingFont     = nunito_TextFont;
     d->contentFontSize = contentScale_Text_;
@@ -542,14 +568,36 @@ static void allocate_Font_(iFont *d, iGlyph *glyph, int hoff) {
 }
 
 iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
+    if (isVariationSelector_Char(ch)) {
+        return d;
+    }
+    /* Smol Emoji overrides all other fonts. */
+    if (ch != 0x20) {
+        iFont *smol = font_Text_(smolEmoji_FontId + d->sizeId);
+        if (smol != d && (*glyphIndex = glyphIndex_Font_(smol, ch)) != 0) {
+            return smol;
+        }
+    }
+    /* Manual exceptions. */ {
+        if (ch >= 0x2190 && ch <= 0x2193 /* arrows */) {
+            d = font_Text_(iosevka_FontId + d->sizeId);
+            *glyphIndex = glyphIndex_Font_(d, ch);
+            return d;
+        }
+    }
     if ((*glyphIndex = glyphIndex_Font_(d, ch)) != 0) {
         return d;
     }
-    /* Not defined in current font, try Noto Emoji (for selected characters). */
-    if ((ch >= 0x1f300 && ch < 0x1f600) || (ch >= 0x1f680 && ch <= 0x1f6c5)) {
-        iFont *emoji = font_Text_(emoji_FontId + d->sizeId);
-        if (emoji != d && (*glyphIndex = glyphIndex_Font_(emoji, ch)) != 0) {
-            return emoji;
+    const int fallbacks[] = {
+        notoEmoji_FontId,
+        symbols2_FontId,
+        symbols_FontId
+    };
+    /* First fallback is Smol Emoji. */
+    iForIndices(i, fallbacks) {
+        iFont *fallback = font_Text_(fallbacks[i] + d->sizeId);
+        if (fallback != d && (*glyphIndex = glyphIndex_Font_(fallback, ch)) != 0) {
+            return fallback;
         }
     }
     /* Try Simplified Chinese. */
@@ -584,17 +632,25 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
     /* White up arrow is used for the Shift key on macOS. Symbola's glyph is not a great
        match to the other text, so use the UI font instead. */
     if ((ch == 0x2318 || ch == 0x21e7) && d == font_Text_(regular_FontId)) {
-        *glyphIndex = glyphIndex_Font_(d = font_Text_(defaultContentSized_FontId), ch);
+        *glyphIndex = glyphIndex_Font_(d = font_Text_(defaultContentRegular_FontId), ch);
         return d;
     }
 #endif
-    /* Fall back to Symbola for anything else. */
-    iFont *font = font_Text_(symbols_FontId + d->sizeId);
-    *glyphIndex = glyphIndex_Font_(font, ch);
-//    if (!*glyphIndex) {
-//        fprintf(stderr, "failed to find %08x (%lc)\n", ch, ch); fflush(stderr);
-//    }
-    return font;
+    /* User's symbols font. */ {
+        iFont *sys = font_Text_(userSymbols_FontId + d->sizeId);
+        if (sys != d && (*glyphIndex = glyphIndex_Font_(sys, ch)) != 0) {
+            return sys;
+        }
+    }
+    /* Final fallback. */
+    iFont *font = font_Text_(iosevka_FontId + d->sizeId);
+    if (d != font) {
+        *glyphIndex = glyphIndex_Font_(font, ch);
+    }
+    if (!*glyphIndex) {
+        fprintf(stderr, "failed to find %08x (%lc)\n", ch, (int)ch); fflush(stderr);
+    }
+    return d;
 }
 
 static iGlyph *glyph_Font_(iFont *d, iChar ch) {
@@ -1190,7 +1246,7 @@ iInt2 advanceN_Text(int fontId, const char *text, size_t n) {
     return init_I2(advance, lineHeight_Text(fontId));
 }
 
-static void drawBounded_Text_(int fontId, iInt2 pos, int xposBound, int color, iRangecc text) {
+static void drawBoundedN_Text_(int fontId, iInt2 pos, int xposBound, int color, iRangecc text, size_t maxLen) {
     iText *d    = &text_;
     iFont *font = font_Text_(fontId);
     const iColor clr = get_Color(color & mask_ColorId);
@@ -1201,11 +1257,16 @@ static void drawBounded_Text_(int fontId, iInt2 pos, int xposBound, int color, i
                                    (color & fillBackground_ColorId ? fillBackground_RunMode : 0) |
                                    runFlagsFromId_(fontId),
                            .text            = text,
+                           .maxLen          = maxLen,                           
                            .pos             = pos,
                            .xposLayoutBound = xposBound,
                            .color           = color & mask_ColorId });
 }
 
+static void drawBounded_Text_(int fontId, iInt2 pos, int xposBound, int color, iRangecc text) {
+    drawBoundedN_Text_(fontId, pos, xposBound, color, text, 0);
+}
+
 static void draw_Text_(int fontId, iInt2 pos, int color, iRangecc text) {
     drawBounded_Text_(fontId, pos, 0, color, text);
 }
@@ -1248,6 +1309,10 @@ void drawRange_Text(int fontId, iInt2 pos, int color, iRangecc text) {
     draw_Text_(fontId, pos, color, text);
 }
 
+void drawRangeN_Text(int fontId, iInt2 pos, int color, iRangecc text, size_t maxChars) {
+    drawBoundedN_Text_(fontId, pos, 0, color, text, maxChars);
+}
+
 iInt2 advanceWrapRange_Text(int fontId, int maxWidth, iRangecc text) {
     iInt2 size = zero_I2();
     const char *endp;
@@ -1285,13 +1350,16 @@ void drawCentered_Text(int fontId, iRect rect, iBool alignVisual, int color, con
         vprintf_Block(&chars, format, args);
         va_end(args);
     }
-    const iRangecc text       = range_Block(&chars);
-    iRect          textBounds = alignVisual ? visualBounds_Text(fontId, text)
+    drawCenteredRange_Text(fontId, rect, alignVisual, color, range_Block(&chars));
+    deinit_Block(&chars);
+}
+
+void drawCenteredRange_Text(int fontId, iRect rect, iBool alignVisual, int color, iRangecc text) {
+    iRect textBounds = alignVisual ? visualBounds_Text(fontId, text)
                                    : (iRect){ zero_I2(), advanceRange_Text(fontId, text) };
     textBounds.pos = sub_I2(mid_Rect(rect), mid_Rect(textBounds));
     textBounds.pos.x = iMax(textBounds.pos.x, left_Rect(rect)); /* keep left edge visible */
     draw_Text_(fontId, textBounds.pos, color, text);
-    deinit_Block(&chars);
 }
 
 SDL_Texture *glyphCache_Text(void) {