Use VT for COOKED_READ_DATA

NOTICE.md

@@ -325,6 +325,27 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
 
+## ColorBrewer
+**Source**: [https://colorbrewer2.org/](https://colorbrewer2.org/)
+
+### License
+
+```
+Apache-Style Software License for ColorBrewer software and ColorBrewer Color Schemes
+
+Copyright (c) 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania State University.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+```
+
 # Microsoft Open Source
 
 This product also incorporates source code from other Microsoft open source projects, all licensed under the MIT license.

src/buffer/out/cursor.cpp

@@ -20,7 +20,6 @@ Cursor::Cursor(const ULONG ulSize, TextBuffer& parentBuffer) noexcept :
     _fBlinkingAllowed(true),
     _fDelay(false),
     _fIsConversionArea(false),
-    _fIsPopupShown(false),
     _fDelayedEolWrap(false),
     _fDeferCursorRedraw(false),
     _fHaveDeferredCursorRedraw(false),
@@ -66,11 +65,6 @@ bool Cursor::IsConversionArea() const noexcept
     return _fIsConversionArea;
 }
 
-bool Cursor::IsPopupShown() const noexcept
-{
-    return _fIsPopupShown;
-}
-
 bool Cursor::GetDelay() const noexcept
 {
     return _fDelay;
@@ -126,13 +120,6 @@ void Cursor::SetIsConversionArea(const bool fIsConversionArea) noexcept
     _RedrawCursorAlways();
 }
 
-void Cursor::SetIsPopupShown(const bool fIsPopupShown) noexcept
-{
-    // Functionally the same as "Hide cursor"
-    _fIsPopupShown = fIsPopupShown;
-    _RedrawCursorAlways();
-}
-
 void Cursor::SetDelay(const bool fDelay) noexcept
 {
     _fDelay = fDelay;

src/buffer/out/cursor.h

@@ -44,7 +44,6 @@ class Cursor final
     bool IsBlinkingAllowed() const noexcept;
     bool IsDouble() const noexcept;
     bool IsConversionArea() const noexcept;
-    bool IsPopupShown() const noexcept;
     bool GetDelay() const noexcept;
     ULONG GetSize() const noexcept;
     til::point GetPosition() const noexcept;
@@ -61,7 +60,6 @@ class Cursor final
     void SetBlinkingAllowed(const bool fIsOn) noexcept;
     void SetIsDouble(const bool fIsDouble) noexcept;
     void SetIsConversionArea(const bool fIsConversionArea) noexcept;
-    void SetIsPopupShown(const bool fIsPopupShown) noexcept;
     void SetDelay(const bool fDelay) noexcept;
     void SetSize(const ULONG ulSize) noexcept;
     void SetStyle(const ULONG ulSize, const CursorType type) noexcept;
@@ -99,7 +97,6 @@ class Cursor final
     bool _fBlinkingAllowed; //Whether or not the cursor is allowed to blink at all. only set through VT (^[[?12h/l)
     bool _fDelay; // don't blink scursor on next timer message
     bool _fIsConversionArea; // is attached to a conversion area so it doesn't actually need to display the cursor.
-    bool _fIsPopupShown; // if a popup is being shown, turn off, stop blinking.
 
     bool _fDelayedEolWrap; // don't wrap at EOL till the next char comes in.
     til::point _coordDelayedAt; // coordinate the EOL wrap was delayed at.

src/cascadia/TerminalCore/terminalrenderdata.cpp

@@ -48,7 +48,7 @@ til::point Terminal::GetCursorPosition() const noexcept
 bool Terminal::IsCursorVisible() const noexcept
 {
     const auto& cursor = _activeBuffer().GetCursor();
-    return cursor.IsVisible() && !cursor.IsPopupShown();
+    return cursor.IsVisible();
 }
 
 bool Terminal::IsCursorOn() const noexcept

src/host/VtIo.cpp

@@ -497,3 +497,45 @@ bool VtIo::IsResizeQuirkEnabled() const
     }
     return S_OK;
 }
+
+static size_t formatAttributes(char (&buffer)[16], WORD attributes) noexcept
+{
+    const uint8_t rv = WI_IsFlagSet(attributes, COMMON_LVB_REVERSE_VIDEO) ? 7 : 27;
+    uint8_t fg = 39;
+    uint8_t bg = 49;
+
+    // `attributes` of exactly `FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED`
+    // are often used to indicate the default colors in Windows Console applications.
+    // Thus, we translate them to 39/49 (default foreground/background).
+    if ((attributes & (FG_ATTRS | BG_ATTRS)) != (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED))
+    {
+        // The Console API represents colors in BGR order, but VT represents them in RGB order.
+        // This LUT transposes them. This is for foreground colors. Add +10 to get the background ones.
+        static const uint8_t lut[] = { 30, 34, 32, 36, 31, 35, 33, 37, 90, 94, 92, 96, 91, 95, 93, 97 };
+        fg = lut[attributes & 0xf];
+        bg = lut[(attributes >> 4) & 0xf] + 10;
+    }
+
+    return fmt::format_to(&buffer[0], FMT_COMPILE("\x1b[{};{};{}m"), rv, fg, bg) - &buffer[0];
+}
+
+void VtIo::FormatAttributes(std::string& target, WORD attributes)
+{
+    char buf[16];
+    const auto len = formatAttributes(buf, attributes);
+    target.append(buf, len);
+}
+
+void VtIo::FormatAttributes(std::wstring& target, WORD attributes)
+{
+    char buf[16];
+    const auto len = formatAttributes(buf, attributes);
+
+    wchar_t bufW[16];
+    for (size_t i = 0; i < len; i++)
+    {
+        bufW[i] = buf[i];
+    }
+
+    target.append(bufW, len);
+}

src/host/VtIo.hpp

@@ -20,6 +20,9 @@ namespace Microsoft::Console::VirtualTerminal
     class VtIo
     {
     public:
+        static void FormatAttributes(std::string& target, WORD attributes);
+        static void FormatAttributes(std::wstring& target, WORD attributes);
+
         VtIo();
 
         [[nodiscard]] HRESULT Initialize(const ConsoleArguments* const pArgs);

src/host/_stream.cpp

@@ -255,6 +255,11 @@ void WriteCharsLegacy(SCREEN_INFORMATION& screenInfo, const std::wstring_view& t
     }
 }
 
+void WriteCharsVT(SCREEN_INFORMATION& screenInfo, const std::wstring_view& str)
+{
+    screenInfo.GetStateMachine().ProcessString(str);
+}
+
 // Routine Description:
 // - Takes the given text and inserts it into the given screen buffer.
 // Note:

src/host/_stream.h

@@ -20,6 +20,7 @@ Revision History:
 #include "writeData.hpp"
 
 void WriteCharsLegacy(SCREEN_INFORMATION& screenInfo, const std::wstring_view& str, til::CoordType* psScrollY);
+void WriteCharsVT(SCREEN_INFORMATION& screenInfo, const std::wstring_view& str);
 
 // NOTE: console lock must be held when calling this routine
 // String has been translated to unicode at this point.