06b3931418
Replace `utf8Parser` with `til::u8u16` in order to have the same conversion algorithms used in terminal and conhost. This PR addresses item 2 in this list: 1. ✉ Implement `til::u8u16` and `til::u16u8` (done in PR #4093) 2. ✔ **Unify UTF-8 handling using `til::u8u16` (this PR)** 2.1. ✔ **Update VtInputThread::_HandleRunInput()** 2.2. ✔ **Update ApiRoutines::WriteConsoleAImpl()** 2.3. ❌ (optional / ask the core team) Remove Utf8ToWideCharParser from the code base to avoid further use 3. ❌ Enable BOM discarding (follow up) 3.1. ❌ extend `til::u8u16` and `til::u16u8` with a 3rd parameter to enable discarding the BOM 3.2. ❌ Make use of the 3rd parameter to discard the BOM in all current function callers, or (optional / ask the core team) make it the default for `til::u8u16` and `til::u16u8` 4. ❌ Find UTF-16 to UTF-8 conversions and examine if they can be unified, too (follow up) Closes #4086 Closes #3378
45 lines
1.1 KiB
C++
45 lines
1.1 KiB
C++
/*++
|
|
Copyright (c) Microsoft Corporation
|
|
Licensed under the MIT license.
|
|
|
|
Module Name:
|
|
- VtInputThread.hpp
|
|
|
|
Abstract:
|
|
- Defines methods that wrap the thread that reads VT input from a pipe and
|
|
feeds it into the console's input buffer.
|
|
|
|
Author(s):
|
|
- Mike Griese (migrie) 15 Aug 2017
|
|
--*/
|
|
#pragma once
|
|
|
|
#include "..\terminal\parser\StateMachine.hpp"
|
|
|
|
namespace Microsoft::Console
|
|
{
|
|
class VtInputThread
|
|
{
|
|
public:
|
|
VtInputThread(_In_ wil::unique_hfile hPipe, const bool inheritCursor);
|
|
|
|
[[nodiscard]] HRESULT Start();
|
|
static DWORD WINAPI StaticVtInputThreadProc(_In_ LPVOID lpParameter);
|
|
void DoReadInput(const bool throwOnFail);
|
|
|
|
private:
|
|
[[nodiscard]] HRESULT _HandleRunInput(const std::string_view u8Str);
|
|
DWORD _InputThread();
|
|
|
|
wil::unique_hfile _hFile;
|
|
wil::unique_handle _hThread;
|
|
DWORD _dwThreadId;
|
|
|
|
bool _exitRequested;
|
|
HRESULT _exitResult;
|
|
|
|
std::unique_ptr<Microsoft::Console::VirtualTerminal::StateMachine> _pInputStateMachine;
|
|
til::u8state _u8State;
|
|
};
|
|
}
|