4 files changed, 176 insertions, 64 deletions

diff --git a/src/app.c b/src/app.c
index ac970865..cf9ef425 100644
--- a/src/app.c
+++ b/src/app.c
@@ -184,6 +184,8 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "prefs.hoveroutline.changed arg:%d\n", d->prefs.hoverOutline);
     appendFormat_String(str, "theme.set arg:%d auto:1\n", d->prefs.theme);
     appendFormat_String(str, "ostheme arg:%d\n", d->prefs.useSystemTheme);
+    appendFormat_String(str, "doctheme.dark.set arg:%d\n", d->prefs.docThemeDark);
+    appendFormat_String(str, "doctheme.light.set arg:%d\n", d->prefs.docThemeLight);
     appendFormat_String(str, "saturation.set arg:%d\n", (int) ((d->prefs.saturation * 100) + 0.5f));
     appendFormat_String(str, "proxy.gopher address:%s\n", cstr_String(&d->prefs.gopherProxy));
     appendFormat_String(str, "proxy.http address:%s\n", cstr_String(&d->prefs.httpProxy));
@@ -700,6 +702,18 @@ static void updatePrefsThemeButtons_(iWidget *d) {
     }
 }
 
+static void updateColorThemeButton_(iLabelWidget *button, int theme) {
+    const char *mode    = strstr(cstr_String(id_Widget(as_Widget(button))), ".dark") ? "dark" : "light";
+    const char *command = format_CStr("doctheme.%s.set arg:%d", mode, 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));
+            break;
+        }
+    }
+}
+
 static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
     if (equal_Command(cmd, "prefs.dismiss") || equal_Command(cmd, "preferences")) {
         setUiScale_Window(get_Window(),
@@ -720,6 +734,14 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         destroy_Widget(d);
         return iTrue;
     }
+    else if (equal_Command(cmd, "doctheme.dark.set")) {
+        updateColorThemeButton_(findChild_Widget(d, "prefs.doctheme.dark"), arg_Command(cmd));
+        return iFalse;
+    }
+    else if (equal_Command(cmd, "doctheme.light.set")) {
+        updateColorThemeButton_(findChild_Widget(d, "prefs.doctheme.light"), arg_Command(cmd));
+        return iFalse;
+    }
     else if (equal_Command(cmd, "prefs.ostheme.changed")) {
         postCommandf_App("ostheme arg:%d", arg_Command(cmd));
     }
@@ -908,6 +930,16 @@ iBool handleCommand_App(const char *cmd) {
         d->prefs.useSystemTheme = arg_Command(cmd);
         return iTrue;
     }
+    else if (equal_Command(cmd, "doctheme.dark.set")) {
+        d->prefs.docThemeDark = arg_Command(cmd);
+        postCommand_App("theme.changed auto:1");
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "doctheme.light.set")) {
+        d->prefs.docThemeLight = arg_Command(cmd);
+        postCommand_App("theme.changed auto:1");
+        return iTrue;
+    }
     else if (equal_Command(cmd, "linewidth.set")) {
         d->prefs.lineWidth = iMax(20, arg_Command(cmd));
         postCommand_App("document.layout.changed");
@@ -1060,6 +1092,8 @@ iBool handleCommand_App(const char *cmd) {
             iTrue);
         setToggle_Widget(findChild_Widget(dlg, "prefs.biglede"), d->prefs.bigFirstParagraph);
         setToggle_Widget(findChild_Widget(dlg, "prefs.sideicon"), d->prefs.sideIcon);
+        updateColorThemeButton_(findChild_Widget(dlg, "prefs.doctheme.dark"), d->prefs.docThemeDark);
+        updateColorThemeButton_(findChild_Widget(dlg, "prefs.doctheme.light"), d->prefs.docThemeLight);
         setFlags_Widget(
             findChild_Widget(
                 dlg, format_CStr("prefs.saturation.%d", (int) (d->prefs.saturation * 3.99f))),
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 4240b960..389cbfb2 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -631,12 +631,20 @@ void reset_GmDocument(iGmDocument *d) {
     d->themeSeed = 0;
 }
 
+static float dimLightness_(float hue, float baseOffset) {
+    const float blueDiff = iWrapf(hue - 245, -180, 180);
+    float extra = 0.0f;
+    const float maxDiff = 60;
+    if (iAbs(blueDiff) < maxDiff) {
+        extra = 0.2f * (1.0f - iAbs(blueDiff) / maxDiff);
+    }
+    return baseOffset + extra;
+}
+
 void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
-    const iPrefs *     prefs = prefs_App();
+    const iPrefs *        prefs = prefs_App();
     enum iGmDocumentTheme theme =
         (isDark_ColorTheme(colorTheme_App()) ? prefs->docThemeDark : prefs->docThemeLight);
-//    const iBool        isLightMode =  isLight_ColorTheme(colorTheme_App());
-//    const iBool        isDarkMode  = !isLightMode;
     static const iChar siteIcons[] = {
         0x203b,  0x2042,  0x205c,  0x2182,  0x25ed,  0x2600,  0x2601,  0x2604,  0x2605,  0x2606,
         0x265c,  0x265e,  0x2690,  0x2691,  0x2693,  0x2698,  0x2699,  0x26f0,  0x270e,  0x2728,
@@ -645,20 +653,10 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
         0x1f306, 0x1f308, 0x1f30a, 0x1f319, 0x1f31f, 0x1f320, 0x1f340, 0x1f4cd, 0x1f4e1, 0x1f531,
         0x1f533, 0x1f657, 0x1f659, 0x1f665, 0x1f668, 0x1f66b, 0x1f78b, 0x1f796, 0x1f79c,
     };
-    /* Default colors. */ {
-        if (theme == colorfulDark_GmDocumentTheme) {
-            const iHSLColor base = { 200, 0, 0.15f, 1.0f };
-            setHsl_Color(tmBackground_ColorId, base);
-            set_Color(tmParagraph_ColorId, get_Color(gray75_ColorId));
-            setHsl_Color(tmFirstParagraph_ColorId, addSatLum_HSLColor(base, 0, 0.75f));
-            set_Color(tmQuote_ColorId, get_Color(cyan_ColorId));
-            set_Color(tmPreformatted_ColorId, get_Color(cyan_ColorId));
-            set_Color(tmHeading1_ColorId, get_Color(white_ColorId));
-            setHsl_Color(tmHeading2_ColorId, addSatLum_HSLColor(base, 0.5f, 0.5f));
-            setHsl_Color(tmHeading3_ColorId, addSatLum_HSLColor(base, 1.0f, 0.4f));
-            set_Color(tmBannerBackground_ColorId, get_Color(black_ColorId));
-            set_Color(tmBannerTitle_ColorId, get_Color(white_ColorId));
-            set_Color(tmBannerIcon_ColorId, get_Color(orange_ColorId));
+    /* Default colors. These are used on "about:" pages and local files, for example. */ {
+        /* Link colors are generally the same in all themes. */
+        set_Color(tmBadLink_ColorId, get_Color(red_ColorId));
+        if (isDark_GmDocumentTheme(theme)) {
             set_Color(tmInlineContentMetadata_ColorId, get_Color(cyan_ColorId));
             set_Color(tmLinkText_ColorId, get_Color(white_ColorId));
             set_Color(tmLinkIcon_ColorId, get_Color(cyan_ColorId));
@@ -680,18 +678,6 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             set_Color(tmGopherLinkLastVisitDate_ColorId, get_Color(blue_ColorId));
         }
         else {
-            const iHSLColor base = { 40, 0, 1.0f, 1.0f };
-            setHsl_Color(tmBackground_ColorId, base);
-            set_Color(tmParagraph_ColorId, get_Color(gray25_ColorId));
-            set_Color(tmFirstParagraph_ColorId, get_Color(black_ColorId));
-            set_Color(tmQuote_ColorId, get_Color(brown_ColorId));
-            set_Color(tmPreformatted_ColorId, get_Color(brown_ColorId));
-            set_Color(tmHeading1_ColorId, get_Color(black_ColorId));
-            setHsl_Color(tmHeading2_ColorId, addSatLum_HSLColor(base, 0.15f, -0.7f));
-            setHsl_Color(tmHeading3_ColorId, addSatLum_HSLColor(base, 0.3f, -0.6f));
-            set_Color(tmBannerBackground_ColorId, get_Color(white_ColorId));
-            set_Color(tmBannerTitle_ColorId, get_Color(gray50_ColorId));
-            set_Color(tmBannerIcon_ColorId, get_Color(teal_ColorId));
             set_Color(tmInlineContentMetadata_ColorId, get_Color(brown_ColorId));
             set_Color(tmLinkText_ColorId, get_Color(black_ColorId));
             set_Color(tmLinkIcon_ColorId, get_Color(teal_ColorId));
@@ -712,7 +698,88 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             set_Color(tmGopherLinkDomain_ColorId, get_Color(magenta_ColorId));
             set_Color(tmGopherLinkLastVisitDate_ColorId, get_Color(blue_ColorId));
         }
-        set_Color(tmBadLink_ColorId, get_Color(red_ColorId));
+        /* Set the non-link colors. */
+        if (theme == colorfulDark_GmDocumentTheme) {
+            const iHSLColor base = { 200, 0, 0.15f, 1.0f };
+            setHsl_Color(tmBackground_ColorId, base);
+            set_Color(tmParagraph_ColorId, get_Color(gray75_ColorId));
+            setHsl_Color(tmFirstParagraph_ColorId, addSatLum_HSLColor(base, 0, 0.75f));
+            set_Color(tmQuote_ColorId, get_Color(cyan_ColorId));
+            set_Color(tmPreformatted_ColorId, get_Color(cyan_ColorId));
+            set_Color(tmHeading1_ColorId, get_Color(white_ColorId));
+            setHsl_Color(tmHeading2_ColorId, addSatLum_HSLColor(base, 0.5f, 0.5f));
+            setHsl_Color(tmHeading3_ColorId, addSatLum_HSLColor(base, 1.0f, 0.4f));
+            set_Color(tmBannerBackground_ColorId, get_Color(black_ColorId));
+            set_Color(tmBannerTitle_ColorId, get_Color(white_ColorId));
+            set_Color(tmBannerIcon_ColorId, get_Color(orange_ColorId));
+        }
+        else if (theme == black_GmDocumentTheme) {
+            set_Color(tmBackground_ColorId, get_Color(black_ColorId));
+            set_Color(tmParagraph_ColorId, get_Color(gray75_ColorId));
+            set_Color(tmFirstParagraph_ColorId, mix_Color(get_Color(gray75_ColorId), get_Color(white_ColorId), 0.5f));
+            set_Color(tmQuote_ColorId, get_Color(orange_ColorId));
+            set_Color(tmPreformatted_ColorId, get_Color(orange_ColorId));
+            set_Color(tmHeading1_ColorId, get_Color(cyan_ColorId));
+            set_Color(tmHeading2_ColorId, mix_Color(get_Color(cyan_ColorId), get_Color(white_ColorId), 0.66f));
+            set_Color(tmHeading3_ColorId, get_Color(white_ColorId));
+            set_Color(tmBannerBackground_ColorId, get_Color(black_ColorId));
+            set_Color(tmBannerTitle_ColorId, get_Color(teal_ColorId));
+            set_Color(tmBannerIcon_ColorId, get_Color(teal_ColorId));
+        }
+        else if (theme == gray_GmDocumentTheme) {
+            set_Color(tmBackground_ColorId, mix_Color(get_Color(gray25_ColorId), get_Color(black_ColorId), 0.25f));
+            set_Color(tmParagraph_ColorId, mix_Color(get_Color(gray75_ColorId), get_Color(white_ColorId), 0.0f));
+            set_Color(tmFirstParagraph_ColorId, mix_Color(get_Color(gray75_ColorId), get_Color(white_ColorId), 0.5f));
+            set_Color(tmQuote_ColorId, get_Color(orange_ColorId));
+            set_Color(tmPreformatted_ColorId, get_Color(orange_ColorId));
+            set_Color(tmHeading1_ColorId, get_Color(cyan_ColorId));
+            set_Color(tmHeading2_ColorId, mix_Color(get_Color(cyan_ColorId), get_Color(white_ColorId), 0.66f));
+            set_Color(tmHeading3_ColorId, get_Color(white_ColorId));
+            set_Color(tmBannerBackground_ColorId, mix_Color(get_Color(gray25_ColorId), get_Color(black_ColorId), 0.5f));
+            set_Color(tmBannerTitle_ColorId, get_Color(teal_ColorId));
+            set_Color(tmBannerIcon_ColorId, get_Color(teal_ColorId));
+        }
+        else if (theme == sepia_GmDocumentTheme) {
+            const iHSLColor base = { 40, 0.6f, 0.9f, 1.0f };
+            setHsl_Color(tmBackground_ColorId, base);
+            set_Color(tmParagraph_ColorId, get_Color(black_ColorId));
+            set_Color(tmFirstParagraph_ColorId, get_Color(black_ColorId));
+            set_Color(tmQuote_ColorId, get_Color(brown_ColorId));
+            set_Color(tmPreformatted_ColorId, get_Color(brown_ColorId));
+            set_Color(tmHeading1_ColorId, get_Color(brown_ColorId));
+            set_Color(tmHeading2_ColorId, mix_Color(get_Color(brown_ColorId), get_Color(black_ColorId), 0.5f));
+            set_Color(tmHeading3_ColorId, get_Color(black_ColorId));
+            set_Color(tmBannerBackground_ColorId, mix_Color(get_Color(tmBackground_ColorId), get_Color(brown_ColorId), 0.15f));
+            set_Color(tmBannerTitle_ColorId, get_Color(brown_ColorId));
+            set_Color(tmBannerIcon_ColorId, get_Color(brown_ColorId));
+        }
+        else if (theme == white_GmDocumentTheme) {
+            const iHSLColor base = { 40, 0, 1.0f, 1.0f };
+            setHsl_Color(tmBackground_ColorId, base);
+            set_Color(tmParagraph_ColorId, get_Color(gray25_ColorId));
+            set_Color(tmFirstParagraph_ColorId, get_Color(black_ColorId));
+            set_Color(tmQuote_ColorId, get_Color(brown_ColorId));
+            set_Color(tmPreformatted_ColorId, get_Color(brown_ColorId));
+            set_Color(tmHeading1_ColorId, get_Color(black_ColorId));
+            setHsl_Color(tmHeading2_ColorId, addSatLum_HSLColor(base, 0.15f, -0.7f));
+            setHsl_Color(tmHeading3_ColorId, addSatLum_HSLColor(base, 0.3f, -0.6f));
+            set_Color(tmBannerBackground_ColorId, get_Color(white_ColorId));
+            set_Color(tmBannerTitle_ColorId, get_Color(gray50_ColorId));
+            set_Color(tmBannerIcon_ColorId, get_Color(teal_ColorId));
+        }
+        else if (theme == highContrast_GmDocumentTheme) {
+            set_Color(tmBackground_ColorId, get_Color(white_ColorId));
+            set_Color(tmParagraph_ColorId, get_Color(black_ColorId));
+            set_Color(tmFirstParagraph_ColorId, get_Color(black_ColorId));
+            set_Color(tmQuote_ColorId, get_Color(black_ColorId));
+            set_Color(tmPreformatted_ColorId, get_Color(black_ColorId));
+            set_Color(tmHeading1_ColorId, get_Color(black_ColorId));
+            set_Color(tmHeading2_ColorId, get_Color(black_ColorId));
+            set_Color(tmHeading3_ColorId, get_Color(black_ColorId));
+            set_Color(tmBannerBackground_ColorId, mix_Color(get_Color(gray75_ColorId), get_Color(white_ColorId), 0.75f));
+            set_Color(tmBannerTitle_ColorId, get_Color(black_ColorId));
+            set_Color(tmBannerIcon_ColorId, get_Color(black_ColorId));
+        }
         /* Apply the saturation setting. */
         for (int i = tmFirst_ColorId; i < max_ColorId; i++) {
             if (!isLink_ColorId(i)) {
@@ -819,7 +886,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             set_Color(tmQuote_ColorId, get_Color(tmPreformatted_ColorId));
             set_Color(tmInlineContentMetadata_ColorId, get_Color(tmHeading3_ColorId));
         }
-        else {
+        else if (theme == white_GmDocumentTheme) {
             iHSLColor base    = { hues[primIndex], 1.0f, 0.3f, 1.0f };
             iHSLColor altBase = { altHue, base.sat, base.lum - 0.1f, 1 };
 
@@ -838,39 +905,23 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
             set_Color(tmQuote_ColorId, get_Color(tmPreformatted_ColorId));
             set_Color(tmInlineContentMetadata_ColorId, get_Color(tmHeading3_ColorId));
         }
+        else if (theme == black_GmDocumentTheme || theme == gray_GmDocumentTheme) {
+            const float primHue        = hues[primIndex];
+            const iHSLColor primBright = { primHue, 1, 0.6f, 1 };
+            const iHSLColor primDim    = { primHue, 1, dimLightness_(primHue, theme == black_GmDocumentTheme ? 0.25f : 0.45f), 1};
+            const iHSLColor altBright  = { altHue, 1, 0.6f, 1 };
+            setHsl_Color(tmQuote_ColorId, altBright);
+            setHsl_Color(tmPreformatted_ColorId, altBright);
+            setHsl_Color(tmHeading1_ColorId, primBright);
+            set_Color(tmHeading2_ColorId, mix_Color(get_Color(tmHeading1_ColorId), get_Color(white_ColorId), 0.66f));
+            setHsl_Color(tmBannerTitle_ColorId, primDim);
+            setHsl_Color(tmBannerIcon_ColorId, primDim);
+        }
 
         /* Adjust colors based on light/dark mode. */
         for (int i = tmFirst_ColorId; i < max_ColorId; i++) {
             iHSLColor color = hsl_Color(get_Color(i));
-            if (theme == white_GmDocumentTheme) {
-#if 0
-                if (isLink_ColorId(i)) continue;
-                color.lum = 1.0f - color.lum; /* All colors invert lightness. */
-                if (isRegularText_ColorId(i)) {
-                    /* Darken paragraphs and default state link text. */
-                    color.lum *= 0.5f;
-                }
-                else if (i == tmBackground_ColorId) {
-                    color.sat = (color.sat + 1) / 2;
-                    color.lum += 0.06f;
-                }
-                else if (i == tmHeading3_ColorId) {
-                    color.lum *= 0.75f;
-                }
-                else if (i == tmBannerIcon_ColorId || i == tmBannerTitle_ColorId) {
-                    color.sat = 1.0f;
-                    color.lum = 0.35f;
-                }
-                else if (i == tmBannerBackground_ColorId) {
-                    color = hsl_Color(get_Color(tmBackground_ColorId));
-                }
-                else if (isText_ColorId(i)) {
-                    color.sat = 0.9f;
-                    color.lum = (9 * color.lum + 0.5f) / 10;
-                }
-#endif
-            }
-            else { /* dark mode */
+            if (theme == colorfulDark_GmDocumentTheme) { /* dark mode */
                 if (!isLink_ColorId(i)) {
                     if (isDarkBgSat) {
                         /* Saturate background, desaturate text. */
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 19a6036f..05bf026c 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -36,9 +36,19 @@ iDeclareType(GmRun)
 
 enum iGmDocumentTheme {
     colorfulDark_GmDocumentTheme,
+    colorfulLight_GmDocumentTheme,
+    black_GmDocumentTheme,
+    gray_GmDocumentTheme,
     white_GmDocumentTheme,
+    sepia_GmDocumentTheme,
+    highContrast_GmDocumentTheme,
 };
 
+iLocalDef iBool isDark_GmDocumentTheme(enum iGmDocumentTheme d) {
+    return d == colorfulDark_GmDocumentTheme || d == black_GmDocumentTheme ||
+           d == gray_GmDocumentTheme;
+}
+
 typedef uint16_t iGmLinkId;
 
 enum iGmLinkFlags {
diff --git a/src/ui/util.c b/src/ui/util.c
index c99df1fd..5762f8d1 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -965,10 +965,27 @@ iWidget *makePreferences_Widget(void) {
     }
     /* Colors. */ {
         appendTwoColumnPage_(tabs, "Colors", '3', &headings, &values);
-        addChild_Widget(headings, iClob(makeHeading_Widget("Dark theme:")));
-        addChild_Widget(values, iClob(new_LabelWidget("Colorful", 0, 0, 0)));
-        addChild_Widget(headings, iClob(makeHeading_Widget("Light theme:")));
-        addChild_Widget(values, iClob(new_LabelWidget("White", 0, 0, 0)));
+        for (int i = 0; i < 2; ++i) {
+            const iBool isDark = (i == 0);
+            const char *mode = isDark ? "dark" : "light";
+            const iMenuItem themes[] = {
+                { "Colorful Dark", 0, 0, format_CStr("doctheme.%s.set arg:%d", mode, colorfulDark_GmDocumentTheme) },
+                { "Colorful Light", 0, 0, format_CStr("doctheme.%s.set arg:%d", mode, colorfulLight_GmDocumentTheme) },
+                { "Black", 0, 0, format_CStr("doctheme.%s.set arg:%d", mode, black_GmDocumentTheme) },
+                { "Gray", 0, 0, format_CStr("doctheme.%s.set arg:%d", mode, gray_GmDocumentTheme) },
+                { "Sepia", 0, 0, format_CStr("doctheme.%s.set arg:%d", mode, sepia_GmDocumentTheme) },
+                { "White", 0, 0, format_CStr("doctheme.%s.set arg:%d", mode, white_GmDocumentTheme) },
+                { "High Contrast", 0, 0, format_CStr("doctheme.%s.set arg:%d", mode, highContrast_GmDocumentTheme) },
+            };
+            addChild_Widget(headings, iClob(makeHeading_Widget(isDark ? "Dark theme:" : "Light theme:")));
+            setId_Widget(addChild_Widget(values,
+                                         iClob(makeMenuButton_LabelWidget(
+                                             themes[0].label, themes, iElemCount(themes)))),
+                         format_CStr("prefs.doctheme.%s", mode));
+        }
+        //addChild_Widget(values, iClob(new_LabelWidget("Colorful", 0, 0, 0)));
+//        addChild_Widget(headings, iClob(makeHeading_Widget("Light theme:")));
+//        addChild_Widget(values, iClob(new_LabelWidget("White", 0, 0, 0)));
         addChild_Widget(headings, iClob(makeHeading_Widget("Saturation:")));
         iWidget *sats = new_Widget();
         /* Saturation levels. */ {