6268a4779c
## Summary of the Pull Request  This adds a new action, `clearBuffer`. It accepts 3 values for the `clear` type: * `"clear": "screen"`: Clear the terminal viewport content. Leaves the scrollback untouched. Moves the cursor row to the top of the viewport (unmodified). * `"clear": "scrollback"`: Clear the scrollback. Leaves the viewport untouched. * `"clear": "all"`: (**default**) Clear the scrollback and the visible viewport. Moves the cursor row to the top of the viewport (unmodified). "Clear Buffer" has also been added to `defaults.json`. ## References * From microsoft/vscode#75141 originally ## PR Checklist * [x] Closes #1193 * [x] Closes #1882 * [x] I work here * [x] Tests added/passed * [ ] Requires documentation to be updated ## Detailed Description of the Pull Request / Additional comments This is a bit tricky, because we need to plumb it all the way through conpty to clear the buffer. If we don't, then conpty will immediately just redraw the screen. So this sends a signal to the attached conpty, and then waits for conpty to draw the updated, cleared, screen back to us. ## Validation Steps Performed * works for each of the three clear types as expected * tests pass. * works even with `ping -t 8.8.8.8` as you'd hope.
98 lines
3.9 KiB
C++
98 lines
3.9 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#pragma once
|
|
|
|
#include "ConptyConnection.g.h"
|
|
#include "ConnectionStateHolder.h"
|
|
#include "../inc/cppwinrt_utils.h"
|
|
|
|
#include <conpty-static.h>
|
|
|
|
namespace wil
|
|
{
|
|
// These belong in WIL upstream, so when we reingest the change that has them we'll get rid of ours.
|
|
using unique_static_pseudoconsole_handle = wil::unique_any<HPCON, decltype(&::ConptyClosePseudoConsole), ::ConptyClosePseudoConsole>;
|
|
}
|
|
|
|
namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
|
|
{
|
|
struct ConptyConnection : ConptyConnectionT<ConptyConnection>, ConnectionStateHolder<ConptyConnection>
|
|
{
|
|
ConptyConnection(const HANDLE hSig,
|
|
const HANDLE hIn,
|
|
const HANDLE hOut,
|
|
const HANDLE hRef,
|
|
const HANDLE hServerProcess,
|
|
const HANDLE hClientProcess);
|
|
|
|
ConptyConnection() noexcept = default;
|
|
void Initialize(const Windows::Foundation::Collections::ValueSet& settings);
|
|
|
|
static winrt::fire_and_forget final_release(std::unique_ptr<ConptyConnection> connection);
|
|
|
|
void Start();
|
|
void WriteInput(hstring const& data);
|
|
void Resize(uint32_t rows, uint32_t columns);
|
|
void Close() noexcept;
|
|
void ClearBuffer();
|
|
|
|
winrt::guid Guid() const noexcept;
|
|
|
|
static void StartInboundListener();
|
|
static void StopInboundListener();
|
|
|
|
static winrt::event_token NewConnection(NewConnectionHandler const& handler);
|
|
static void NewConnection(winrt::event_token const& token);
|
|
|
|
static Windows::Foundation::Collections::ValueSet CreateSettings(const winrt::hstring& cmdline,
|
|
const winrt::hstring& startingDirectory,
|
|
const winrt::hstring& startingTitle,
|
|
Windows::Foundation::Collections::IMapView<hstring, hstring> const& environment,
|
|
uint32_t rows,
|
|
uint32_t columns,
|
|
winrt::guid const& guid);
|
|
|
|
WINRT_CALLBACK(TerminalOutput, TerminalOutputHandler);
|
|
|
|
private:
|
|
HRESULT _LaunchAttachedClient() noexcept;
|
|
void _indicateExitWithStatus(unsigned int status) noexcept;
|
|
void _ClientTerminated() noexcept;
|
|
|
|
static HRESULT NewHandoff(HANDLE in, HANDLE out, HANDLE signal, HANDLE ref, HANDLE server, HANDLE client) noexcept;
|
|
|
|
uint32_t _initialRows{};
|
|
uint32_t _initialCols{};
|
|
hstring _commandline{};
|
|
hstring _startingDirectory{};
|
|
hstring _startingTitle{};
|
|
Windows::Foundation::Collections::ValueSet _environment{ nullptr };
|
|
guid _guid{}; // A unique session identifier for connected client
|
|
hstring _clientName{}; // The name of the process hosted by this ConPTY connection (as of launch).
|
|
|
|
bool _receivedFirstByte{ false };
|
|
std::chrono::high_resolution_clock::time_point _startTime{};
|
|
|
|
wil::unique_hfile _inPipe; // The pipe for writing input to
|
|
wil::unique_hfile _outPipe; // The pipe for reading output from
|
|
wil::unique_handle _hOutputThread;
|
|
wil::unique_process_information _piClient;
|
|
wil::unique_static_pseudoconsole_handle _hPC;
|
|
wil::unique_threadpool_wait _clientExitWait;
|
|
|
|
til::u8state _u8State{};
|
|
std::wstring _u16Str{};
|
|
std::array<char, 4096> _buffer{};
|
|
|
|
DWORD _OutputThread();
|
|
};
|
|
}
|
|
|
|
namespace winrt::Microsoft::Terminal::TerminalConnection::factory_implementation
|
|
{
|
|
struct ConptyConnection : ConptyConnectionT<ConptyConnection, implementation::ConptyConnection>
|
|
{
|
|
};
|
|
}
|