685720a767
## Summary of the Pull Request #4354 is a pretty complicated PR. It's got a bunch of conpty changes, but what it also has was some critical improvements to the roundtrip test suite. I'm working on some other bugfixes in the same area currently, and need these tests enhancements in those branches _now_. The rest of #4354 is complex enough that I don't trust it will get merged soon (if ever). However, these fixes _should_ be in regardless. ## PR Checklist * [x] Taken directly from #4354 * [x] I work here * [x] Tests added/passed * [n/a] Requires documentation to be updated ## Detailed Description of the Pull Request / Additional comments This is four main changes: * Enable conpty to be fully enabled in unittests. Just setting up a VT renderer isn't enough to trick the host into being in conpty mode - it also needs to have some other flags set. * Some minor changes to `CommonState` to better configure the common test state for conpty * Move some of the verify helpers from `ConptyRoundtripTests` into their own helper class, to be shared in multiple tests * Add a `TerminalBufferTests` class, for testing the Terminal buffer directly (without conpty). This change is really easier than  would suggest, I promise.
73 lines
2.1 KiB
C++
73 lines
2.1 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#pragma once
|
|
|
|
#include "..\inc\VtIoModes.hpp"
|
|
#include "..\inc\ITerminalOwner.hpp"
|
|
#include "..\renderer\vt\vtrenderer.hpp"
|
|
#include "VtInputThread.hpp"
|
|
#include "PtySignalInputThread.hpp"
|
|
|
|
class ConsoleArguments;
|
|
|
|
namespace Microsoft::Console::VirtualTerminal
|
|
{
|
|
class VtIo : public Microsoft::Console::ITerminalOwner
|
|
{
|
|
public:
|
|
VtIo();
|
|
virtual ~VtIo() override = default;
|
|
|
|
[[nodiscard]] HRESULT Initialize(const ConsoleArguments* const pArgs);
|
|
|
|
[[nodiscard]] HRESULT CreateAndStartSignalThread() noexcept;
|
|
[[nodiscard]] HRESULT CreateIoHandlers() noexcept;
|
|
|
|
bool IsUsingVt() const;
|
|
|
|
[[nodiscard]] HRESULT StartIfNeeded();
|
|
|
|
[[nodiscard]] static HRESULT ParseIoMode(const std::wstring& VtMode, _Out_ VtIoMode& ioMode);
|
|
|
|
[[nodiscard]] HRESULT SuppressResizeRepaint();
|
|
[[nodiscard]] HRESULT SetCursorPosition(const COORD coordCursor);
|
|
|
|
void CloseInput() override;
|
|
void CloseOutput() override;
|
|
|
|
void BeginResize();
|
|
void EndResize();
|
|
|
|
#ifdef UNIT_TESTING
|
|
void EnableConptyModeForTests();
|
|
#endif
|
|
|
|
private:
|
|
// After CreateIoHandlers is called, these will be invalid.
|
|
wil::unique_hfile _hInput;
|
|
wil::unique_hfile _hOutput;
|
|
// After CreateAndStartSignalThread is called, this will be invalid.
|
|
wil::unique_hfile _hSignal;
|
|
VtIoMode _IoMode;
|
|
|
|
bool _initialized;
|
|
bool _objectsCreated;
|
|
|
|
bool _lookingForCursorPosition;
|
|
std::mutex _shutdownLock;
|
|
|
|
std::unique_ptr<Microsoft::Console::Render::VtEngine> _pVtRenderEngine;
|
|
std::unique_ptr<Microsoft::Console::VtInputThread> _pVtInputThread;
|
|
std::unique_ptr<Microsoft::Console::PtySignalInputThread> _pPtySignalInputThread;
|
|
|
|
[[nodiscard]] HRESULT _Initialize(const HANDLE InHandle, const HANDLE OutHandle, const std::wstring& VtMode, _In_opt_ const HANDLE SignalHandle);
|
|
|
|
void _ShutdownIfNeeded();
|
|
|
|
#ifdef UNIT_TESTING
|
|
friend class VtIoTests;
|
|
#endif
|
|
};
|
|
}
|