From e8422a36c0f4a4638193293ea08c5d27e88e51aa Mon Sep 17 00:00:00 2001
From: Pankaj Bhojwani <pankaj.d.bhoj@gmail.com>
Date: Thu, 30 Jul 2020 10:22:00 -0400
Subject: [PATCH] Implements SetCursorColor

---
 src/cascadia/TerminalCore/ITerminalApi.hpp     | 1 +
 src/cascadia/TerminalCore/Terminal.hpp         | 1 +
 src/cascadia/TerminalCore/TerminalApi.cpp      | 8 ++++++++
 src/cascadia/TerminalCore/TerminalDispatch.cpp | 7 +++++++
 src/cascadia/TerminalCore/TerminalDispatch.hpp | 1 +
 5 files changed, 18 insertions(+)

diff --git a/src/cascadia/TerminalCore/ITerminalApi.hpp b/src/cascadia/TerminalCore/ITerminalApi.hpp
index d92a536c9d6..98945de1cfe 100644
--- a/src/cascadia/TerminalCore/ITerminalApi.hpp
+++ b/src/cascadia/TerminalCore/ITerminalApi.hpp
@@ -39,6 +39,7 @@ namespace Microsoft::Terminal::Core
         virtual bool SetColorTableEntry(const size_t tableIndex, const DWORD color) noexcept = 0;
 
         virtual bool SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle) noexcept = 0;
+        virtual bool SetCursorColor(const DWORD color) noexcept = 0;
 
         virtual bool SetDefaultForeground(const DWORD color) noexcept = 0;
         virtual bool SetDefaultBackground(const DWORD color) noexcept = 0;
diff --git a/src/cascadia/TerminalCore/Terminal.hpp b/src/cascadia/TerminalCore/Terminal.hpp
index 64232ef963d..ac8d59d3e02 100644
--- a/src/cascadia/TerminalCore/Terminal.hpp
+++ b/src/cascadia/TerminalCore/Terminal.hpp
@@ -93,6 +93,7 @@ class Microsoft::Terminal::Core::Terminal final :
     bool SetWindowTitle(std::wstring_view title) noexcept override;
     bool SetColorTableEntry(const size_t tableIndex, const COLORREF color) noexcept override;
     bool SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle) noexcept override;
+    bool SetCursorColor(const COLORREF color) noexcept override;
     bool SetDefaultForeground(const COLORREF color) noexcept override;
     bool SetDefaultBackground(const COLORREF color) noexcept override;
 
diff --git a/src/cascadia/TerminalCore/TerminalApi.cpp b/src/cascadia/TerminalCore/TerminalApi.cpp
index 4c7f27a88ea..1e27a59702c 100644
--- a/src/cascadia/TerminalCore/TerminalApi.cpp
+++ b/src/cascadia/TerminalCore/TerminalApi.cpp
@@ -64,6 +64,14 @@ COORD Terminal::GetCursorPosition() noexcept
     return newPos;
 }
 
+bool Terminal::SetCursorColor(const COLORREF color) noexcept
+try
+{
+    _buffer->GetCursor().SetColor(color);
+    return true;
+}
+CATCH_LOG_RETURN_FALSE()
+
 // Method Description:
 // - Moves the cursor down one line, and possibly also to the leftmost column.
 // Arguments:
diff --git a/src/cascadia/TerminalCore/TerminalDispatch.cpp b/src/cascadia/TerminalCore/TerminalDispatch.cpp
index cf79384f70c..f119cc266c7 100644
--- a/src/cascadia/TerminalCore/TerminalDispatch.cpp
+++ b/src/cascadia/TerminalCore/TerminalDispatch.cpp
@@ -146,6 +146,13 @@ try
 }
 CATCH_LOG_RETURN_FALSE()
 
+bool TerminalDispatch::SetCursorColor(const DWORD color) noexcept
+try
+{
+    return _terminalApi.SetCursorColor(color);
+}
+CATCH_LOG_RETURN_FALSE()
+
 bool TerminalDispatch::SetClipboard(std::wstring_view content) noexcept
 try
 {
diff --git a/src/cascadia/TerminalCore/TerminalDispatch.hpp b/src/cascadia/TerminalCore/TerminalDispatch.hpp
index 640f8eb242f..4f3dc8e7371 100644
--- a/src/cascadia/TerminalCore/TerminalDispatch.hpp
+++ b/src/cascadia/TerminalCore/TerminalDispatch.hpp
@@ -35,6 +35,7 @@ class TerminalDispatch : public Microsoft::Console::VirtualTerminal::TermDispatc
 
     bool SetColorTableEntry(const size_t tableIndex, const DWORD color) noexcept override;
     bool SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle) noexcept override;
+    bool SetCursorColor(const DWORD color) noexcept override;
 
     bool SetClipboard(std::wstring_view content) noexcept override;