Preferences: ANSI escape flags

FG color and font style escapes can be enabled separately. FG color remains enabled by default like before.

29 files changed, 72 insertions, 33 deletions

diff --git a/po/en.po b/po/en.po
index 51bd66b2..0d5707b1 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1507,7 +1507,13 @@ msgid "prefs.boldlink.light"
 msgstr "On Light"
 
 msgid "prefs.gemtext.ansi"
-msgstr "Gemtext ANSI escapes:"
+msgstr "ANSI escapes:"
+
+msgid "prefs.gemtext.ansi.fg"
+msgstr "FG Color"
+
+msgid "prefs.gemtext.ansi.fontstyle"
+msgstr "Font Style"
 
 msgid "prefs.font.smooth"
 msgstr "Smoothing:"
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 332da0e3..cf3250a5 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 429b639f..ffdd4226 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index 2c4b98fc..2c1a4458 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index bc3e23fc..810fe574 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index d158cc92..98234c64 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index 4c21d7f9..abbc9870 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 42b96be1..313e4043 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 8c0010b6..5e909f6c 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 2ee2884f..e7e4a2ea 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 3524454f..b29318ae 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index cbe694c0..80bc275f 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 207f588d..208e9e3c 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 5f8a3aa5..72c26f53 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index 766a7d1c..f5172ada 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index d9b85067..14ca2240 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 9b80ccba..fad37087 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 07f65240..2f8e6beb 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index d0846df8..2b11cbd2 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index 5b12db14..485c2495 100644
--- a/src/app.c
+++ b/src/app.c
@@ -234,6 +234,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     iConstForEach(StringSet, fp, d->prefs.disabledFontPacks) {
         appendFormat_String(str, "fontpack.disable id:%s\n", cstr_String(fp.value));
     }
+    appendFormat_String(str, "ansiescape arg:%d\n", d->prefs.gemtextAnsiEscapes);
     /* TODO: This array belongs in Prefs. It can then be used for command handling as well. */
     const struct {
         const char * id;
@@ -241,7 +242,6 @@ static iString *serializePrefs_App_(const iApp *d) {
     } boolPrefs[] = {
         { "prefs.animate", &d->prefs.uiAnimations },
         { "prefs.font.smooth", &d->prefs.fontSmoothing },
-        { "prefs.gemtext.ansi", &d->prefs.gemtextAnsiEscapes },
         { "prefs.mono.gemini", &d->prefs.monospaceGemini },
         { "prefs.mono.gopher", &d->prefs.monospaceGopher },
         { "prefs.boldlink.visited", &d->prefs.boldLinkVisited },
@@ -2387,8 +2387,16 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
-    else if (equal_Command(cmd, "prefs.gemtext.ansi.changed")) {
-        d->prefs.gemtextAnsiEscapes = arg_Command(cmd) != 0;
+    else if (equal_Command(cmd, "ansiescape")) {
+        d->prefs.gemtextAnsiEscapes = arg_Command(cmd);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "prefs.gemtext.ansi.fg.changed")) {
+        iChangeFlags(d->prefs.gemtextAnsiEscapes, allowFg_AnsiFlag, arg_Command(cmd));
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "prefs.gemtext.ansi.fontstyle.changed")) {
+        iChangeFlags(d->prefs.gemtextAnsiEscapes, allowFontStyle_AnsiFlag, arg_Command(cmd));
         return iTrue;
     }
     else if (equal_Command(cmd, "prefs.mono.gemini.changed") ||
@@ -2822,7 +2830,10 @@ iBool handleCommand_App(const char *cmd) {
         setFlags_Widget(findChild_Widget(dlg, "prefs.boldlink.light"),
                         selected_WidgetFlag,
                         d->prefs.boldLinkLight);
-        setToggle_Widget(findChild_Widget(dlg, "prefs.gemtext.ansi"), d->prefs.gemtextAnsiEscapes);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.gemtext.ansi.fg"),
+                         d->prefs.gemtextAnsiEscapes & allowFg_AnsiFlag);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.gemtext.ansi.fontstyle"),
+                         d->prefs.gemtextAnsiEscapes & allowFontStyle_AnsiFlag);
         setToggle_Widget(findChild_Widget(dlg, "prefs.font.smooth"), d->prefs.fontSmoothing);
         setFlags_Widget(
             findChild_Widget(dlg, format_CStr("prefs.linewidth.%d", d->prefs.lineWidth)),
diff --git a/src/fontpack.c b/src/fontpack.c
index 7ed64113..b521147c 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -105,7 +105,7 @@ static void unload_FontFile_(iFontFile *d) {
 }
 
 void deinit_FontFile(iFontFile *d) {
-    printf("FontFile %p {%s} is DESTROYED\n", d, cstr_String(&d->id));
+//    printf("FontFile %p {%s} is DESTROYED\n", d, cstr_String(&d->id));
     unload_FontFile_(d);
     deinit_Block(&d->sourceData);
     deinit_String(&d->id);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 5d8c6e20..23ebace3 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -78,7 +78,7 @@ iDefineTypeConstruction(GmLink)
 iDeclareType(GmTheme)
 
 struct Impl_GmTheme {
-    iBool ansiEscapesEnabled;
+    int ansiEscapes;
     int colors[max_GmLineType];
     int fonts[max_GmLineType];
 };
@@ -596,7 +596,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         isPreformat = iTrue;
         isFirstText = iFalse;
     }
-    setAnsiEscapesEnabled_Text(d->theme.ansiEscapesEnabled);
+    setAnsiFlags_Text(d->theme.ansiEscapes);
     while (nextSplit_Rangecc(content, "\n", &contentLine)) {
         iRangecc line = contentLine; /* `line` will be trimmed; modifying would confuse `nextSplit_Rangecc` */
         if (*line.end == '\r') {
@@ -1057,7 +1057,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             }
         }
     }
-    setAnsiEscapesEnabled_Text(iTrue);
+    setAnsiFlags_Text(allowAll_AnsiFlag);
 //    printf("[GmDocument] layout size: %zu runs (%zu bytes)\n",
 //           size_Array(&d->layout), size_Array(&d->layout) * sizeof(iGmRun));        
 }
@@ -1977,21 +1977,21 @@ void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int
     set_String(&d->unormSource, source);
     set_String(&d->source, source);
     if (d->format == gemini_SourceFormat) {
-        d->theme.ansiEscapesEnabled = prefs_App()->gemtextAnsiEscapes;
+        d->theme.ansiEscapes = prefs_App()->gemtextAnsiEscapes;
     }
     else if (d->format == markdown_SourceFormat) {
         /* Attempt a conversion to Gemtext when viewing local Markdown files. */
         if (equalCase_Rangecc(urlScheme_String(&d->url), "file")) {
             convertMarkdownToGemtext_GmDocument_(d);
             set_String(&d->unormSource, &d->source); /* use the converted source from now on */
-            d->theme.ansiEscapesEnabled = iTrue; /* escapes are used for styling */
+            d->theme.ansiEscapes = allowAll_AnsiFlag; /* escapes are used for styling */
         }
         else {
             d->format = plainText_SourceFormat; /* just show as plain text */
         }
     }
     else {
-        d->theme.ansiEscapesEnabled = iTrue;
+        d->theme.ansiEscapes = allowAll_AnsiFlag;
     }
     if (isNormalized_GmDocument_(d)) {
         normalize_GmDocument(d);
@@ -2033,7 +2033,7 @@ const iGmPreMeta *preMeta_GmDocument(const iGmDocument *d, uint16_t preId) {
 void render_GmDocument(const iGmDocument *d, iRangei visRangeY, iGmDocumentRenderFunc render,
                        void *context) {
     iBool isInside = iFalse;
-    setAnsiEscapesEnabled_Text(d->theme.ansiEscapesEnabled);
+    setAnsiFlags_Text(d->theme.ansiEscapes);
     /* TODO: Check lookup table for quick starting position. */
     iConstForEach(Array, i, &d->layout) {
         const iGmRun *run = i.value;
@@ -2048,7 +2048,7 @@ void render_GmDocument(const iGmDocument *d, iRangei visRangeY, iGmDocumentRende
             render(context, run);
         }
     }
-    setAnsiEscapesEnabled_Text(iTrue);
+    setAnsiFlags_Text(allowAll_AnsiFlag);
 }
 
 static iBool isValidRun_GmDocument_(const iGmDocument *d, const iGmRun *run) {
@@ -2063,7 +2063,7 @@ const iGmRun *renderProgressive_GmDocument(const iGmDocument *d, const iGmRun *f
                                            size_t maxCount,
                                            iRangei visRangeY, iGmDocumentRenderFunc render,
                                            void *context) {
-    setAnsiEscapesEnabled_Text(d->theme.ansiEscapesEnabled);
+    setAnsiFlags_Text(d->theme.ansiEscapes);
     const iGmRun *run = first;
     while (isValidRun_GmDocument_(d, run)) {
         if ((dir < 0 && bottom_Rect(run->visBounds) < visRangeY.start) ||
@@ -2076,7 +2076,7 @@ const iGmRun *renderProgressive_GmDocument(const iGmDocument *d, const iGmRun *f
         render(context, run);
         run += dir;
     }
-    setAnsiEscapesEnabled_Text(iTrue);
+    setAnsiFlags_Text(allowAll_AnsiFlag);
     return isValidRun_GmDocument_(d, run) ? run : NULL;
 }
 
@@ -2337,8 +2337,8 @@ iChar siteIcon_GmDocument(const iGmDocument *d) {
     return d->siteIcon;
 }
 
-iBool ansiEscapesEnabled_GmDocument(const iGmDocument *d) {
-    return d->theme.ansiEscapesEnabled;
+int ansiEscapes_GmDocument(const iGmDocument *d) {
+    return d->theme.ansiEscapes;
 }
 
 void runBaseAttributes_GmDocument(const iGmDocument *d, const iGmRun *run, int *fontId_out,
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 94a494e8..e6388fbd 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -225,7 +225,7 @@ iRangecc        findText_GmDocument                 (const iGmDocument *, const
 iRangecc        findTextBefore_GmDocument           (const iGmDocument *, const iString *text, const char *before);
 iGmRunRange     findPreformattedRange_GmDocument    (const iGmDocument *, const iGmRun *run);
 
-iBool           ansiEscapesEnabled_GmDocument       (const iGmDocument *);
+int             ansiEscapes_GmDocument              (const iGmDocument *);
 void            runBaseAttributes_GmDocument        (const iGmDocument *, const iGmRun *run,
                                                      int *fontId_out, int *colorId_out);
 
diff --git a/src/prefs.c b/src/prefs.c
index 523ec649..85936131 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -62,7 +62,7 @@ void init_Prefs(iPrefs *d) {
     setCStr_String(&d->strings[monospaceDocumentFont_PrefsString], "iosevka-body");
     d->disabledFontPacks = new_StringSet();
     d->fontSmoothing     = iTrue;
-    d->gemtextAnsiEscapes = iFalse;
+    d->gemtextAnsiEscapes = allowFg_AnsiFlag;
     d->monospaceGemini   = iFalse;
     d->monospaceGopher   = iFalse;
     d->boldLinkVisited   = iTrue;
diff --git a/src/prefs.h b/src/prefs.h
index bbf98370..dc0914a6 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -89,7 +89,7 @@ struct Impl_Prefs {
     /* Style */
     iStringSet *     disabledFontPacks;
     iBool            fontSmoothing;
-    iBool            gemtextAnsiEscapes;
+    int              gemtextAnsiEscapes;
     iBool            monospaceGemini;
     iBool            monospaceGopher;
     iBool            boldLinkVisited;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index cf2dc5da..1039fc2b 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -4839,7 +4839,7 @@ static iBool render_DocumentWidget_(const iDocumentWidget *d, iDrawContext *ctx,
                         }
                     }
                 }
-                setAnsiEscapesEnabled_Text(ansiEscapesEnabled_GmDocument(d->doc));
+                setAnsiFlags_Text(ansiEscapes_GmDocument(d->doc));
                 iConstForEach(PtrSet, r, d->invalidRuns) {
                     const iGmRun *run = *r.value;
                     if (isOverlapping_Rangei(bufRange, ySpan_Rect(run->visBounds))) {
@@ -4847,7 +4847,7 @@ static iBool render_DocumentWidget_(const iDocumentWidget *d, iDrawContext *ctx,
                         drawRun_DrawContext_(ctx, run);
                     }
                 }
-                setAnsiEscapesEnabled_Text(iTrue);
+                setAnsiFlags_Text(allowAll_AnsiFlag);
             }
             endTarget_Paint(p);
             if (prerenderExtra && didDraw) {
diff --git a/src/ui/text.c b/src/ui/text.c
index 6189c334..4baf60d3 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -261,7 +261,7 @@ struct Impl_Text {
     SDL_Palette *  grayscale;
     SDL_Palette *  blackAndWhite; /* unsmoothed glyph palette */
     iRegExp *      ansiEscape;
-    iBool          enableAnsiEscapes;
+    int            ansiFlags;
     int            baseFontId; /* base attributes (for restoring via escapes) */
     int            baseColorId;
 };
@@ -588,8 +588,8 @@ void setBaseAttributes_Text(int fontId, int colorId) {
     activeText_->baseColorId = colorId;
 }
 
-void setAnsiEscapesEnabled_Text(iBool enableAnsiEscapes) {
-    activeText_->enableAnsiEscapes = enableAnsiEscapes;
+void setAnsiFlags_Text(int ansiFlags) {
+    activeText_->ansiFlags = ansiFlags;
 }
 
 void setDocumentFontSize_Text(iText *d, float fontSizeFactor) {
@@ -1057,10 +1057,11 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
             init_RegExpMatch(&m);
             if (match_RegExp(activeText_->ansiEscape, srcPos, d->source.end - srcPos, &m)) {
                 finishRun_AttributedText_(d, &run, pos - 1);
-                if (activeText_->enableAnsiEscapes) {
+                const int ansi = activeText_->ansiFlags;
+                if (ansi) {
                     const iRangecc sequence = capturedRange_RegExpMatch(&m, 1);
                     /* Note: This styling is hardcoded to match `typesetOneLine_RunTypesetter_()`. */
-                    if (equal_Rangecc(sequence, "1")) {
+                    if (ansi & allowFontStyle_AnsiFlag && equal_Rangecc(sequence, "1")) {
                         run.attrib.bold = iTrue;
                         if (d->baseColorId == tmParagraph_ColorId) {
                             setFgColor_AttributedRun_(&run, tmFirstParagraph_ColorId);
@@ -1068,12 +1069,12 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
                         attribFont = font_Text_(fontWithStyle_Text(fontId_Text_(d->baseFont),
                                                                    bold_FontStyle));
                     }
-                    else if (equal_Rangecc(sequence, "3")) {
+                    else if (ansi & allowFontStyle_AnsiFlag && equal_Rangecc(sequence, "3")) {
                         run.attrib.italic = iTrue;
                         attribFont = font_Text_(fontWithStyle_Text(fontId_Text_(d->baseFont),
                                                                    italic_FontStyle));
                     }
-                    else if (equal_Rangecc(sequence, "4")) {
+                    else if (ansi & allowFontStyle_AnsiFlag && equal_Rangecc(sequence, "4")) {
                         run.attrib.monospace = iTrue;
                         setFgColor_AttributedRun_(&run, tmPreformatted_ColorId);
                         attribFont = font_Text_(fontWithFamily_Text(fontId_Text_(d->baseFont),
@@ -1086,7 +1087,7 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
                         attribFont = run.font = d->baseFont;
                         setFgColor_AttributedRun_(&run, d->baseColorId);
                     }
-                    else {
+                    else if (ansi & allowFg_AnsiFlag) {
                         run.fgColor_ = ansiForeground_Color(sequence, tmParagraph_ColorId);
                     }
                 }
diff --git a/src/ui/text.h b/src/ui/text.h
index 36a16e2c..99ddb704 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -149,9 +149,16 @@ enum iAlignment {
     right_Alignment,
 };
 
+enum iAnsiFlag {
+    allowFg_AnsiFlag        = iBit(1),
+    allowBg_AnsiFlag        = iBit(2),
+    allowFontStyle_AnsiFlag = iBit(3),
+    allowAll_AnsiFlag       = 0x7,
+};
+
 void    setOpacity_Text         (float opacity);
 void    setBaseAttributes_Text  (int fontId, int colorId); /* current "normal" text attributes */
-void    setAnsiEscapesEnabled_Text(iBool enableAnsiEscapes);
+void    setAnsiFlags_Text       (int ansiFlags);
 
 void    cache_Text              (int fontId, iRangecc text); /* pre-render glyphs */
 
diff --git a/src/ui/util.c b/src/ui/util.c
index 3b146155..e3759f09 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2549,7 +2549,21 @@ iWidget *makePreferences_Widget(void) {
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.monodoc}")));
             addFontButtons_(values, "monodoc");
             addDialogPadding_(headings, values);
-            addDialogToggle_(headings, values, "${prefs.gemtext.ansi}", "prefs.gemtext.ansi");
+            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.gemtext.ansi}")));
+            iWidget *ansi = new_Widget(); {
+                iWidget *tog;
+                setTextCStr_LabelWidget(
+                    addChild_Widget(ansi, tog = iClob(makeToggle_Widget("prefs.gemtext.ansi.fg"))),
+                    "${prefs.gemtext.ansi.fg}");
+                setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
+                updateSize_LabelWidget((iLabelWidget *) tog);
+                setTextCStr_LabelWidget(
+                    addChild_Widget(ansi, tog = iClob(makeToggle_Widget("prefs.gemtext.ansi.fontstyle"))),
+                    "${prefs.gemtext.ansi.fontstyle}");
+                setFlags_Widget(tog, fixedWidth_WidgetFlag, iFalse);
+                updateSize_LabelWidget((iLabelWidget *) tog);
+            }
+            addChildFlags_Widget(values, iClob(ansi), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
             addDialogToggle_(headings, values, "${prefs.font.smooth}", "prefs.font.smooth");
             addDialogPadding_(headings, values);
             addFontButtons_(values, "ui");