Implement dynamic 8-bit color palettes

Author: lhecker

.github/actions/spelling/allow/apis.txt

@@ -213,6 +213,8 @@ xlocnum
 xloctime
 XMax
 xmemory
+XMVECTOR
+XMVECTORF
 XParse
 xpath
 xstddef

.github/actions/spelling/expect/expect.txt

@@ -198,6 +198,7 @@ codepages
 coinit
 colorizing
 COLORONCOLOR
+colorref
 COLORREFs
 colorschemes
 colorspec

src/cascadia/TerminalControl/ControlCore.cpp

@@ -1022,6 +1022,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 .scheme = renderSettings.GetColorTable(),
                 .foregroundAlias = renderSettings.GetColorAliasIndex(ColorAlias::DefaultForeground),
                 .backgroundAlias = renderSettings.GetColorAliasIndex(ColorAlias::DefaultBackground),
+                .generatePalette = renderSettings.GetRenderMode(Render::RenderSettings::Mode::Generate256Colors),
             };
         }
         _terminal->UpdateColorScheme(scheme);
@@ -1041,6 +1042,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             }
             renderSettings.SetColorAliasIndex(ColorAlias::DefaultForeground, stashedScheme.foregroundAlias);
             renderSettings.SetColorAliasIndex(ColorAlias::DefaultBackground, stashedScheme.backgroundAlias);
+            renderSettings.SetRenderMode(Render::RenderSettings::Mode::Generate256Colors, stashedScheme.generatePalette);
             _renderer->TriggerRedrawAll(true);
         }
         _stashedColorScheme.reset();

src/cascadia/TerminalControl/ControlCore.h

@@ -428,6 +428,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             std::array<COLORREF, TextColor::TABLE_SIZE> scheme;
             size_t foregroundAlias;
             size_t backgroundAlias;
+            bool generatePalette;
         };
         std::unique_ptr<StashedColorScheme> _stashedColorScheme;
 

src/cascadia/TerminalCore/ICoreSettings.idl

@@ -101,6 +101,7 @@ namespace Microsoft.Terminal.Core
         Boolean IntenseIsBold { get; };
         Boolean IntenseIsBright { get; };
         AdjustTextMode AdjustIndistinguishableColors { get; };
+        Boolean GeneratePalette { get; };
 
         // NOTE! When adding something here, make sure to update ControlProperties.h too!
     };

src/cascadia/TerminalCore/Terminal.cpp

@@ -141,6 +141,7 @@ void Terminal::UpdateAppearance(const ICoreAppearance& appearance)
 {
     auto& renderSettings = GetRenderSettings();
 
+    renderSettings.SetRenderMode(RenderSettings::Mode::Generate256Colors, appearance.GeneratePalette());
     renderSettings.SetRenderMode(RenderSettings::Mode::IntenseIsBold, appearance.IntenseIsBold());
     renderSettings.SetRenderMode(RenderSettings::Mode::IntenseIsBright, appearance.IntenseIsBright());
 
@@ -1230,7 +1231,7 @@ void Terminal::_clearPatternTree()
 // Method Description:
 // - Returns the tab color
 // If the starting color exists, its value is preferred
-const std::optional<til::color> Terminal::GetTabColor() const
+const std::optional<til::color> Terminal::GetTabColor()
 {
     if (_startingTabColor.has_value())
     {
@@ -1493,14 +1494,14 @@ std::vector<MarkExtents> Terminal::GetMarkExtents() const
     return _inAltBuffer() ? std::vector<MarkExtents>{} : _activeBuffer().GetMarkExtents();
 }
 
-til::color Terminal::GetColorForMark(const ScrollbarData& markData) const
+til::color Terminal::GetColorForMark(const ScrollbarData& markData)
 {
     if (markData.color.has_value())
     {
         return *markData.color;
     }
 
-    const auto& renderSettings = GetRenderSettings();
+    auto& renderSettings = GetRenderSettings();
 
     switch (markData.category)
     {

src/cascadia/TerminalCore/Terminal.hpp

@@ -166,7 +166,7 @@ class Microsoft::Terminal::Core::Terminal final :
 
     void ClearMark();
     void ClearAllMarks();
-    til::color GetColorForMark(const ScrollbarData& markData) const;
+    til::color GetColorForMark(const ScrollbarData& markData);
 
 #pragma region ITerminalInput
     // These methods are defined in Terminal.cpp
@@ -206,7 +206,7 @@ class Microsoft::Terminal::Core::Terminal final :
     std::wstring GetHyperlinkCustomId(uint16_t id) const override;
     std::vector<size_t> GetPatternId(const til::point location) const override;
 
-    std::pair<COLORREF, COLORREF> GetAttributeColors(const TextAttribute& attr) const noexcept override;
+    std::pair<COLORREF, COLORREF> GetAttributeColors(const TextAttribute& attr) noexcept override;
     std::span<const til::point_span> GetSelectionSpans() const noexcept override;
     std::span<const til::point_span> GetSearchHighlights() const noexcept override;
     const til::point_span* GetSearchHighlightFocused() const noexcept override;
@@ -238,7 +238,7 @@ class Microsoft::Terminal::Core::Terminal final :
 
     void UpdatePatternsUnderLock();
 
-    const std::optional<til::color> GetTabColor() const;
+    const std::optional<til::color> GetTabColor();
 
     const size_t GetTaskbarState() const noexcept;
     const size_t GetTaskbarProgress() const noexcept;
@@ -311,7 +311,7 @@ class Microsoft::Terminal::Core::Terminal final :
     til::point SelectionEndForRendering() const;
     SelectionEndpoint SelectionEndpointTarget() const noexcept;
 
-    TextCopyData RetrieveSelectedTextFromBuffer(const bool singleLine, const bool withControlSequences = false, const bool html = false, const bool rtf = false) const;
+    TextCopyData RetrieveSelectedTextFromBuffer(const bool singleLine, const bool withControlSequences = false, const bool html = false, const bool rtf = false);
 #pragma endregion
 
 #ifndef NDEBUG

src/cascadia/TerminalCore/TerminalSelection.cpp

@@ -959,7 +959,7 @@ void Terminal::ClearSelection()
 // Return Value:
 // - Plain and formatted selected text from buffer. Empty string represents no data for that format.
 // - If extended to multiple lines, each line is separated by \r\n
-Terminal::TextCopyData Terminal::RetrieveSelectedTextFromBuffer(const bool singleLine, const bool withControlSequences, const bool html, const bool rtf) const
+Terminal::TextCopyData Terminal::RetrieveSelectedTextFromBuffer(const bool singleLine, const bool withControlSequences, const bool html, const bool rtf)
 {
     TextCopyData data;
 

src/cascadia/TerminalCore/terminalrenderdata.cpp

@@ -99,7 +99,7 @@ std::vector<size_t> Terminal::GetPatternId(const til::point location) const
     return {};
 }
 
-std::pair<COLORREF, COLORREF> Terminal::GetAttributeColors(const TextAttribute& attr) const noexcept
+std::pair<COLORREF, COLORREF> Terminal::GetAttributeColors(const TextAttribute& attr) noexcept
 {
     return GetRenderSettings().GetAttributeColors(attr);
 }

src/cascadia/TerminalSettingsAppAdapterLib/TerminalSettings.cpp

@@ -230,21 +230,21 @@ namespace winrt::Microsoft::Terminal::Settings
             break;
         }
 
-        if (appearance.Foreground())
+        if (const auto v = appearance.Foreground())
         {
-            _DefaultForeground = til::color{ appearance.Foreground().Value() };
+            _DefaultForeground = til::color{ v.Value() };
         }
-        if (appearance.Background())
+        if (const auto v = appearance.Background())
         {
-            _DefaultBackground = til::color{ appearance.Background().Value() };
+            _DefaultBackground = til::color{ v.Value() };
         }
-        if (appearance.SelectionBackground())
+        if (const auto v = appearance.SelectionBackground())
         {
-            _SelectionBackground = til::color{ appearance.SelectionBackground().Value() };
+            _SelectionBackground = til::color{ v.Value() };
         }
-        if (appearance.CursorColor())
+        if (const auto v = appearance.CursorColor())
         {
-            _CursorColor = til::color{ appearance.CursorColor().Value() };
+            _CursorColor = til::color{ v.Value() };
         }
 
         if (const auto backgroundImage{ appearance.BackgroundImagePath() })
@@ -272,6 +272,7 @@ namespace winrt::Microsoft::Terminal::Settings
         _IntenseIsBright = WI_IsFlagSet(appearance.IntenseTextStyle(), Microsoft::Terminal::Settings::Model::IntenseStyle::Bright);
 
         _AdjustIndistinguishableColors = appearance.AdjustIndistinguishableColors();
+        _GeneratePalette = appearance.GeneratePalette();
         _Opacity = appearance.Opacity();
         _UseAcrylic = appearance.UseAcrylic();
     }