Implement XTPUSHSGR, XTPOPSGR

This change adds a new pair of methods to ITermDispatch:
PushGraphicsRendition and PopGraphicsRendition, and then plumbs the
change through AdaptDispatch, TerminalDispatch, ITerminalApi and
TerminalApi.

The stack logic is encapsulated in the SgrStack class, to allow it to be
reused between the two APIs (AdaptDispatch and TerminalDispatch).

Like xterm, only ten levels of nesting are supported.

Pushes beyond ten will remain balanced (an equal number of pops will
take you back down to zero), up to 100 pushes. Beyond 100 pushes, pushes
will become unbalanced (the internal counter will no longer be
incremented). This bound gives the terminal a deterministic way to
recover from garbage--do 101 pops and you know you've cleared the stack
back down to zero.

For partial pushes (see the description of XTPUSHSGR in Issue microsoft#1796),
only attributes that are supported by terminal are saved; others are
ignored (this change does not including adding general support for
double underlines, for example). A partial push of unsupported
parameters results in an "empty" push--the subsequent pop will not
change the current text attributes.

src/buffer/out/TextAttribute.cpp

@@ -119,6 +119,7 @@ void TextAttribute::SetFromLegacy(const WORD wLegacy) noexcept
     BYTE bgIndex = static_cast<BYTE>(wLegacy & BG_ATTRS) >> 4;
     _foreground = TextColor(fgIndex);
     _background = TextColor(bgIndex);
+    //SetMetaAttributes(wLegacy); // [danthom] should this be here?
 }
 
 void TextAttribute::SetLegacyAttributes(const WORD attrs,
@@ -226,17 +227,17 @@ bool TextAttribute::IsRightVerticalDisplayed() const noexcept
     return WI_IsFlagSet(_wAttrLegacy, COMMON_LVB_GRID_RVERTICAL);
 }
 
-void TextAttribute::SetLeftVerticalDisplayed(bool isDisplayed) noexcept
+void TextAttribute::SetLeftVerticalDisplayed(const bool isDisplayed) noexcept
 {
     WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_GRID_LVERTICAL, isDisplayed);
 }
 
-void TextAttribute::SetRightVerticalDisplayed(bool isDisplayed) noexcept
+void TextAttribute::SetRightVerticalDisplayed(const bool isDisplayed) noexcept
 {
     WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_GRID_RVERTICAL, isDisplayed);
 }
 
-void TextAttribute::SetBottomHorizontalDisplayed(bool isDisplayed) noexcept
+void TextAttribute::SetBottomHorizontalDisplayed(const bool isDisplayed) noexcept
 {
     WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_UNDERSCORE, isDisplayed);
 }

src/buffer/out/TextAttribute.hpp

@@ -105,9 +105,9 @@ class TextAttribute final
     bool IsLeftVerticalDisplayed() const noexcept;
     bool IsRightVerticalDisplayed() const noexcept;
 
-    void SetLeftVerticalDisplayed(bool isDisplayed) noexcept;
-    void SetRightVerticalDisplayed(bool isDisplayed) noexcept;
-    void SetBottomHorizontalDisplayed(bool isDisplayed) noexcept;
+    void SetLeftVerticalDisplayed(const bool isDisplayed) noexcept;
+    void SetRightVerticalDisplayed(const bool isDisplayed) noexcept;
+    void SetBottomHorizontalDisplayed(const bool isDisplayed) noexcept;
 
     void SetFromLegacy(const WORD wLegacy) noexcept;
 

src/buffer/out/sgrStack.hpp

@@ -0,0 +1,226 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- sgrStack.hpp
+
+Abstract:
+- Encapsulates logic for the XTPUSHSGR / XTPOPSGR VT control sequences, which save and
+  restore text attributes on a stack.
+
+--*/
+
+#pragma once
+
+#include "TextAttribute.hpp"
+#include "..\..\terminal\adapter\DispatchTypes.hpp"
+
+namespace Microsoft::Console::VirtualTerminal
+{
+    class SgrStack
+    {
+    public:
+        SgrStack() :
+            _numSgrPushes{ 0 }
+        {
+        }
+
+        // Method Description:
+        // - Saves the specified text attributes onto an internal stack.
+        // Arguments:
+        // - currentAttributes - The attributes to save onto the stack.
+        // - rgOptions, cOptions - If not supplied, the full attributes are saved. If
+        //   options are supplied, only the specified parts of currentAttributes are
+        //   saved.
+        // Return Value:
+        // - <none>
+        void Push(const TextAttribute& currentAttributes,
+                  _In_reads_(cOptions) const DispatchTypes::GraphicsOptions* const rgOptions,
+                  const size_t cOptions) noexcept
+        {
+            uint32_t validParts = 0;
+
+            if (cOptions == 0)
+            {
+                // We save all current attributes.
+                validParts = UINT32_MAX;
+            }
+            else
+            {
+                // Each option is encoded as a bit in validParts. Options that aren't
+                // supported are ignored. So if you try to save only unsuppported aspects
+                // of the current text attributes, validParts will be zero, and you'll do
+                // what is effectively an "empty" push (the subsequent pop will not change
+                // the current attributes).
+                for (int i = 0; i < cOptions; i++)
+                {
+                    validParts |= _GraphicsOptionToFlag(rgOptions[i]);
+                }
+            }
+
+            if (_numSgrPushes < _countof(_storedSgrAttributes))
+            {
+                _storedSgrAttributes[_numSgrPushes] = currentAttributes;
+                _validAttributes[_numSgrPushes] = validParts;
+            }
+
+            if (_numSgrPushes < c_MaxBalancedPushes)
+            {
+                _numSgrPushes++;
+            }
+        }
+
+        // Method Description:
+        // - Restores text attributes by removing from the top of the internal stack,
+        //   combining them with the supplied currentAttributes, if appropriate.
+        // Arguments:
+        // - currentAttributes - The current text attributes. If only a portion of
+        //   attributes were saved on the internal stack, then those attributes will be
+        //   combined with the currentAttributes passed in to form the return value.
+        // Return Value:
+        // - The TextAttribute that has been removed from the top of the stack, possibly
+        //   combined with currentAttributes.
+        const TextAttribute Pop(const TextAttribute& currentAttributes) noexcept
+        {
+            TextAttribute result;
+
+            if (_numSgrPushes > 0)
+            {
+                _numSgrPushes--;
+
+                if (_numSgrPushes < _countof(_storedSgrAttributes))
+                {
+                    uint32_t validParts = _validAttributes[_numSgrPushes];
+
+                    if (validParts == UINT32_MAX)
+                    {
+                        return _storedSgrAttributes[_numSgrPushes];
+                    }
+                    else
+                    {
+                        return _CombineWithCurrentAttributes(currentAttributes,
+                                                             _storedSgrAttributes[_numSgrPushes],
+                                                             validParts);
+                    }
+                }
+            }
+
+            return currentAttributes;
+        }
+
+        // Xterm allows the save stack to go ten deep, so we'll follow suit. Pushes after
+        // ten deep will still remain "balanced"--once you pop back down below ten, you'll
+        // restore the appropriate text attributes. However, if you get more than a
+        // hundred pushes deep, we'll stop counting. Why unbalance somebody doing so many
+        // pushes? Putting a bound on it allows us to provide "reset" functionality: at
+        // any given point, you can execute 101 pops and know that you've taken the stack
+        // (push count) to zero. (Then you reset text attributes, and your state is
+        // clean.)
+        static constexpr int c_MaxStoredSgrPushes = 10;
+        static constexpr int c_MaxBalancedPushes = 100;
+
+    private:
+        static constexpr uint32_t _GraphicsOptionToFlag(DispatchTypes::GraphicsOptions option)
+        {
+            int iOption = static_cast<int>(option);
+
+            if (iOption < (sizeof(uint32_t) * 8))
+            {
+                iOption = 1 << iOption;
+            }
+            // else it's a bad parameter; we'll just ignore it
+
+            return iOption;
+        }
+
+        TextAttribute _CombineWithCurrentAttributes(const TextAttribute& currentAttributes,
+                                                    const TextAttribute& savedAttribute,
+                                                    uint32_t validParts) // of savedAttribute
+        {
+            TextAttribute result = currentAttributes;
+
+            // From xterm documentation:
+            //
+            //  CSI # {
+            //  CSI Ps ; Ps # {
+            //            Push video attributes onto stack (XTPUSHSGR), xterm.  The
+            //            optional parameters correspond to the SGR encoding for video
+            //            attributes, except for colors (which do not have a unique SGR
+            //            code):
+            //              Ps = 1  -> Bold.
+            //              Ps = 2  -> Faint.
+            //              Ps = 3  -> Italicized.
+            //              Ps = 4  -> Underlined.
+            //              Ps = 5  -> Blink.
+            //              Ps = 7  -> Inverse.
+            //              Ps = 8  -> Invisible.
+            //              Ps = 9  -> Crossed-out characters.
+            //              Ps = 1 0  -> Foreground color.
+            //              Ps = 1 1  -> Background color.
+            //              Ps = 2 1  -> Doubly-underlined.
+            //
+            //  (some closing braces for people with editors that get thrown off without them: }})
+            //
+            // Attributes that are not currently supported are simply ignored.
+
+            if (_GraphicsOptionToFlag(DispatchTypes::GraphicsOptions::BoldBright) & validParts)
+            {
+                if (savedAttribute.IsBold())
+                {
+                    result.Embolden();
+                }
+                else
+                {
+                    result.Debolden();
+                }
+            }
+
+            if (_GraphicsOptionToFlag(DispatchTypes::GraphicsOptions::Underline) & validParts)
+            {
+                if (savedAttribute.IsUnderline())
+                {
+                    result.EnableUnderline();
+                }
+                else
+                {
+                    result.DisableUnderline();
+                }
+            }
+
+            if (_GraphicsOptionToFlag(DispatchTypes::GraphicsOptions::Negative) & validParts)
+            {
+                if (savedAttribute.IsReverseVideo())
+                {
+                    if (!result.IsReverseVideo())
+                    {
+                        result.Invert();
+                    }
+                }
+                else
+                {
+                    if (result.IsReverseVideo())
+                    {
+                        result.Invert();
+                    }
+                }
+            }
+
+            if (_GraphicsOptionToFlag(DispatchTypes::GraphicsOptions::ForegroundColor) & validParts)
+            {
+                result.SetForegroundFrom(savedAttribute);
+            }
+
+            if (_GraphicsOptionToFlag(DispatchTypes::GraphicsOptions::BackgroundColor) & validParts)
+            {
+                result.SetBackgroundFrom(savedAttribute);
+            }
+
+            return result;
+        }
+
+        int _numSgrPushes; // used as an index into the following arrays
+        TextAttribute _storedSgrAttributes[c_MaxStoredSgrPushes];
+        uint32_t _validAttributes[c_MaxStoredSgrPushes]; // flags that indicate which portions of the attributes are valid
+    };
+}

src/cascadia/TerminalCore/ITerminalApi.hpp

@@ -38,5 +38,8 @@ namespace Microsoft::Terminal::Core
 
         virtual bool SetDefaultForeground(const DWORD dwColor) = 0;
         virtual bool SetDefaultBackground(const DWORD dwColor) = 0;
+
+        virtual bool PushGraphicsRendition(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::GraphicsOptions* options, size_t cOptions) = 0;
+        virtual bool PopGraphicsRendition() = 0;
     };
 }

src/cascadia/TerminalCore/Terminal.hpp

@@ -6,6 +6,7 @@
 #include <conattrs.hpp>
 
 #include "../../buffer/out/textBuffer.hpp"
+#include "../../buffer/out/sgrStack.hpp"
 #include "../../renderer/inc/IRenderData.hpp"
 #include "../../terminal/parser/StateMachine.hpp"
 #include "../../terminal/input/terminalInput.hpp"
@@ -76,6 +77,9 @@ class Microsoft::Terminal::Core::Terminal final :
     bool SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle) override;
     bool SetDefaultForeground(const COLORREF dwColor) override;
     bool SetDefaultBackground(const COLORREF dwColor) override;
+
+    bool PushGraphicsRendition(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::GraphicsOptions* options, size_t cOptions) override;
+    bool PopGraphicsRendition() override;
 #pragma endregion
 
 #pragma region ITerminalInput
@@ -219,4 +223,6 @@ class Microsoft::Terminal::Core::Terminal final :
     const bool _isWordDelimiter(std::wstring_view cellChar) const;
     const COORD _ConvertToBufferCell(const COORD viewportPos) const;
 #pragma endregion
+
+    Microsoft::Console::VirtualTerminal::SgrStack _sgrStack;
 };

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -474,3 +474,31 @@ bool Terminal::SetDefaultBackground(const COLORREF dwColor)
     _buffer->GetRenderTarget().TriggerRedrawAll();
     return true;
 }
+
+// Method Description:
+// - Saves the current text attributes to an internal stack.
+// Arguments:
+// - options, cOptions: if present, specify which portions of the current text attributes
+//   should be saved. Only a small subset of GraphicsOptions are actually supported;
+//   others are ignored. If no options are specified, all attributes are stored.
+// Return Value:
+// - true
+bool Terminal::PushGraphicsRendition(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::GraphicsOptions* options, size_t cOptions)
+{
+    _sgrStack.Push(_buffer->GetCurrentAttributes(), options, cOptions);
+    return true;
+}
+
+// Method Description:
+// - Restores text attributes from the internal stack. If only portions of text attributes
+//   were saved, combines those with the current attributes.
+// Arguments:
+// - <none>
+// Return Value:
+// - true
+bool Terminal::PopGraphicsRendition()
+{
+    TextAttribute current = _buffer->GetCurrentAttributes();
+    _buffer->SetCurrentAttributes(_sgrStack.Pop(current));
+    return true;
+}

src/cascadia/TerminalCore/TerminalDispatch.hpp

@@ -16,6 +16,10 @@ class TerminalDispatch : public Microsoft::Console::VirtualTerminal::TermDispatc
     bool SetGraphicsRendition(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::GraphicsOptions* const rgOptions,
                               const size_t cOptions) override;
 
+    bool PushGraphicsRendition(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::GraphicsOptions* const rgOptions,
+                               const size_t cOptions) override;
+    bool PopGraphicsRendition() override;
+
     virtual bool CursorPosition(const unsigned int uiLine,
                                 const unsigned int uiColumn) override; // CUP
 

src/cascadia/TerminalCore/TerminalDispatchGraphics.cpp

@@ -326,3 +326,14 @@ bool TerminalDispatch::SetGraphicsRendition(const DispatchTypes::GraphicsOptions
     }
     return fSuccess;
 }
+
+bool TerminalDispatch::PushGraphicsRendition(const DispatchTypes::GraphicsOptions* const rgOptions,
+                                             const size_t cOptions)
+{
+    return _terminalApi.PushGraphicsRendition(rgOptions, cOptions);
+}
+
+bool TerminalDispatch::PopGraphicsRendition()
+{
+    return _terminalApi.PopGraphicsRendition();
+}

src/host/outputStream.cpp

@@ -229,7 +229,7 @@ BOOL ConhostInternalGetSet::PrivateSetDefaultAttributes(const bool fForeground,
 // - fBackground - The new attributes contain an update to the background attributes
 // - fMeta - The new attributes contain an update to the meta attributes
 // Return Value:
-// - TRUE if successful (see DoSrvVtSetLegacyAttributes). FALSE otherwise.
+// - TRUE.
 BOOL ConhostInternalGetSet::PrivateSetLegacyAttributes(const WORD wAttr,
                                                        const bool fForeground,
                                                        const bool fBackground,
@@ -239,6 +239,12 @@ BOOL ConhostInternalGetSet::PrivateSetLegacyAttributes(const WORD wAttr,
     return TRUE;
 }
 
+// Routine Description:
+// - Similar to PrivateSetLegacyAttributes, but sets the full fidelity TextAttribute.
+// Arguments:
+// - attributes - new text attributes to apply as default within the console text buffer
+// Return Value:
+// - TRUE.
 BOOL ConhostInternalGetSet::PrivateSetAttributes(const TextAttribute& attributes)
 {
     DoSrvPrivateSetAttributes(_io.GetActiveOutputBuffer(), attributes);

src/terminal/adapter/DispatchTypes.hpp

@@ -25,6 +25,8 @@ namespace Microsoft::Console::VirtualTerminal::DispatchTypes
         // the 2 and 5 entries here are only for the extended graphics options
         // as we do not currently support those features individually
         Negative = 7,
+        ForegroundColor = 10,
+        BackgroundColor = 11,
         UnBold = 22,
         NoUnderline = 24,
         Positive = 27,