Text: Cache glyph advances; added small monospace font

2 files changed, 23 insertions, 18 deletions

diff --git a/src/ui/text.c b/src/ui/text.c
index a24d4030..6ed95dc0 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -117,6 +117,7 @@ void init_Text(SDL_Renderer *render) {
         const struct { const iBlock *ttf; int size; } fontData[max_FontId] = {
             { &fontFiraSansRegular_Embedded, fontSize_UI },
             { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.85f },
+            { &fontFiraMonoRegular_Embedded, fontSize_UI * 0.65f },
             { &fontFiraSansRegular_Embedded, fontSize_UI * 1.35f },
             { &fontFiraSansLightItalic_Embedded, fontSize_UI },
             { &fontFiraSansBold_Embedded, fontSize_UI },
@@ -213,6 +214,8 @@ static void cache_Font_(iFont *d, iGlyph *glyph) {
     if (!isSpecialChar_(ch)) {
         /* Rasterize the glyph using stbtt. */
         surface = rasterizeGlyph_Font_(d, ch);
+        int lsb;
+        stbtt_GetCodepointHMetrics(&d->font, ch, &glyph->advance, &lsb);
         stbtt_GetCodepointBitmapBox(
             &d->font, ch, d->scale, d->scale, &glyph->dx, &glyph->dy, NULL, NULL);
         fromStb = iTrue;
@@ -226,6 +229,7 @@ static void cache_Font_(iFont *d, iGlyph *glyph) {
         stbtt_GetCodepointHMetrics(&d->font, 'M', &em, &lsb);
         glyph->dx = d->baseline / 10;
         glyph->dy = -d->baseline;
+        glyph->advance = em * symbolAdvance_(symbol);
         glyph->rect.size = init_I2(symbolEmWidth_(symbol) * em * d->scale, d->height);
 #if 0
         if (isRasterizedSymbol_(ch)) {
@@ -427,13 +431,7 @@ static iInt2 run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
                               glyph->rect.size.y };
             SDL_RenderCopyF(text_.render, text_.cache, (const SDL_Rect *) &glyph->rect, &dst);
         }
-        int advance, lsb;
-        const iBool spec = isSpecialChar_(ch);
-        stbtt_GetCodepointHMetrics(info, spec ? 'M' : ch, &advance, &lsb);
-        if (spec) {
-            advance *= symbolAdvance_(specialChar_(ch));
-        }
-        xpos += d->scale * advance;
+        xpos += d->scale * glyph->advance;
         xposMax = iMax(xposMax, xpos);
         if (!isSpace_Char(prevCh) && isSpace_Char(ch)) {
             lastWordEnd = chPos;
@@ -461,13 +459,13 @@ int lineHeight_Text(int fontId) {
     return text_.fonts[fontId].height;
 }
 
-iInt2 measure_Text(int fontId, const char *text) {
-    if (!*text) {
+iInt2 measureRange_Text(int fontId, iRangecc text) {
+    if (isEmpty_Range(&text)) {
         return init_I2(0, lineHeight_Text(fontId));
     }
     return run_Font_(&text_.fonts[fontId],
                      measure_RunMode,
-                     range_CStr(text),
+                     text,
                      iInvalidSize,
                      zero_I2(),
                      0,
@@ -475,6 +473,10 @@ iInt2 measure_Text(int fontId, const char *text) {
                      NULL);
 }
 
+iInt2 measure_Text(int fontId, const char *text) {
+    return measureRange_Text(fontId, range_CStr(text));
+}
+
 iInt2 advanceRange_Text(int fontId, iRangecc text) {
     int advance;
     const int height = run_Font_(&text_.fonts[fontId],
diff --git a/src/ui/text.h b/src/ui/text.h
index ddf9da86..29fc34a4 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -8,6 +8,7 @@
 enum iFontId {
     default_FontId,
     monospace_FontId,
+    monospaceSmall_FontId,
     medium_FontId,
     italic_FontId,
     bold_FontId,
@@ -18,14 +19,15 @@ enum iFontId {
     /* UI fonts: */
     uiInput_FontId = monospace_FontId,
     /* Document fonts: */
-    paragraph_FontId      = default_FontId,
-    firstParagraph_FontId = medium_FontId,
-    preformatted_FontId   = monospace_FontId,
-    quote_FontId          = italic_FontId,
-    header1_FontId        = hugeBold_FontId,
-    header2_FontId        = largeBold_FontId,
-    header3_FontId        = mediumBold_FontId,
-    uiShortcuts_FontId    = default_FontId,
+    paragraph_FontId         = default_FontId,
+    firstParagraph_FontId    = medium_FontId,
+    preformatted_FontId      = monospace_FontId,
+    preformattedSmall_FontId = monospaceSmall_FontId,
+    quote_FontId             = italic_FontId,
+    header1_FontId           = hugeBold_FontId,
+    header2_FontId           = largeBold_FontId,
+    header3_FontId           = mediumBold_FontId,
+    uiShortcuts_FontId       = default_FontId,
 };
 
 #define specialSymbol_Text  0x10
@@ -39,6 +41,7 @@ void    deinit_Text         (void);
 
 int     lineHeight_Text     (int fontId);
 iInt2   measure_Text        (int fontId, const char *text);
+iInt2   measureRange_Text   (int fontId, iRangecc text);
 iInt2   advance_Text        (int fontId, const char *text);
 iInt2   advanceN_Text       (int fontId, const char *text, size_t n); /* `n` in characters */
 iInt2   advanceRange_Text   (int fontId, iRangecc text);