Port conpty changes to latest codebase. (#3)

Author: vorporeal

src/terminal/adapter/ITermDispatch.hpp

@@ -154,6 +154,12 @@ class Microsoft::Console::VirtualTerminal::ITermDispatch
 
     virtual void DoITerm2Action(const std::wstring_view string) = 0;
 
+    virtual void DoWarpInBandGeneratorAction() = 0;
+
+    virtual void DoWarpAction() = 0;
+
+    virtual void DoWarpResetGridAction() = 0;
+
     virtual void DoFinalTermAction(const std::wstring_view string) = 0;
 
     virtual void DoVsCodeAction(const std::wstring_view string) = 0;

src/terminal/adapter/adaptDispatch.cpp

@@ -3644,6 +3644,67 @@ void AdaptDispatch::DoITerm2Action(const std::wstring_view string)
     }
 }
 
+// Method Description:
+// - Performs a iTerm2 action
+// - Ascribes to the ITermDispatch interface
+// - Currently, the actions we support are:
+//   * `OSC1337;SetMark`: mark a line as a prompt line
+// - Not actually used in conhost
+// Arguments:
+// - string: contains the parameters that define which action we do
+// Return Value:
+// - false in conhost, true for the SetMark action, otherwise false.
+void AdaptDispatch::DoWarpAction()
+{
+    // const auto isConPty = _api.IsConsolePty();
+    // if (isConPty)
+    // {
+    //     // Flush the frame manually, to make sure marks end up on the right
+    //     // line, like the alt buffer sequence.
+    //      _renderer.TriggerFlush(false);
+    //     //CursorPosition(1, 1);
+    // }
+}
+
+// Method Description:
+// - Performs a iTerm2 action
+// - Ascribes to the ITermDispatch interface
+// - Currently, the actions we support are:
+//   * `OSC1337;SetMark`: mark a line as a prompt line
+// - Not actually used in conhost
+// Arguments:
+// - string: contains the parameters that define which action we do
+// Return Value:
+// - false in conhost, true for the SetMark action, otherwise false.
+void AdaptDispatch::DoWarpInBandGeneratorAction()
+{
+    // const auto isConPty = _api.IsConsolePty();
+    // if (isConPty)
+    // {
+    //     // Flush the frame manually, to make sure marks end up on the right
+    //     // line, like the alt buffer sequence.
+    //     _renderer.TriggerFlush(false);
+    // }
+}
+
+void AdaptDispatch::DoWarpResetGridAction()
+{
+    // const auto isConPty = _api.IsConsolePty();
+    // if (isConPty)
+    // {
+    //     // Flush the frame manually, to make sure marks end up on the right
+    //     // line, like the alt buffer sequence.
+    //     _renderer.TriggerFlush(false);
+
+        // Clear grid without painting.
+        // ATODO: Anything else we need to reset here?
+        CursorPosition(1, 1);
+        _pages.ActivePage().Buffer().Reset();
+        // _renderer.TriggerFlush(false);
+        // //_pages.ActivePage().Buffer().Reset();
+    // }
+}
+
 // Method Description:
 // - Performs a FinalTerm action
 // - Currently, the actions we support are:

src/terminal/adapter/adaptDispatch.hpp

@@ -151,6 +151,12 @@ namespace Microsoft::Console::VirtualTerminal
 
         void DoITerm2Action(const std::wstring_view string) override;
 
+        void DoWarpInBandGeneratorAction() override;
+
+        void DoWarpAction() override;
+
+        void DoWarpResetGridAction() override;
+
         void DoFinalTermAction(const std::wstring_view string) override;
 
         void DoVsCodeAction(const std::wstring_view string) override;

src/terminal/parser/OutputStateMachineEngine.cpp

@@ -724,6 +724,10 @@ IStateMachineEngine::StringHandler OutputStateMachineEngine::ActionDcsDispatch(c
     case DcsActionCodes::DECRSPS_RestorePresentationState:
         handler = _dispatch->RestorePresentationState(parameters.at(0));
         break;
+    case DcsActionCodes::DCS_WARP:
+        _dispatch->DoWarpAction();
+        handler = nullptr;
+        break;
     default:
         handler = nullptr;
         break;
@@ -873,6 +877,21 @@ bool OutputStateMachineEngine::ActionOscDispatch(const size_t parameter, const s
         _dispatch->DoITerm2Action(string);
         break;
     }
+    case OscActionCodes::WarpInBandGeneratorAction:
+    {
+        _dispatch->DoWarpInBandGeneratorAction();
+        break;
+    }
+    case OscActionCodes::WarpAction:
+    {
+        _dispatch->DoWarpAction();
+        break;
+    }
+    case OscActionCodes::WarpResetGridAction:
+    {
+        _dispatch->DoWarpResetGridAction();
+        break;
+    }
     case OscActionCodes::FinalTermAction:
     {
         _dispatch->DoFinalTermAction(string);

src/terminal/parser/OutputStateMachineEngine.hpp

@@ -178,6 +178,7 @@ namespace Microsoft::Console::VirtualTerminal
             DECRSTS_RestoreTerminalState = VTID("$p"),
             DECRQSS_RequestSetting = VTID("$q"),
             DECRSPS_RestorePresentationState = VTID("$t"),
+            DCS_WARP = VTID("d"),
         };
 
         enum Vt52ActionCodes : uint64_t
@@ -223,6 +224,9 @@ namespace Microsoft::Console::VirtualTerminal
             VsCodeAction = 633,
             ITerm2Action = 1337,
             WTAction = 9001,
+            WarpInBandGeneratorAction = 9277,
+            WarpAction = 9278,
+            WarpResetGridAction = 9279,
         };
 
         bool _GetOscSetColorTable(const std::wstring_view string,