Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/cascadia/TerminalApp/DebugTapConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ namespace winrt::Microsoft::TerminalApp::implementation

_wrappedConnection.Start();
}
void WriteInput(const hstring& data)
void WriteInput(const winrt::array_view<const char16_t> buffer)
{
_pairedTap->_PrintInput(data);
_wrappedConnection.WriteInput(data);
_pairedTap->_PrintInput(winrt_array_to_wstring_view(buffer));
_wrappedConnection.WriteInput(buffer);
}
void Resize(uint32_t rows, uint32_t columns) { _wrappedConnection.Resize(rows, columns); }
void Close() { _wrappedConnection.Close(); }
Expand Down Expand Up @@ -77,13 +77,13 @@ namespace winrt::Microsoft::TerminalApp::implementation
_start.count_down();
}

void DebugTapConnection::WriteInput(const hstring& data)
void DebugTapConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
{
// If the user types into the tap side, forward it to the input side
if (auto strongInput{ _inputSide.get() })
{
auto inputAsTap{ winrt::get_self<DebugInputTapConnection>(strongInput) };
inputAsTap->WriteInput(data);
inputAsTap->WriteInput(buffer);
}
}

Expand Down Expand Up @@ -117,7 +117,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
return ConnectionState::Failed;
}

void DebugTapConnection::_OutputHandler(const hstring str)
void DebugTapConnection::_OutputHandler(const std::wstring_view str)
{
auto output = til::visualize_control_codes(str);
// To make the output easier to read, we introduce a line break whenever
Expand All @@ -131,7 +131,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
}

// Called by the DebugInputTapConnection to print user input
void DebugTapConnection::_PrintInput(const hstring& str)
void DebugTapConnection::_PrintInput(const std::wstring_view str)
{
auto clean{ til::visualize_control_codes(str) };
auto formatted{ wil::str_printf<std::wstring>(L"\x1b[91m%ls\x1b[m", clean.data()) };
Expand Down
6 changes: 3 additions & 3 deletions src/cascadia/TerminalApp/DebugTapConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace winrt::Microsoft::TerminalApp::implementation
void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/){};
~DebugTapConnection();
void Start();
void WriteInput(const hstring& data);
void WriteInput(const winrt::array_view<const char16_t> data);
void Resize(uint32_t rows, uint32_t columns);
void Close();

Expand All @@ -30,8 +30,8 @@ namespace winrt::Microsoft::TerminalApp::implementation
til::typed_event<winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection, winrt::Windows::Foundation::IInspectable> StateChanged;

private:
void _PrintInput(const hstring& data);
void _OutputHandler(const hstring str);
void _PrintInput(const std::wstring_view data);
void _OutputHandler(const std::wstring_view str);

winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection::TerminalOutput_revoker _outputRevoker;
winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection::StateChanged_revoker _stateChangedRevoker;
Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/TerminalAzBridge/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static ConnectionState RunConnectionToCompletion(const ITerminalConnection& conn
auto input = reader.Read();
if (input)
{
connection.WriteInput(*input);
connection.WriteInput(winrt_wstring_to_array_view(*input));
}
}
}).detach();
Expand Down
9 changes: 7 additions & 2 deletions src/cascadia/TerminalConnection/AzureConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
// - handles the different possible inputs in the different states
// Arguments:
// the user's input
void AzureConnection::WriteInput(const hstring& data)
void AzureConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
{
_writeInput(winrt_array_to_wstring_view(buffer));
}

void AzureConnection::_writeInput(const std::wstring_view data)
{
// We read input while connected AND connecting.
if (!_isStateOneOf(ConnectionState::Connected, ConnectionState::Connecting))
Expand Down Expand Up @@ -804,7 +809,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
std::swap(_userInput, queuedUserInput);
if (queuedUserInput.size() > 0)
{
WriteInput(static_cast<winrt::hstring>(queuedUserInput)); // send the user's queued up input back through
_writeInput(queuedUserInput); // send the user's queued up input back through
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/cascadia/TerminalConnection/AzureConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
void Initialize(const Windows::Foundation::Collections::ValueSet& settings);

void Start();
void WriteInput(const hstring& data);
void WriteInput(const winrt::array_view<const char16_t> buffer);
void Resize(uint32_t rows, uint32_t columns);
void Close();

Expand Down Expand Up @@ -66,6 +66,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
std::vector<::Microsoft::Terminal::Azure::Tenant> _tenantList;
std::optional<::Microsoft::Terminal::Azure::Tenant> _currentTenant;

void _writeInput(const std::wstring_view str);
void _WriteStringWithNewline(const std::wstring_view str);
void _WriteCaughtExceptionRecord();
winrt::Windows::Data::Json::JsonObject _SendRequestReturningJson(std::wstring_view uri, const winrt::Windows::Web::Http::IHttpContent& content = nullptr, winrt::Windows::Web::Http::HttpMethod method = nullptr, const winrt::Windows::Foundation::Uri referer = nullptr);
Expand Down
4 changes: 3 additions & 1 deletion src/cascadia/TerminalConnection/ConptyConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,10 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
}
CATCH_LOG()

void ConptyConnection::WriteInput(const hstring& data)
void ConptyConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
{
const auto data = winrt_array_to_wstring_view(buffer);

if (!_isConnected())
{
return;
Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/TerminalConnection/ConptyConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
static winrt::fire_and_forget final_release(std::unique_ptr<ConptyConnection> connection);

void Start();
void WriteInput(const hstring& data);
void WriteInput(const winrt::array_view<const char16_t> buffer);
void Resize(uint32_t rows, uint32_t columns);
void Close() noexcept;
void ClearBuffer();
Expand Down
3 changes: 2 additions & 1 deletion src/cascadia/TerminalConnection/EchoConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
{
}

void EchoConnection::WriteInput(const hstring& data)
void EchoConnection::WriteInput(const winrt::array_view<const char16_t> buffer)
{
const auto data = winrt_array_to_wstring_view(buffer);
std::wstringstream prettyPrint;
for (const auto& wch : data)
{
Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/TerminalConnection/EchoConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
EchoConnection() noexcept;

void Start() noexcept;
void WriteInput(const hstring& data);
void WriteInput(const winrt::array_view<const char16_t> buffer);
void Resize(uint32_t rows, uint32_t columns) noexcept;
void Close() noexcept;

Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/TerminalConnection/ITerminalConnection.idl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace Microsoft.Terminal.TerminalConnection
void Initialize(Windows.Foundation.Collections.ValueSet settings);

void Start();
void WriteInput(String data);
void WriteInput(Char[] data);
void Resize(UInt32 rows, UInt32 columns);
void Close();

Expand Down
4 changes: 2 additions & 2 deletions src/cascadia/TerminalControl/ControlCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
}
else
{
_connection.WriteInput(wstr);
_connection.WriteInput(winrt_wstring_to_array_view(wstr));
}
}

Expand Down Expand Up @@ -2505,7 +2505,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
{
// _sendInputToConnection() asserts that we aren't in focus mode,
// but window focus events are always fine to send.
_connection.WriteInput(*out);
_connection.WriteInput(winrt_wstring_to_array_view(*out));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/TerminalSettingsEditor/PreviewConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
{
}

void PreviewConnection::WriteInput(const hstring& /*data*/)
void PreviewConnection::WriteInput(const winrt::array_view<const char16_t> /*data*/)
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/cascadia/TerminalSettingsEditor/PreviewConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation

void Initialize(const Windows::Foundation::Collections::ValueSet& settings) noexcept;
void Start() noexcept;
void WriteInput(const hstring& data);
void WriteInput(const winrt::array_view<const char16_t> buffer);
void Resize(uint32_t rows, uint32_t columns) noexcept;
void Close() noexcept;

Expand Down
Loading