Color palette theming

1 files changed, 16 insertions, 6 deletions

diff --git a/src/ui/color.h b/src/ui/color.h
index 11feb63e..c3cacf77 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -19,6 +19,7 @@ enum iColorId {
     magenta_ColorId,
     blue_ColorId,
     green_ColorId,
+
     /* content theme colors */
     tmFirst_ColorId,
     tmBackground_ColorId = tmFirst_ColorId,
@@ -29,6 +30,11 @@ enum iColorId {
     tmHeader1_ColorId,
     tmHeader2_ColorId,
     tmHeader3_ColorId,
+    tmBannerBackground_ColorId,
+    tmBannerTitle_ColorId,
+    tmBannerIcon_ColorId,
+    tmInlineContentMetadata_ColorId,
+    tmBadLink_ColorId,
 
     tmLinkIcon_ColorId,
     tmLinkIconVisited_ColorId,
@@ -51,10 +57,6 @@ enum iColorId {
     tmGopherLinkDomain_ColorId,
     tmGopherLinkLastVisitDate_ColorId,
 
-    tmInlineContentMetadata_ColorId,
-    tmBannerBackground_ColorId,
-    tmBannerTitle_ColorId,
-    tmBannerIcon_ColorId,
     max_ColorId
 };
 
@@ -87,11 +89,19 @@ struct Impl_HSLColor {
     float hue, sat, lum, a;
 };
 
+iHSLColor       hsl_Color       (iColor);
+iColor          rgb_HSLColor    (iHSLColor);
+
+iHSLColor       setSat_HSLColor     (iHSLColor, float sat);
+iHSLColor       setLum_HSLColor     (iHSLColor, float lum);
+iHSLColor       addSatLum_HSLColor  (iHSLColor, float sat, float lum);
+
 iColor          get_Color       (int color);
 void            set_Color       (int color, iColor rgba);
 
-iHSLColor       hsl_Color       (iColor rgba);
-iColor          fromHsl_Color   (iHSLColor hsl);
+iLocalDef void setHsl_Color(int color, iHSLColor hsl) {
+    set_Color(color, rgb_HSLColor(hsl));
+}
 
 iColor          ansi_Color      (iRangecc escapeSequence, int fallback);
 const char *    escape_Color    (int color);