2608e94822
Introduces a new TerminalSettingsModel (TSM) project. This project is responsible for (de)serializing and exposing Windows Terminal's settings as WinRT objects. ## References #885: TSM epic #1564: Settings UI is dependent on this for data binding and settings access #6904: TSM Spec In the process of ripping out TSM from TerminalApp, a few other changes were made to make this possible: 1. AppLogic's `ApplicationDisplayName` and `ApplicationVersion` was moved to `CascadiaSettings` - These are defined as static functions. They also no longer check if `AppLogic::Current()` is nullptr. 2. `enum LaunchMode` was moved from TerminalApp to TSM 3. `AzureConnectionType` and `TelnetConnectionType` were moved from the profile generators to their respective TerminalConnections 4. CascadiaSettings' `SettingsPath` and `DefaultSettingsPath` are exposed as `hstring` instead of `std::filesystem::path` 5. `Command::ExpandCommands()` was exposed via the IDL - This required some of the warnings to be saved to an `IVector` instead of `std::vector`, among some other small changes. 6. The localization resources had to be split into two halves. - Resource file linked in init.cpp. Verified at runtime thanks to the StaticResourceLoader. 7. Added constructors to some `ActionArgs` 8. Utils.h/cpp were moved to `cascadia/inc`. `JsonKey()` was moved to `JsonUtils`. Both TermApp and TSM need access to Utils.h/cpp. A large amount of work includes moving to the new namespace (`TerminalApp` --> `Microsoft::Terminal::Settings::Model`). Fixing the tests had its own complications. Testing required us to split up TSM into a DLL and LIB, similar to TermApp. Discussion on creating a non-local test variant can be found in #7743. Closes #885
75 lines
2.3 KiB
C++
75 lines
2.3 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#pragma once
|
|
|
|
#include "TelnetConnection.g.h"
|
|
|
|
#include <mutex>
|
|
#include <condition_variable>
|
|
|
|
#pragma warning(push)
|
|
#pragma warning(disable : 4100)
|
|
#pragma warning(disable : 4251)
|
|
#include <telnetpp/core.hpp>
|
|
#include <telnetpp/session.hpp>
|
|
#include <telnetpp/options/naws/server.hpp>
|
|
#pragma warning(pop)
|
|
|
|
#include "winrt/Windows.Networking.Sockets.h"
|
|
#include "winrt/Windows.Storage.Streams.h"
|
|
|
|
#include "../cascadia/inc/cppwinrt_utils.h"
|
|
#include "ConnectionStateHolder.h"
|
|
|
|
namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
|
|
{
|
|
struct TelnetConnection : TelnetConnectionT<TelnetConnection>, ConnectionStateHolder<TelnetConnection>
|
|
{
|
|
static winrt::guid ConnectionType() noexcept;
|
|
|
|
TelnetConnection(const hstring& uri);
|
|
|
|
void Start();
|
|
void WriteInput(hstring const& data);
|
|
void Resize(uint32_t rows, uint32_t columns);
|
|
void Close();
|
|
|
|
WINRT_CALLBACK(TerminalOutput, TerminalOutputHandler);
|
|
|
|
private:
|
|
hstring _uri;
|
|
|
|
void _applicationReceive(telnetpp::bytes data,
|
|
std::function<void(telnetpp::bytes)> const& send);
|
|
|
|
void _socketBufferedSend(telnetpp::bytes data);
|
|
fire_and_forget _socketFlushBuffer();
|
|
void _socketSend(telnetpp::bytes data);
|
|
size_t _socketReceive(gsl::span<telnetpp::byte> buffer);
|
|
|
|
telnetpp::session _session;
|
|
// NAWS = Negotiation About Window Size
|
|
telnetpp::options::naws::server _nawsServer;
|
|
Windows::Networking::Sockets::StreamSocket _socket;
|
|
Windows::Storage::Streams::DataWriter _writer;
|
|
Windows::Storage::Streams::DataReader _reader;
|
|
|
|
std::optional<std::pair<uint32_t, uint32_t>> _prevResize;
|
|
|
|
static constexpr size_t _receiveBufferSize = 1024;
|
|
std::array<telnetpp::byte, _receiveBufferSize> _receiveBuffer;
|
|
|
|
wil::unique_handle _hOutputThread;
|
|
|
|
DWORD _outputThread();
|
|
};
|
|
}
|
|
|
|
namespace winrt::Microsoft::Terminal::TerminalConnection::factory_implementation
|
|
{
|
|
struct TelnetConnection : TelnetConnectionT<TelnetConnection, implementation::TelnetConnection>
|
|
{
|
|
};
|
|
}
|