Fixed ANSI color handling issues

Added the missing BG escapes 100-107, and fixed how the FG is adjusted to keep text legible. Previously it was not considering the actual BG color being applied to a text run.

3 files changed, 33 insertions, 17 deletions

diff --git a/res/about/version.gmi b/res/about/version.gmi
index 63c026ac..438ff950 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,10 @@
 ```
 # Release notes
 
+## 1.10.4
+* Added missing ANSI background color codes 100-107 (high-intensity VGA).
+* Fixed how the ANSI FG color is adjusted to keep text legible on bright backgrounds when BG color is unset.
+
 ## 1.10.3
 * Unix: Added a lagrange(1) manual page.
 * Hide the [+] button on the tab button row if the navbar has a New Tab button.
diff --git a/src/ui/color.c b/src/ui/color.c
index 3c2f0339..824342ae 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -868,23 +868,16 @@ void ansiColors_Color(iRangecc escapeSequence, int fgDefault, int bgDefault,
             case 97:
                 fg = ansi8BitColors_[8 + arg - 90];
                 break;
-        }
-    }
-    /* Ensure legibility if only the foreground color is set. */
-    if (fg.a) {
-        const iHSLColor themeBg = get_HSLColor(tmBackground_ColorId);
-        const float bgLuminance = luma_Color(get_Color(tmBackground_ColorId));
-        if (bgLuminance > 0.4f) {
-            float dim = (bgLuminance - 0.4f);
-            fg.r *= 0.5f * dim;
-            fg.g *= 0.5f * dim;
-            fg.b *= 0.5f * dim;
-        }
-        if (themeBg.sat > 0.15f && themeBg.lum >= 0.5f) {
-            iHSLColor fgHsl = hsl_Color(fg);
-            fgHsl.hue = themeBg.hue;
-            fgHsl.lum = themeBg.lum * 0.5f;
-            fg = rgb_HSLColor(fgHsl);
+            case 100:
+            case 101:
+            case 102:
+            case 103:
+            case 104:
+            case 105:
+            case 106:
+            case 107:
+                bg = ansi8BitColors_[8 + arg - 100];
+                break;
         }
     }
     if (fg.a && fg_out) {
diff --git a/src/ui/text.c b/src/ui/text.c
index 66231348..3fe56b59 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -697,6 +697,25 @@ struct Impl_AttributedRun {
 
 static iColor fgColor_AttributedRun_(const iAttributedRun *d) {
     if (d->fgColor_.a) {
+        /* Ensure legibility if only the foreground color is set. */
+        if (!d->bgColor_.a) {
+            iColor fg = d->fgColor_;
+            const iHSLColor themeBg = get_HSLColor(tmBackground_ColorId);
+            const float bgLuminance = luma_Color(get_Color(tmBackground_ColorId));
+            if (bgLuminance > 0.4f) {
+                float dim = (bgLuminance - 0.4f);
+                fg.r *= 0.5f * dim;
+                fg.g *= 0.5f * dim;
+                fg.b *= 0.5f * dim;
+            }
+            if (themeBg.sat > 0.15f && themeBg.lum >= 0.5f) {
+                iHSLColor fgHsl = hsl_Color(fg);
+                fgHsl.hue = themeBg.hue;
+                fgHsl.lum = themeBg.lum * 0.5f;
+                fg = rgb_HSLColor(fgHsl);
+            }
+            return fg;
+        }        
         return d->fgColor_;
     }
     if (d->attrib.fgColorId == none_ColorId) {