Changing the document content text size

The glyph cache is purged whenever font sizes change. UI fonts are
deliberately not changed in size so that UI metrics don't have to be
recomputed.

9 files changed, 202 insertions, 83 deletions

diff --git a/.gitignore b/.gitignore
index 1d5e5a5b..f7f28a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .DS_Store
 *.user
 build-*
+/.vsbuild
+/.vscode
diff --git a/src/app.c b/src/app.c
index 5ac211f9..36e55970 100644
--- a/src/app.c
+++ b/src/app.c
@@ -405,6 +405,12 @@ iBool handleCommand_App(const char *cmd) {
         delete_String(homePath);
         return iTrue;
     }
+    else if (equal_Command(cmd, "font.setfactor")) {
+        setContentFontSize_Text((float) arg_Command(cmd) / 100.0f);
+        postCommand_App("font.changed");
+        refresh_App();
+        return iTrue;
+    }
     else {
         return iFalse;
     }
diff --git a/src/gmdocument.c b/src/gmdocument.c
index cf30a081..cb9e2acb 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -382,9 +382,9 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         /* List bullet. */
         run.color = colors[type];
         if (type == bullet_GmLineType) {
-            run.visBounds.pos  = addX_I2(pos, indent * gap_UI);
+            run.visBounds.pos  = addX_I2(pos, indent * gap_Text);
             run.visBounds.size = advance_Text(run.font, bullet);
-            run.visBounds.pos.x -= 4 * gap_UI - width_Rect(run.visBounds) / 2;
+            run.visBounds.pos.x -= 4 * gap_Text - width_Rect(run.visBounds) / 2;
             run.bounds = zero_Rect(); /* just visual */
             run.text = range_CStr(bullet);
             pushBack_Array(&d->layout, &run);
@@ -392,14 +392,14 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         /* Link icon. */
         if (type == link_GmLineType) {
             run.visBounds.pos  = pos;
-            run.visBounds.size = init_I2(indent * gap_UI, lineHeight_Text(run.font));
+            run.visBounds.size = init_I2(indent * gap_Text, lineHeight_Text(run.font));
             run.bounds         = zero_Rect(); /* just visual */
             const iGmLink *link = constAt_PtrArray(&d->links, run.linkId - 1);
             run.text            = range_CStr(link->flags & file_GmLinkFlag
                                       ? folder
                                       : link->flags & remote_GmLinkFlag ? globe : arrow);
             if (link->flags & remote_GmLinkFlag) {
-                run.visBounds.pos.x -= gap_UI / 2;
+                run.visBounds.pos.x -= gap_Text / 2;
             }
             run.color = linkColor_GmDocument(d, run.linkId);
             if (link->flags & visited_GmLinkFlag) {
@@ -433,7 +433,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 runLine.start != line.start) {
                 pos.y += midRunSkip * lineHeight_Text(run.font);
             }
-            run.bounds.pos = addX_I2(pos, indent * gap_UI);
+            run.bounds.pos = addX_I2(pos, indent * gap_Text);
             const char *contPos;
             const int avail = d->size.x - run.bounds.pos.x;
             const iInt2 dims =
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index d13f6f01..a61d5b88 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -82,6 +82,7 @@ struct Impl_DocumentWidget {
     iGmRequest *request;
     iAtomicInt isRequestUpdated; /* request has new content, need to parse it */
     iObjectList *media;
+    int textSizePercent;
     iGmDocument *doc;
     int certFlags;
     iDate certExpiry;
@@ -114,6 +115,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
     d->request          = NULL;
     d->isRequestUpdated = iFalse;
     d->media            = new_ObjectList();
+    d->textSizePercent  = 100;
     d->doc              = new_GmDocument();
     d->certFlags        = 0;
     d->selecting        = iFalse;
@@ -154,7 +156,8 @@ void deinit_DocumentWidget(iDocumentWidget *d) {
 static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
     const iWidget *w = constAs_Widget(d);
     const iRect bounds = bounds_Widget(w);
-    return iMini(bounds.size.x - gap_UI * d->pageMargin * 2, fontSize_UI * 40);
+    return iMini(bounds.size.x - gap_UI * d->pageMargin * 2,
+                 fontSize_UI * 40 * d->textSizePercent / 100);
 }
 
 static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
@@ -531,6 +534,32 @@ static const char *sourceLoc_DocumentWidget_(const iDocumentWidget *d, iInt2 pos
     return findLoc_GmDocument(d->doc, documentPos_DocumentWidget_(d, pos));
 }
 
+iDeclareType(MiddleRunParams)
+struct Impl_MiddleRunParams {
+    int midY;
+    const iGmRun *closest;
+    int distance;
+};
+
+static void find_MiddleRunParams_(void *params, const iGmRun *run) {
+    iMiddleRunParams *d = params;
+    if (isEmpty_Rect(run->bounds)) {
+        return;
+    }
+    const int distance = iAbs(mid_Rect(run->bounds).y - d->midY);
+    if (!d->closest || distance < d->distance) {
+        d->closest  = run;
+        d->distance = distance;
+    }
+}
+
+static const iGmRun *middleRun_DocumentWidget_(const iDocumentWidget *d) {
+    iRangei visRange = visibleRange_DocumentWidget_(d);
+    iMiddleRunParams params = { (visRange.start + visRange.end) / 2, NULL, 0 };
+    render_GmDocument(d->doc, visRange, find_MiddleRunParams_, &params);
+    return params.closest;
+}
+
 static void removeMediaRequest_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId) {
     iForEach(ObjectList, i, d->media) {
         iMediaRequest *req = (iMediaRequest *) i.object;
@@ -596,12 +625,34 @@ static iBool handleMediaEvent_DocumentWidget_(iDocumentWidget *d, const char *cm
     return iFalse;
 }
 
+static void changeTextSize_DocumentWidget_(iDocumentWidget *d, int delta) {
+    if (delta == 0) {
+        d->textSizePercent = 100;
+    }
+    else {
+        if (d->textSizePercent < 100 || (delta < 0 && d->textSizePercent == 100)) {
+            delta /= 2;
+        }
+        d->textSizePercent += delta;
+        d->textSizePercent = iClamp(d->textSizePercent, 50, 200);
+    }
+    postCommandf_App("font.setfactor arg:%d", d->textSizePercent);
+}
+
 static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
-    if (isResize_UserEvent(ev)) {
+    if (isResize_UserEvent(ev) || isCommand_UserEvent(ev, "font.changed")) {
+        const iGmRun *mid = middleRun_DocumentWidget_(d);
+        const char *midLoc = (mid ? mid->text.start : NULL);
         setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
         scroll_DocumentWidget_(d, 0);
         updateVisible_DocumentWidget_(d);
+        if (midLoc) {
+            mid = findRunAtLoc_GmDocument(d->doc, midLoc);
+            if (mid) {
+                scrollTo_DocumentWidget_(d, mid_Rect(mid->bounds).y);
+            }
+        }
         refresh_Widget(w);
     }
     else if (isCommand_UserEvent(ev, "server.showcert")) {
@@ -762,7 +813,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             case SDLK_UP:
             case SDLK_DOWN:
                 if (mods == 0) {
-                    scroll_DocumentWidget_(d, 2 * lineHeight_Text(paragraph_FontId) *
+                    scroll_DocumentWidget_(d, 2 * lineHeight_Text(default_FontId) *
                                                   (key == SDLK_UP ? -1 : 1));
                     return iTrue;
                 }
@@ -772,6 +823,16 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             case ' ':
                 postCommand_Widget(w, "scroll.page arg:%d", key == SDLK_PAGEUP ? -1 : +1);
                 return iTrue;
+            case SDLK_MINUS:
+            case SDLK_EQUALS:
+            case SDLK_0:
+                if (mods == KMOD_PRIMARY) {
+                    changeTextSize_DocumentWidget_(
+                        d, key == SDLK_EQUALS ? 10 : key == SDLK_MINUS ? -10 : 0);
+                    return iTrue;
+                }
+                break;
+#if 0
             case '0': {
                 extern int enableHalfPixelGlyphs_Text;
                 enableHalfPixelGlyphs_Text = !enableHalfPixelGlyphs_Text;
@@ -780,10 +841,15 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 fflush(stdout);
                 break;
             }
+#endif
         }
     }
     else if (ev->type == SDL_MOUSEWHEEL) {
-        scroll_DocumentWidget_(d, -3 * ev->wheel.y * lineHeight_Text(paragraph_FontId));
+        if (keyMods_Sym(SDL_GetModState()) == KMOD_PRIMARY) {
+            changeTextSize_DocumentWidget_(d, ev->wheel.y > 0 ? 10 : -10);
+            return iTrue;
+        }
+        scroll_DocumentWidget_(d, -3 * ev->wheel.y * lineHeight_Text(default_FontId));
         return iTrue;
     }
     else if (ev->type == SDL_MOUSEMOTION) {
@@ -954,6 +1020,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
     deinit_String(&text);
     /* Presentation of links. */
     if (run->linkId) {
+        const int metaFont = paragraph_FontId;
         /* TODO: Show status of an ongoing media request. */
         const int flags = linkFlags_GmDocument(doc, run->linkId);
         const iRect linkRect = moved_Rect(run->visBounds, origin);
@@ -971,7 +1038,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                     appendFormat_String(
                         &text, "  %s\U0001f7a8", isHover ? white_ColorEscape : "");
                 }
-                drawAlign_Text(uiLabel_FontId,
+                drawAlign_Text(metaFont,
                                add_I2(topRight_Rect(run->bounds), origin),
                                fg,
                                right_Alignment,
@@ -982,7 +1049,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
         else if (run->flags & endOfLine_GmRunFlag &&
                  (mr = findMediaRequest_DocumentWidget_(d->widget, run->linkId)) != NULL) {
             if (!isFinished_GmRequest(mr->req)) {
-                draw_Text(uiLabel_FontId,
+                draw_Text(metaFont,
                           topRight_Rect(linkRect),
                           linkColor_GmDocument(doc, run->linkId),
                           " \u2014 Fetching\u2026");
@@ -1021,7 +1088,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                                     cstr_String(collect_String(format_Date(&date, "%b %d"))));
             }
             if (!isEmpty_String(&str)) {
-                const iInt2 textSize = measure_Text(uiLabel_FontId, cstr_String(&str));
+                const iInt2 textSize = measure_Text(metaFont, cstr_String(&str));
                 int tx = topRight_Rect(linkRect).x;
                 const char *msg = cstr_String(&str);
                 if (tx + textSize.x > right_Rect(d->widgetBounds)) {
@@ -1029,9 +1096,9 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                     fillRect_Paint(&d->paint, (iRect){ init_I2(tx, top_Rect(linkRect)), textSize },
                                    black_ColorId);
                     msg += 4; /* skip the space and dash */
-                    tx += measure_Text(uiLabel_FontId, " \u2014").x / 2;
+                    tx += measure_Text(metaFont, " \u2014").x / 2;
                 }
-                drawAlign_Text(uiLabel_FontId,
+                drawAlign_Text(metaFont,
                                init_I2(tx, top_Rect(linkRect)),
                                fg - 1,
                                left_Alignment,
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index c246c0c4..0ec1c5f8 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -242,7 +242,7 @@ void updateSize_LabelWidget(iLabelWidget *d) {
 
 void init_LabelWidget(iLabelWidget *d, const char *label, int key, int kmods, const char *cmd) {
     init_Widget(&d->widget);
-    d->font = default_FontId;
+    d->font = uiLabel_FontId;
     initCStr_String(&d->label, label);
     if (cmd) {
         initCStr_String(&d->command, cmd);
diff --git a/src/ui/metrics.h b/src/ui/metrics.h
index d59f726a..39fc6415 100644
--- a/src/ui/metrics.h
+++ b/src/ui/metrics.h
@@ -6,4 +6,4 @@ extern int   gap_UI;
 extern int   fontSize_UI;
 extern iInt2 gap2_UI;
 
-void    setPixelRatio_Metrics   (float pixelRatio);
+void    setPixelRatio_Metrics       (float pixelRatio);
diff --git a/src/ui/text.c b/src/ui/text.c
index f562e642..ca3f5fba 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -23,6 +23,7 @@ iDeclareType(Font)
 iDeclareType(Glyph)
 iDeclareTypeConstructionArgs(Glyph, iChar ch)
 
+int gap_Text;                           /* cf. gap_UI in metrics.h */
 int enableHalfPixelGlyphs_Text = iTrue; /* debug setting */
 
 struct Impl_Glyph {
@@ -97,6 +98,7 @@ struct Impl_CacheRow {
 };
 
 struct Impl_Text {
+    float         contentFontSize;
     iFont         fonts[max_FontId];
     SDL_Renderer *render;
     SDL_Texture * cache;
@@ -110,11 +112,84 @@ struct Impl_Text {
 
 static iText text_;
 
+static void initFonts_Text_(iText *d) {
+    const float textSize = fontSize_UI * d->contentFontSize;
+    const struct {
+        const iBlock *ttf;
+        int size;
+        int symbolsFont;
+    } fontData[max_FontId] = {
+        { &fontSourceSansProRegular_Embedded, fontSize_UI,          defaultSymbols_FontId },
+        { &fontFiraMonoRegular_Embedded,      fontSize_UI * 0.866f, defaultSymbols_FontId },
+        { &fontFiraSansRegular_Embedded,      textSize,             symbols_FontId },
+        { &fontFiraMonoRegular_Embedded,      textSize * 0.866f,    smallSymbols_FontId },
+        { &fontFiraMonoRegular_Embedded,      textSize * 0.666f,    smallSymbols_FontId },
+        { &fontFiraSansRegular_Embedded,      textSize * 1.333f,    mediumSymbols_FontId },
+        { &fontFiraSansItalic_Embedded,       textSize,             symbols_FontId },
+        { &fontFiraSansBold_Embedded,         textSize,             symbols_FontId },
+        { &fontFiraSansBold_Embedded,         textSize * 1.333f,    mediumSymbols_FontId },
+        { &fontFiraSansBold_Embedded,         textSize * 1.666f,    largeSymbols_FontId },
+        { &fontFiraSansBold_Embedded,         textSize * 2.000f,    hugeSymbols_FontId },
+        { &fontSymbola_Embedded,              fontSize_UI,          defaultSymbols_FontId },
+        { &fontSymbola_Embedded,              textSize,             symbols_FontId },
+        { &fontSymbola_Embedded,              textSize * 1.333f,    mediumSymbols_FontId },
+        { &fontSymbola_Embedded,              textSize * 1.666f,    largeSymbols_FontId },
+        { &fontSymbola_Embedded,              textSize * 2.000f,    hugeSymbols_FontId },
+        { &fontSymbola_Embedded,              textSize * 0.866f,    smallSymbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     fontSize_UI,          defaultSymbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     textSize,             symbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     textSize * 1.333f,    mediumSymbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     textSize * 1.666f,    largeSymbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     textSize * 2.000f,    hugeSymbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     textSize * 0.866f,    smallSymbols_FontId },
+    };
+    iForIndices(i, fontData) {
+        iFont *font = &d->fonts[i];
+        init_Font(font, fontData[i].ttf, fontData[i].size, fontData[i].symbolsFont);
+        if (fontData[i].ttf == &fontFiraMonoRegular_Embedded) {
+            font->enableKerning = iFalse;
+        }
+    }
+    gap_Text = iRound(gap_UI * d->contentFontSize);
+}
+
+static void deinitFonts_Text_(iText *d) {
+    iForIndices(i, d->fonts) {
+        deinit_Font(&d->fonts[i]);
+    }
+}
+
+static void initCache_Text_(iText *d) {
+    init_Array(&d->cacheRows, sizeof(iCacheRow));
+    const int textSize = d->contentFontSize * fontSize_UI;
+    iAssert(textSize > 0);
+    const iInt2 cacheDims = init_I2(16, 80);
+    d->cacheSize = mul_I2(cacheDims, init1_I2(iMax(textSize, fontSize_UI)));
+    d->cacheRowAllocStep = iMax(2, textSize / 6);
+    /* Allocate initial (empty) rows. These will be assigned actual locations in the cache
+       once at least one glyph is stored. */
+    for (int h = d->cacheRowAllocStep; h <= 2 * textSize; h += d->cacheRowAllocStep) {
+        pushBack_Array(&d->cacheRows, &(iCacheRow){ .height = 0 });
+    }
+    d->cacheBottom = 0;
+    d->cache = SDL_CreateTexture(d->render,
+                                 SDL_PIXELFORMAT_RGBA8888,
+                                 SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
+                                 d->cacheSize.x,
+                                 d->cacheSize.y);
+    SDL_SetTextureBlendMode(d->cache, SDL_BLENDMODE_BLEND);
+}
+
+static void deinitCache_Text_(iText *d) {
+    deinit_Array(&d->cacheRows);
+    SDL_DestroyTexture(d->cache);
+}
+
 void init_Text(SDL_Renderer *render) {
     iText *d = &text_;
-    init_Array(&d->cacheRows, sizeof(iCacheRow));
-    d->ansiEscape = new_RegExp("\\[([0-9;]+)m", 0);
-    d->render = render;
+    d->contentFontSize = 1.0f;
+    d->ansiEscape      = new_RegExp("\\[([0-9;]+)m", 0);
+    d->render          = render;
     /* A grayscale palette for rasterized glyphs. */ {
         SDL_Color colors[256];
         for (int i = 0; i < 256; ++i) {
@@ -123,74 +198,35 @@ void init_Text(SDL_Renderer *render) {
         d->grayscale = SDL_AllocPalette(256);
         SDL_SetPaletteColors(d->grayscale, colors, 0, 256);
     }
-    /* Initialize the glyph cache. */ {
-        d->cacheSize = init_I2(fontSize_UI * 16, fontSize_UI * 64);
-        d->cacheRowAllocStep = fontSize_UI / 6;
-        /* Allocate initial (empty) rows. These will be assigned actual locations in the cache
-           once at least one glyph is stored. */
-        for (int h = d->cacheRowAllocStep; h <= 2 * fontSize_UI; h += d->cacheRowAllocStep) {
-            pushBack_Array(&d->cacheRows, &(iCacheRow){ .height = 0 });
-        }
-        d->cacheBottom = 0;
-        d->cache = SDL_CreateTexture(render,
-                                     SDL_PIXELFORMAT_RGBA8888,
-                                     SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
-                                     d->cacheSize.x,
-                                     d->cacheSize.y);
-        SDL_SetTextureBlendMode(d->cache, SDL_BLENDMODE_BLEND);
-    }
-    /* Load the fonts. */ {
-        const struct {
-            const iBlock *ttf;
-            int size;
-            int symbolsFont;
-        } fontData[max_FontId] = {
-            { &fontSourceSansProRegular_Embedded, fontSize_UI,          symbols_FontId },
-            { &fontFiraSansRegular_Embedded,      fontSize_UI,          symbols_FontId },
-            { &fontFiraMonoRegular_Embedded,      fontSize_UI * 0.866f, smallSymbols_FontId },
-            { &fontFiraMonoRegular_Embedded,      fontSize_UI * 0.666f, smallSymbols_FontId },
-            { &fontFiraSansRegular_Embedded,      fontSize_UI * 1.333f, mediumSymbols_FontId },
-            { &fontFiraSansItalic_Embedded,       fontSize_UI,          symbols_FontId },
-            { &fontFiraSansBold_Embedded,         fontSize_UI,          symbols_FontId },
-            { &fontFiraSansBold_Embedded,         fontSize_UI * 1.333f, mediumSymbols_FontId },
-            { &fontFiraSansBold_Embedded,         fontSize_UI * 1.666f, largeSymbols_FontId },
-            { &fontFiraSansBold_Embedded,         fontSize_UI * 2.000f, hugeSymbols_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 },
-            { &fontNotoEmojiRegular_Embedded,     fontSize_UI * 2.000f, hugeSymbols_FontId },
-            { &fontNotoEmojiRegular_Embedded,     fontSize_UI * 0.866f, smallSymbols_FontId },
-        };
-        iForIndices(i, fontData) {
-            iFont *font = &d->fonts[i];
-            init_Font(font,
-                      fontData[i].ttf,
-                      fontData[i].size,
-                      fontData[i].symbolsFont);
-            if (fontData[i].ttf == &fontFiraMonoRegular_Embedded) {
-                font->enableKerning = iFalse;
-            }
-        }
-    }
+    initCache_Text_(d);
+    initFonts_Text_(d);
 }
 
 void deinit_Text(void) {
     iText *d = &text_;
     SDL_FreePalette(d->grayscale);
-    iForIndices(i, d->fonts) {
-        deinit_Font(&d->fonts[i]);
-    }
-    deinit_Array(&d->cacheRows);
-    SDL_DestroyTexture(d->cache);
+    deinitFonts_Text_(d);
+    deinitCache_Text_(d);
     d->render = NULL;
     iRelease(d->ansiEscape);
 }
 
+void setContentFontSize_Text(float fontSizeFactor) {
+    iAssert(fontSizeFactor > 0);
+    if (iAbs(text_.contentFontSize - fontSizeFactor) > 0.001f) {
+        text_.contentFontSize = fontSizeFactor;
+        resetFonts_Text();
+    }
+}
+
+void resetFonts_Text(void) {
+    iText *d = &text_;
+    deinitFonts_Text_(d);
+    deinitCache_Text_(d);
+    initCache_Text_(d);
+    initFonts_Text_(d);
+}
+
 iLocalDef iFont *font_Text_(enum iFontId id) {
     return &text_.fonts[id];
 }
diff --git a/src/ui/text.h b/src/ui/text.h
index f165c5b4..ea58abb6 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -7,8 +7,9 @@
 
 enum iFontId {
     default_FontId,
+    defaultMonospace_FontId,
     regular_FontId,
-    monospace_FontId,
+    monospace_FontId,    
     monospaceSmall_FontId,
     medium_FontId,
     italic_FontId,
@@ -16,11 +17,13 @@ enum iFontId {
     mediumBold_FontId,
     largeBold_FontId,
     hugeBold_FontId,
+    defaultSymbols_FontId,
     symbols_FontId,
     mediumSymbols_FontId,
     largeSymbols_FontId,
     hugeSymbols_FontId,
     smallSymbols_FontId,
+    defaultEmoji_FontId,
     emoji_FontId,
     mediumEmoji_FontId,
     largeEmoji_FontId,
@@ -28,11 +31,11 @@ enum iFontId {
     smallEmoji_FontId,
     max_FontId,
     /* Meta: */
-    fromSymbolsToEmojiOffset_FontId = 5,
+    fromSymbolsToEmojiOffset_FontId = 6,
     /* UI fonts: */
     uiLabel_FontId     = default_FontId,
     uiShortcuts_FontId = default_FontId,
-    uiInput_FontId     = monospace_FontId,
+    uiInput_FontId     = defaultMonospace_FontId,
     /* Document fonts: */
     paragraph_FontId         = regular_FontId,
     firstParagraph_FontId    = medium_FontId,
@@ -44,9 +47,14 @@ enum iFontId {
     header3_FontId           = medium_FontId,
 };
 
+extern int gap_Text; /* affected by content font size */
+
 void    init_Text           (SDL_Renderer *);
 void    deinit_Text         (void);
 
+void    setContentFontSize_Text (float fontSizeFactor); /* affects all except `default*` fonts */
+void    resetFonts_Text     (void);
+
 int     lineHeight_Text     (int fontId);
 iInt2   measure_Text        (int fontId, const char *text);
 iInt2   measureRange_Text   (int fontId, iRangecc text);
diff --git a/src/ui/window.c b/src/ui/window.c
index 7db0977b..eaab6ac5 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -205,7 +205,7 @@ static void setupUserInterface_Window(iWindow *d) {
                                  iClob(newIcon_LabelWidget("\U0001f513", 0, 0, "server.showcert")),
                                  frameless_WidgetFlag | tight_WidgetFlag);
         setId_Widget(as_Widget(lock), "navbar.lock");
-        setFont_LabelWidget(lock, symbols_FontId);
+        setFont_LabelWidget(lock, defaultSymbols_FontId);
         updateTextCStr_LabelWidget(lock, "\U0001f512");
         iInputWidget *url = new_InputWidget(0);
         setId_Widget(as_Widget(url), "url");
@@ -545,7 +545,7 @@ void draw_Window(iWindow *d) {
 #if 0
     /* Text cache debugging. */ {
         SDL_Texture *cache = glyphCache_Text();
-        SDL_Rect rect = { d->root->rect.size.x - 640, 0, 640, 4 * 640 };
+        SDL_Rect rect = { d->root->rect.size.x - 640, 0, 640, 5 * 640 };
         SDL_SetRenderDrawColor(d->render, 0, 0, 0, 255);
         SDL_RenderFillRect(d->render, &rect);
         SDL_RenderCopy(d->render, glyphCache_Text(), NULL, &rect);