9 files changed, 89 insertions, 29 deletions

diff --git a/src/app.c b/src/app.c
index d7cedc42..5971f0ed 100644
--- a/src/app.c
+++ b/src/app.c
@@ -179,6 +179,8 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "prefs.dialogtab arg:%d\n", d->prefs.dialogTab);
     appendFormat_String(str, "font.set arg:%d\n", d->prefs.font);
     appendFormat_String(str, "headingfont.set arg:%d\n", d->prefs.headingFont);
+    appendFormat_String(str, "prefs.mono.gemini.changed arg:%d\n", d->prefs.monospaceGemini);
+    appendFormat_String(str, "prefs.mono.gopher.changed arg:%d\n", d->prefs.monospaceGopher);
     appendFormat_String(str, "zoom.set arg:%d\n", d->prefs.zoomPercent);
     appendFormat_String(str, "smoothscroll arg:%d\n", d->prefs.smoothScrolling);
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
@@ -724,7 +726,7 @@ static void updateColorThemeButton_(iLabelWidget *button, int theme) {
     iForEach(ObjectList, i, children_Widget(findChild_Widget(as_Widget(button), "menu"))) {
         iLabelWidget *item = i.object;
         if (!cmp_String(command_LabelWidget(item), command)) {
-            updateText_LabelWidget(button, label_LabelWidget(item));
+            updateText_LabelWidget(button, text_LabelWidget(item));
             break;
         }
     }
@@ -987,6 +989,29 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("document.layout.changed");
         return iTrue;
     }
+    else if (equal_Command(cmd, "prefs.mono.gemini.changed") ||
+             equal_Command(cmd, "prefs.mono.gopher.changed")) {
+        const iBool isSet = (arg_Command(cmd) != 0);
+        setFreezeDraw_Window(d->window, iTrue);
+        if (startsWith_CStr(cmd, "prefs.mono.gemini")) {
+            d->prefs.monospaceGemini = isSet;
+        }
+        else {
+            d->prefs.monospaceGopher = isSet;
+        }
+        resetFonts_Text(); /* clear the glyph cache */
+        postCommand_App("font.changed");
+        postCommand_App("window.unfreeze");
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "prefs.mono.gopher.changed")) {
+        setFreezeDraw_Window(d->window, iTrue);
+        d->prefs.monospaceGopher = arg_Command(cmd) != 0;
+        resetFonts_Text(); /* clear the glyph cache */
+        postCommand_App("font.changed");
+        postCommand_App("window.unfreeze");
+        return iTrue;
+    }
     else if (equal_Command(cmd, "prefs.biglede.changed")) {
         d->prefs.bigFirstParagraph = arg_Command(cmd) != 0;
         postCommand_App("document.layout.changed");
@@ -1137,6 +1162,12 @@ iBool handleCommand_App(const char *cmd) {
             findChild_Widget(dlg, format_CStr("prefs.headingfont.%d", d->prefs.headingFont)),
             selected_WidgetFlag,
             iTrue);
+        setFlags_Widget(findChild_Widget(dlg, "prefs.mono.gemini"),
+                        selected_WidgetFlag,
+                        d->prefs.monospaceGemini);
+        setFlags_Widget(findChild_Widget(dlg, "prefs.mono.gopher"),
+                        selected_WidgetFlag,
+                        d->prefs.monospaceGopher);
         setFlags_Widget(
             findChild_Widget(dlg, format_CStr("prefs.linewidth.%d", d->prefs.lineWidth)),
             selected_WidgetFlag,
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 4e8b5ace..923c20c9 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -235,24 +235,29 @@ static void clearLinks_GmDocument_(iGmDocument *d) {
     clear_PtrArray(&d->links);
 }
 
-#if 0
-static iBool isGopher_GmDocument_(const iGmDocument *d) {
-    return equalCase_Rangecc(urlScheme_String(&d->url), "gopher");
+static iBool isForcedMonospace_GmDocument_(const iGmDocument *d) {
+    const iRangecc scheme = urlScheme_String(&d->url);
+    if (equalCase_Rangecc(scheme, "gemini")) {
+        return prefs_App()->monospaceGemini;
+    }
+    if (equalCase_Rangecc(scheme, "gopher")) {
+        return prefs_App()->monospaceGopher;
+    }
+    return iFalse;
 }
-#endif
 
 static void doLayout_GmDocument_(iGmDocument *d) {
-    const iBool isGemini = iTrue; // !isGopher_GmDocument_(d);
+    const iBool isMono = isForcedMonospace_GmDocument_(d);
     /* TODO: Collect these parameters into a GmTheme. */
     const int fonts[max_GmLineType] = {
-        isGemini ? paragraph_FontId : preformatted_FontId,
-        isGemini ? paragraph_FontId : preformatted_FontId, /* bullet */
+        isMono ? regularMonospace_FontId : paragraph_FontId,
+        isMono ? regularMonospace_FontId : paragraph_FontId, /* bullet */
         preformatted_FontId,
-        quote_FontId,
-        isGemini ? heading1_FontId : preformatted_FontId,
-        isGemini ? heading2_FontId : preformatted_FontId,
-        isGemini ? heading3_FontId : preformatted_FontId,
-        regular_FontId,
+        isMono ? regularMonospace_FontId : quote_FontId,
+        heading1_FontId,
+        heading2_FontId,
+        heading3_FontId,
+        isMono ? regularMonospace_FontId : regular_FontId,
     };
     static const int colors[max_GmLineType] = {
         tmParagraph_ColorId,
@@ -292,7 +297,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     const iRangecc   content       = range_String(&d->source);
     iRangecc         contentLine   = iNullRange;
     iInt2            pos           = zero_I2();
-    iBool            isFirstText   = isGemini && prefs->bigFirstParagraph;
+    iBool            isFirstText   = prefs->bigFirstParagraph;
     iBool            addQuoteIcon  = prefs->quoteIcon;
     iBool            isPreformat   = iFalse;
     iRangecc         preAltText    = iNullRange;
@@ -363,7 +368,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 addSiteBanner = iFalse; /* overrides the banner */
                 continue;
             }
-            run.font = preFont;
+            run.font = (d->format == plainText_GmDocumentFormat ? regularMonospace_FontId : preFont);
             indent = indents[type];
         }
         if (addSiteBanner) {
@@ -463,6 +468,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                                        : link->flags & mailto_GmLinkFlag
                                              ? envelope
                                              : link->flags & remote_GmLinkFlag ? globe : arrow);
+            icon.font = regular_FontId;
             if (link->flags & remote_GmLinkFlag) {
                 icon.visBounds.pos.x -= gap_Text / 2;
             }
@@ -477,7 +483,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         /* Special formatting for the first paragraph (e.g., subtitle, introduction, or lede). */
         int bigCount = 0;
         if (type == text_GmLineType && isFirstText) {
-            run.font = firstParagraph_FontId;
+            if (!isMono) run.font = firstParagraph_FontId;
             run.color = tmFirstParagraph_ColorId;
             bigCount = 15; /* max lines -- what if the whole document is one paragraph? */
             isFirstText = iFalse;
@@ -520,7 +526,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             trimStart_Rangecc(&runLine);
             pos.y += lineHeight_Text(run.font);
             if (--bigCount == 0) {
-                run.font = paragraph_FontId;
+                run.font = fonts[text_GmLineType];
                 run.color = colors[text_GmLineType];
             }
         }
diff --git a/src/prefs.c b/src/prefs.c
index 815dac52..5c73833e 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -33,6 +33,8 @@ void init_Prefs(iPrefs *d) {
     d->quoteIcon         = iTrue;
     d->font              = nunito_TextFont;
     d->headingFont       = nunito_TextFont;
+    d->monospaceGemini   = iFalse;
+    d->monospaceGopher   = iFalse;
     d->lineWidth         = 40;
     d->bigFirstParagraph = iTrue;
     d->sideIcon          = iTrue;
diff --git a/src/prefs.h b/src/prefs.h
index bf642600..2488d43b 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -46,6 +46,8 @@ struct Impl_Prefs {
     /* Content */
     enum iTextFont font;
     enum iTextFont headingFont;
+    iBool monospaceGemini;
+    iBool monospaceGopher;
     int lineWidth;
     iBool bigFirstParagraph;
     iBool forceLineWrap;
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 9c489123..1f0e7b4d 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -330,7 +330,7 @@ void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
     updateSize_LabelWidget(d);
 }
 
-const iString *label_LabelWidget(const iLabelWidget *d) {
+const iString *text_LabelWidget(const iLabelWidget *d) {
     return &d->label;
 }
 
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 066c9b33..5b2efc42 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -38,7 +38,7 @@ void    updateSize_LabelWidget      (iLabelWidget *);
 void    updateText_LabelWidget      (iLabelWidget *, const iString *text); /* not resized */
 void    updateTextCStr_LabelWidget  (iLabelWidget *, const char *text); /* not resized */
 
-const iString *label_LabelWidget    (const iLabelWidget *);
+const iString *text_LabelWidget    (const iLabelWidget *);
 const iString *command_LabelWidget  (const iLabelWidget *);
 
 iLabelWidget *newKeyMods_LabelWidget(const char *label, int key, int kmods, const char *command);
diff --git a/src/ui/text.c b/src/ui/text.c
index 1ff3fb12..15959150 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -213,15 +213,17 @@ static void initFonts_Text_(iText *d) {
         { &fontFiraMonoRegular_Embedded,      fontSize_UI * 0.866f, 1.0f, defaultSymbols_FontId },
         { &fontSourceSansProRegular_Embedded, textSize,             scaling, symbols_FontId },
         /* content fonts */
-        { regularFont,                        textSize,             scaling, symbols_FontId },
-        { &fontFiraMonoRegular_Embedded,      monoSize,             1.0f,    monospaceSymbols_FontId },
-        { &fontFiraMonoRegular_Embedded,      monoSize * 0.750f,    1.0f,    monospaceSmallSymbols_FontId },
-        { regularFont,                        textSize * 1.200f,    scaling, mediumSymbols_FontId },
-        { h3Font,                             textSize * 1.333f,    scaling, bigSymbols_FontId },
-        { italicFont,                         textSize,             scaling, symbols_FontId },
+        { regularFont,                        textSize,             scaling,     symbols_FontId },
+        { &fontFiraMonoRegular_Embedded,      monoSize,             1.0f,        monospaceSymbols_FontId },
+        { &fontFiraMonoRegular_Embedded,      monoSize * 0.750f,    1.0f,        monospaceSmallSymbols_FontId },
+        { regularFont,                        textSize * 1.200f,    scaling,     mediumSymbols_FontId },
+        { h3Font,                             textSize * 1.333f,    scaling,     bigSymbols_FontId },
+        { italicFont,                         textSize,             scaling,     symbols_FontId },
         { h12Font,                            textSize * 1.666f,    h123Scaling, largeSymbols_FontId },
         { h12Font,                            textSize * 2.000f,    h123Scaling, hugeSymbols_FontId },
         { lightFont,                          textSize * 1.666f,    scaling,     largeSymbols_FontId },
+        /* monospace content fonts */
+        { &fontFiraMonoRegular_Embedded,      textSize,             0.8f, symbols_FontId },
         /* symbol fonts */
         { &fontSymbola_Embedded,              fontSize_UI,          1.0f, defaultSymbols_FontId },
         { &fontSymbola_Embedded,              fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId },
diff --git a/src/ui/text.h b/src/ui/text.h
index 25312973..e95b75d2 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -44,7 +44,9 @@ enum iFontId {
     italic_FontId,
     largeBold_FontId,
     hugeBold_FontId,
-    largeLight_FontId,    
+    largeLight_FontId,
+    /* monospace content fonts */
+    regularMonospace_FontId,
     /* symbol fonts */
     defaultSymbols_FontId,
     defaultMediumSymbols_FontId,
diff --git a/src/ui/util.c b/src/ui/util.c
index bf044c03..98f0fb18 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -907,8 +907,15 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg, const char *lab
 void setToggle_Widget(iWidget *d, iBool active) {
     if (d) {
         setFlags_Widget(d, selected_WidgetFlag, active);
-        updateText_LabelWidget((iLabelWidget *) d,
-                               collectNewFormat_String("%s", isSelected_Widget(d) ? "YES" : "NO"));
+        iLabelWidget *label = (iLabelWidget *) d;
+        if (!cmp_String(text_LabelWidget(label), "YES") ||
+            !cmp_String(text_LabelWidget(label), "NO")) {
+            updateText_LabelWidget((iLabelWidget *) d,
+                                   collectNewFormat_String("%s", isSelected_Widget(d) ? "YES" : "NO"));
+        }
+        else {
+            refresh_Widget(d);
+        }
     }
 }
 
@@ -1067,6 +1074,14 @@ iWidget *makePreferences_Widget(void) {
             fonts = new_Widget();
             addFontButtons_(fonts, "font");
             addChildFlags_Widget(values, iClob(fonts), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+            addChild_Widget(headings, iClob(makeHeading_Widget("Monospace body:")));
+            iWidget *mono = new_Widget();
+            /* TODO: Needs labels! */
+            setTextCStr_LabelWidget(
+                addChild_Widget(mono, iClob(makeToggle_Widget("prefs.mono.gemini"))), "Gemini");
+            setTextCStr_LabelWidget(
+                addChild_Widget(mono, iClob(makeToggle_Widget("prefs.mono.gopher"))), "Gopher");
+            addChildFlags_Widget(values, iClob(mono), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         }
         addChild_Widget(headings, iClob(makePadding_Widget(2 * gap_UI)));
         addChild_Widget(values, iClob(makePadding_Widget(2 * gap_UI)));
@@ -1173,7 +1188,7 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
                           url,
                           title,
                           tags,
-                          first_String(label_LabelWidget(findChild_Widget(editor, "bmed.icon"))));
+                          first_String(text_LabelWidget(findChild_Widget(editor, "bmed.icon"))));
             postCommand_App("bookmarks.changed");
         }
         destroy_Widget(editor);