fa7c1abdf8
This PR introduces a new `ColorType` to allow us to distinguish between `SGR` indexed colors from the 16 color table, the lower half of which can be brightened, and the ISO/ITU indexed colors from the 256 color table, which have a fixed brightness. Retaining the distinction between these two types will enable us to forward the correct `SGR` sequences to conpty when addressing issue #2661. The other benefit of retaining the color index (which we didn't previously do for ISO/ITU colors) is that it ensures that the colors are updated correctly when the color scheme is changed. ## References * This is another step towards fixing the conpty narrowing bugs in issue #2661. * This is technically a fix for issue #5384, but that won't be apparent until #2661 is complete. ## PR Checklist * [x] Closes #1223 * [x] CLA signed. * [x] Tests added/passed * [ ] Requires documentation to be updated * [x] I've discussed this with core contributors already. ## Detailed Description of the Pull Request / Additional comments The first part of this PR was the introduction of a new `ColorType` in the `TextColor` class. Instead of just the one `IsIndex` type, there is now an `IsIndex16` and an `IsIndex256`. `IsIndex16` covers the eight original ANSI colors set with `SGR 3x` and `SGR 4x`, as well as the brighter aixterm variants set with `SGR 9x` and `SGR 10x`. `IsIndex256` covers the 256 ISO/ITU indexed colors set with `SGR 38;5` and `SGR 48;5`. There are two reasons for this distinction. The first is that the ANSI colors have the potential to be brightened by the `SGR 1` bold attribute, while the ISO/ITO color do not. The second reason is that when forwarding an attributes through conpty, we want to try and preserve the original SGR sequence that generated each color (to the extent that that is possible). By having the two separate types, we can map the `IsIndex16` colors back to ANSI/aixterm values, and `IsIndex256` to the ISO/ITU sequences. In addition to the VT colors, we also have to deal with the legacy colors set by the Windows console APIs, but we don't really need a separate type for those. It seemed most appropriate to me to store them as `IsIndex256` colors, since it doesn't make sense to have them brightened by the `SGR 1` attribute (which is what would happen if they were stored as `IsIndex16`). If a console app wanted a bright color it would have selected one, so we shouldn't be messing with that choice. The second part of the PR was the unification of the two color tables. Originally we had a 16 color table for the legacy colors, and a separate table for the 256 ISO/ITU colors. These have now been merged into one, so color table lookups no longer need to decide which of the two tables they should be referencing. I've also updated all the methods that took a color table as a parameter to use a `basic_string_view` instead of separate pointer and length variables, which I think makes them a lot easier and safer to work with. With this new architecture in place, I could now update the `AdaptDispatch` SGR implementation to store the ISO/ITU indexed colors as `IsIndex256` values, where before they were mapped to RGB values (which prevented them reflecting any color scheme changes). I could also update the `TerminalDispatch` implementation to differentiate between the two index types, so that the `SGR 1` brightening would only be applied to the ANSI colors. I've also done a bit of code refactoring to try and minimise any direct access to the color tables, getting rid of a lot of places that were copying tables with `memmove` operations. I'm hoping this will make it easier for us to update the code in the future if we want to reorder the table entries (which is likely a requirement for unifying the `AdaptDispatch` and `TerminalDispatch` implementations). ## Validation Steps Performed For testing, I've just updated the existing unit tests to account for the API changes. The `TextColorTests` required an extra parameter specifying the index type when setting an index. And the `AdapterTest` and `ScreenBufferTests` required the use of the new `SetIndexedXXX` methods in order to be explicit about the index type, instead of relying on the `TextAttribute` constructor and the old `SetForeground` and `SetBackground` methods which didn't have a way to differentiate index types. I've manually tested the various console APIs (`SetConsoleTextAttribute`, `ReadConsoleOutputAttribute`, and `ReadConsoleOutput`), to make sure they are still setting and reading the attributes as well as they used to. And I've tested the `SetConsoleScreenBufferInfoEx` and `GetConsoleScreenBufferInfoEx` APIs to make sure they can read and write the color table correctly. I've also tested the color table in the properties dialog, made sure it was saved and restored from the registry correctly, and similarly saved and restored from a shortcut link. Note that there are still a bunch of issues with the color table APIs, but no new problems have been introduced by the changes in this PR, as far as I could tell. I've also done a bunch of manual tests of `OSC 4` to make sure it's updating all the colors correctly (at least in conhost), and confirmed that the test case in issue #1223 now works as expected.
125 lines
5.3 KiB
C++
125 lines
5.3 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "precomp.h"
|
|
#include "WinTelnetEngine.hpp"
|
|
#include "..\..\inc\conattrs.hpp"
|
|
#pragma hdrstop
|
|
using namespace Microsoft::Console;
|
|
using namespace Microsoft::Console::Render;
|
|
using namespace Microsoft::Console::Types;
|
|
|
|
WinTelnetEngine::WinTelnetEngine(_In_ wil::unique_hfile hPipe,
|
|
const IDefaultColorProvider& colorProvider,
|
|
const Viewport initialViewport,
|
|
const std::basic_string_view<COLORREF> colorTable) :
|
|
VtEngine(std::move(hPipe), colorProvider, initialViewport),
|
|
_colorTable(colorTable)
|
|
{
|
|
}
|
|
|
|
// Routine Description:
|
|
// - Write a VT sequence to change the current colors of text. Only writes
|
|
// 16-color attributes.
|
|
// Arguments:
|
|
// - colorForeground: The RGB Color to use to paint the foreground text.
|
|
// - colorBackground: The RGB Color to use to paint the background of the text.
|
|
// - legacyColorAttribute: A console attributes bit field specifying the brush
|
|
// colors we should use.
|
|
// - extendedAttrs - extended text attributes (italic, underline, etc.) to use.
|
|
// - isSettingDefaultBrushes: indicates if we should change the background color of
|
|
// the window. Unused for VT
|
|
// Return Value:
|
|
// - S_OK if we succeeded, else an appropriate HRESULT for failing to allocate or write.
|
|
[[nodiscard]] HRESULT WinTelnetEngine::UpdateDrawingBrushes(const COLORREF colorForeground,
|
|
const COLORREF colorBackground,
|
|
const WORD /*legacyColorAttribute*/,
|
|
const ExtendedAttributes extendedAttrs,
|
|
const bool /*isSettingDefaultBrushes*/) noexcept
|
|
{
|
|
return VtEngine::_16ColorUpdateDrawingBrushes(colorForeground,
|
|
colorBackground,
|
|
WI_IsFlagSet(extendedAttrs, ExtendedAttributes::Bold),
|
|
_colorTable);
|
|
}
|
|
|
|
// Routine Description:
|
|
// - Write a VT sequence to move the cursor to the specified coordinates. We
|
|
// also store the last place we left the cursor for future optimizations.
|
|
// Arguments:
|
|
// - coord: location to move the cursor to.
|
|
// Return Value:
|
|
// - S_OK if we succeeded, else an appropriate HRESULT for failing to allocate or write.
|
|
[[nodiscard]] HRESULT WinTelnetEngine::_MoveCursor(COORD const coord) noexcept
|
|
{
|
|
HRESULT hr = S_OK;
|
|
// don't try and be clever about moving the cursor.
|
|
// Always just use the full sequence
|
|
if (coord.X != _lastText.X || coord.Y != _lastText.Y)
|
|
{
|
|
hr = _CursorPosition(coord);
|
|
if (SUCCEEDED(hr))
|
|
{
|
|
_lastText = coord;
|
|
}
|
|
}
|
|
return hr;
|
|
}
|
|
|
|
// Routine Description:
|
|
// - Scrolls the existing data on the in-memory frame by the scroll region
|
|
// deltas we have collectively received through the Invalidate methods
|
|
// since the last time this was called.
|
|
// Because win-telnet doesn't know how to do anything smart in response to
|
|
// scrolling, we do nothing.
|
|
// Arguments:
|
|
// - <none>
|
|
// Return Value:
|
|
// - S_OK
|
|
[[nodiscard]] HRESULT WinTelnetEngine::ScrollFrame() noexcept
|
|
{
|
|
// win-telnet doesn't know anything about scroll vt sequences
|
|
// every frame, we're repainting everything, always.
|
|
return S_OK;
|
|
}
|
|
|
|
// Routine Description:
|
|
// - Notifies us that the console is attempting to scroll the existing screen
|
|
// area
|
|
// Arguments:
|
|
// - pcoordDelta - Pointer to character dimension (COORD) of the distance the
|
|
// console would like us to move while scrolling.
|
|
// Return Value:
|
|
// - S_OK if we succeeded, else an appropriate HRESULT for failing to allocate or write.
|
|
[[nodiscard]] HRESULT WinTelnetEngine::InvalidateScroll(const COORD* const /*pcoordDelta*/) noexcept
|
|
{
|
|
// win-telnet assumes the client doesn't know anything about inserting or
|
|
// deleting lines.
|
|
// So instead, just invalidate the entire viewport. Every line is going to
|
|
// have to move.
|
|
return InvalidateAll();
|
|
}
|
|
|
|
// Method Description:
|
|
// - Wrapper for ITerminalOutputConnection. Write an ascii-only string to the pipe.
|
|
// Arguments:
|
|
// - wstr - wstring of text to be written
|
|
// Return Value:
|
|
// - S_OK or suitable HRESULT error from either conversion or writing pipe.
|
|
[[nodiscard]] HRESULT WinTelnetEngine::WriteTerminalW(_In_ const std::wstring_view wstr) noexcept
|
|
{
|
|
RETURN_IF_FAILED(VtEngine::_WriteTerminalAscii(wstr));
|
|
// GH#4106, GH#2011 - WriteTerminalW is only ever called by the
|
|
// StateMachine, when we've encountered a string we don't understand. When
|
|
// this happens, we usually don't actually trigger another frame, but we
|
|
// _do_ want this string to immediately be sent to the terminal. Since we
|
|
// only flush our buffer on actual frames, this means that strings we've
|
|
// decided to pass through would have gotten buffered here until the next
|
|
// actual frame is triggered.
|
|
//
|
|
// To fix this, flush here, so this string is sent to the connected terminal
|
|
// application.
|
|
|
|
return _Flush();
|
|
}
|