WIP: Pass through VT input unmodified

src/cascadia/TerminalCore/Terminal.hpp

@@ -340,7 +340,7 @@ class Microsoft::Terminal::Core::Terminal final :
 
     CursorType _defaultCursorShape = CursorType::Legacy;
 
-    til::enumset<Mode> _systemMode{ Mode::AutoWrap };
+    til::enumset<Mode> _systemMode{ Mode::AutoWrap, Mode::LineFeed };
 
     bool _snapOnInput = true;
     bool _altGrAliasing = true;

src/host/PassthroughState.h

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+namespace Microsoft::Console
+{
+    struct PassthroughState
+    {
+        explicit PassthroughState(wil::unique_hfile output) :
+            _output{ std::move(output) }
+        {
+        }
+
+    private:
+        wil::unique_hfile _output;
+    };
+}

src/host/VtIo.cpp

@@ -14,8 +14,6 @@
 #include "input.h" // ProcessCtrlEvents
 #include "output.h" // CloseConsoleProcessState
 
-#include "VtApiRoutines.h"
-
 using namespace Microsoft::Console;
 using namespace Microsoft::Console::Render;
 using namespace Microsoft::Console::VirtualTerminal;
@@ -156,65 +154,24 @@ VtIo::VtIo() :
             auto initialViewport = Viewport::FromDimensions({ 0, 0 },
                                                             gci.GetWindowSize().width,
                                                             gci.GetWindowSize().height);
-            switch (_IoMode)
-            {
-            case VtIoMode::XTERM_256:
-            {
-                auto xterm256Engine = std::make_unique<Xterm256Engine>(std::move(_hOutput),
-                                                                       initialViewport);
-                if constexpr (Feature_VtPassthroughMode::IsEnabled())
-                {
-                    if (_passthroughMode)
-                    {
-                        auto vtapi = new VtApiRoutines();
-                        vtapi->m_pVtEngine = xterm256Engine.get();
-                        vtapi->m_pUsualRoutines = globals.api;
-
-                        xterm256Engine->SetPassthroughMode(true);
-
-                        if (_pVtInputThread)
-                        {
-                            auto pfnSetListenForDSR = std::bind(&VtInputThread::SetLookingForDSR, _pVtInputThread.get(), std::placeholders::_1);
-                            xterm256Engine->SetLookingForDSRCallback(pfnSetListenForDSR);
-                        }
-
-                        globals.api = vtapi;
-                    }
-                }
 
-                _pVtRenderEngine = std::move(xterm256Engine);
-                break;
-            }
-            case VtIoMode::XTERM:
+            if (!Feature_VtPassthroughMode::IsEnabled() || !_passthroughMode)
             {
-                _pVtRenderEngine = std::make_unique<XtermEngine>(std::move(_hOutput),
-                                                                 initialViewport,
-                                                                 false);
-                if (_passthroughMode)
+                switch (_IoMode)
                 {
-                    return E_NOTIMPL;
+                case VtIoMode::XTERM_256:
+                    _pVtRenderEngine = std::make_unique<Xterm256Engine>(std::move(_hOutput), initialViewport);
+                    break;
+                case VtIoMode::XTERM:
+                    _pVtRenderEngine = std::make_unique<XtermEngine>(std::move(_hOutput), initialViewport, false);
+                    break;
+                case VtIoMode::XTERM_ASCII:
+                    _pVtRenderEngine = std::make_unique<XtermEngine>(std::move(_hOutput), initialViewport, true);
+                    break;
+                default:
+                    return E_FAIL;
                 }
-                break;
-            }
-            case VtIoMode::XTERM_ASCII:
-            {
-                _pVtRenderEngine = std::make_unique<XtermEngine>(std::move(_hOutput),
-                                                                 initialViewport,
-                                                                 true);
 
-                if (_passthroughMode)
-                {
-                    return E_NOTIMPL;
-                }
-                break;
-            }
-            default:
-            {
-                return E_FAIL;
-            }
-            }
-            if (_pVtRenderEngine)
-            {
                 _pVtRenderEngine->SetTerminalOwner(this);
                 _pVtRenderEngine->SetResizeQuirk(_resizeQuirk);
             }
@@ -230,6 +187,11 @@ bool VtIo::IsUsingVt() const
     return _initialized;
 }
 
+PassthroughState* VtIo::GetPassthroughState() const noexcept
+{
+    return _passthroughState.get();
+}
+
 // Routine Description:
 //  Potentially starts this VtIo's input thread and render engine.
 //      If the VtIo hasn't yet been given pipes, then this function will

src/host/VtIo.hpp

@@ -7,6 +7,7 @@
 #include "../renderer/vt/vtrenderer.hpp"
 #include "VtInputThread.hpp"
 #include "PtySignalInputThread.hpp"
+#include "PassthroughState.h"
 
 class ConsoleArguments;
 
@@ -28,6 +29,7 @@ namespace Microsoft::Console::VirtualTerminal
         [[nodiscard]] HRESULT CreateIoHandlers() noexcept;
 
         bool IsUsingVt() const;
+        PassthroughState* GetPassthroughState() const noexcept;
 
         [[nodiscard]] HRESULT StartIfNeeded();
 
@@ -69,7 +71,8 @@ namespace Microsoft::Console::VirtualTerminal
         bool _resizeQuirk{ false };
         bool _passthroughMode{ false };
         bool _closeEventSent{ false };
-
+
+        std::unique_ptr<Microsoft::Console::PassthroughState> _passthroughState;
         std::unique_ptr<Microsoft::Console::Render::VtEngine> _pVtRenderEngine;
         std::unique_ptr<Microsoft::Console::VtInputThread> _pVtInputThread;
         std::unique_ptr<Microsoft::Console::PtySignalInputThread> _pPtySignalInputThread;

src/host/host-common.vcxitems

@@ -47,7 +47,6 @@
     <ClCompile Include="..\tracing.cpp" />
     <ClCompile Include="..\utils.cpp" />
     <ClCompile Include="..\utf8ToWideCharParser.cpp" />
-    <ClCompile Include="..\VtApiRoutines.cpp" />
     <ClCompile Include="..\VtInputThread.cpp" />
     <ClCompile Include="..\VtIo.cpp" />
     <ClCompile Include="..\writeData.cpp" />
@@ -101,7 +100,6 @@
     <ClInclude Include="..\tracing.hpp" />
     <ClInclude Include="..\utils.hpp" />
     <ClInclude Include="..\utf8ToWideCharParser.hpp" />
-    <ClInclude Include="..\VtApiRoutines.h" />
     <ClInclude Include="..\VtInputThread.hpp" />
     <ClInclude Include="..\VtIo.hpp" />
     <ClInclude Include="..\writeData.hpp" />

src/host/lib/hostlib.vcxproj

@@ -8,11 +8,17 @@
     <TargetName>ConhostV2Lib</TargetName>
     <ConfigurationType>StaticLibrary</ConfigurationType>
   </PropertyGroup>
+  <ItemGroup>
+    <ClInclude Include="..\PassthroughState.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\PassthroughState.cpp" />
+  </ItemGroup>
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
   <Import Project="$(SolutionDir)src\common.nugetversions.props" />
   <!-- DONT ADD NEW FILES HERE, ADD THEM TO host-common.vcxitems -->
   <Import Project="$(SolutionDir)src\host\host-common.vcxitems" />
   <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
   <Import Project="$(SolutionDir)src\common.build.post.props" />
   <Import Project="$(SolutionDir)src\common.nugetversions.targets" />
-</Project>
+</Project>

src/host/lib/hostlib.vcxproj.filters

@@ -162,7 +162,7 @@
     <ClCompile Include="..\CursorBlinker.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\VtApiRoutines.cpp">
+    <ClCompile Include="..\PassthroughState.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -320,11 +320,12 @@
     <ClInclude Include="..\IIoProvider.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\VtApiRoutines.h">
+    <ClInclude Include="..\PassthroughState.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
   </ItemGroup>
-</Project>
+</Project>

src/host/sources.inc

@@ -88,7 +88,6 @@ SOURCES = \
     ..\conareainfo.cpp \
     ..\conimeinfo.cpp \
     ..\ConsoleArguments.cpp \
-    ..\VtApiRoutines.cpp \
 
 
 # -------------------------------------

src/renderer/vt/Xterm256Engine.cpp

@@ -32,8 +32,6 @@ Xterm256Engine::Xterm256Engine(_In_ wil::unique_hfile hPipe,
                                                            const bool usingSoftFont,
                                                            const bool isSettingDefaultBrushes) noexcept
 {
-    RETURN_HR_IF(S_FALSE, _passthrough && isSettingDefaultBrushes);
-
     RETURN_IF_FAILED(VtEngine::_RgbUpdateDrawingBrushes(textAttributes));
 
     RETURN_IF_FAILED(_UpdateHyperlinkAttr(textAttributes, pData));

src/renderer/vt/Xterm256Engine.hpp

@@ -18,8 +18,6 @@ Author(s):
 
 #include "XtermEngine.hpp"
 
-class VtApiRoutines;
-
 namespace Microsoft::Console::Render
 {
     class Xterm256Engine : public XtermEngine
@@ -38,8 +36,6 @@ namespace Microsoft::Console::Render
 
         [[nodiscard]] HRESULT ManuallyClearScrollback() noexcept override;
 
-        friend class ::VtApiRoutines;
-
     private:
         [[nodiscard]] HRESULT _UpdateExtendedAttrs(const TextAttribute& textAttributes) noexcept;
         [[nodiscard]] HRESULT _UpdateHyperlinkAttr(const TextAttribute& textAttributes,

src/renderer/vt/XtermEngine.cpp

@@ -46,16 +46,6 @@ XtermEngine::XtermEngine(_In_ wil::unique_hfile hPipe,
     // during the frame.
     _nextCursorIsVisible = false;
 
-    // Do not perform synchronization clearing in passthrough mode.
-    // In passthrough, the terminal leads and we follow what it is
-    // handling from the client application.
-    // (This is in contrast to full PTY mode where WE, the ConPTY, lead and
-    //  it follows our state.)
-    if (_passthrough)
-    {
-        _firstPaint = false;
-    }
-
     if (_firstPaint)
     {
         // MSFT:17815688

src/renderer/vt/state.cpp

@@ -474,19 +474,6 @@ void VtEngine::SetResizeQuirk(const bool resizeQuirk)
     _resizeQuirk = resizeQuirk;
 }
 
-// Method Description:
-// - Configure the renderer to understand that we're operating in limited-draw
-//   passthrough mode. We do not need to handle full responsibility for replicating
-//   buffer state to the attached terminal.
-// Arguments:
-// - passthrough - True to turn on passthrough mode. False otherwise.
-// Return Value:
-// - true iff we were started with an output mode for passthrough. false otherwise.
-void VtEngine::SetPassthroughMode(const bool passthrough) noexcept
-{
-    _passthrough = passthrough;
-}
-
 void VtEngine::SetLookingForDSRCallback(std::function<void(bool)> pfnLooking) noexcept
 {
     _pfnSetLookingForDSR = pfnLooking;

src/renderer/vt/vtrenderer.hpp

@@ -83,7 +83,6 @@ namespace Microsoft::Console::Render
         void BeginResizeRequest();
         void EndResizeRequest();
         void SetResizeQuirk(const bool resizeQuirk);
-        void SetPassthroughMode(const bool passthrough) noexcept;
         void SetLookingForDSRCallback(std::function<void(bool)> pfnLooking) noexcept;
         void SetTerminalCursorTextPosition(const til::point coordCursor) noexcept;
         [[nodiscard]] virtual HRESULT ManuallyClearScrollback() noexcept;
@@ -138,7 +137,6 @@ namespace Microsoft::Console::Render
         bool _delayedEolWrap{ false };
 
         bool _resizeQuirk{ false };
-        bool _passthrough{ false };
         bool _corked{ false };
         std::optional<TextColor> _newBottomLineBG{ std::nullopt };