80da24ecf8
We were using std::basic_string_view as a stand-in for std::span so that
we could change over all at once when C++20 dropped with full span
support. That day's not here yet, but as of 54a7fce3e we're using GSL 3,
whose span is C++20-compliant.
This commit replaces every instance of basic_string_view that was not
referring to an actual string with a span of the appropriate type.
I moved the `const` qualifier into span's `T` because while
`basic_string_view.at()` returns `const T&`, `span.at()` returns `T&`
(without the const). I wanted to maintain the invariant that members of
the span were immutable.
* Mechanical Changes
* `sv.at(x)` -> `gsl::at(sp, x)`
* `sv.c{begin,end}` -> `sp.{begin,end}` (span's iterators are const)
I had to replace a `std::basic_string<>` with a `std::vector<>` in
ConImeInfo, and I chose to replace a manual array walk in
ScreenInfoUiaProviderBase with a ranged-for. Please review those
specifically.
This will almost certainly cause a code size regression in Windows
because I'm blowing out all the PGO counts. Whoops.
Related: #3956, #975.
104 lines
3.5 KiB
C++
104 lines
3.5 KiB
C++
/*++
|
|
|
|
Copyright (c) Microsoft Corporation.
|
|
Licensed under the MIT license.
|
|
|
|
Module Name:
|
|
|
|
TfConvArea.cpp
|
|
|
|
Abstract:
|
|
|
|
This file implements the CConversionArea Class.
|
|
|
|
Author:
|
|
|
|
Revision History:
|
|
|
|
Notes:
|
|
|
|
--*/
|
|
|
|
#include "precomp.h"
|
|
#include "ConsoleTSF.h"
|
|
#include "TfCtxtComp.h"
|
|
#include "TfConvArea.h"
|
|
|
|
//+---------------------------------------------------------------------------
|
|
// CConversionArea
|
|
//----------------------------------------------------------------------------
|
|
|
|
[[nodiscard]] HRESULT CConversionArea::DrawComposition(const std::wstring_view CompStr,
|
|
const std::vector<TF_DISPLAYATTRIBUTE>& DisplayAttributes,
|
|
const DWORD CompCursorPos)
|
|
{
|
|
// Set up colors.
|
|
static const std::array<WORD, CONIME_ATTRCOLOR_SIZE> colors{ DEFAULT_COMP_ENTERED,
|
|
DEFAULT_COMP_ALREADY_CONVERTED,
|
|
DEFAULT_COMP_CONVERSION,
|
|
DEFAULT_COMP_YET_CONVERTED,
|
|
DEFAULT_COMP_INPUT_ERROR,
|
|
DEFAULT_COMP_INPUT_ERROR,
|
|
DEFAULT_COMP_INPUT_ERROR,
|
|
DEFAULT_COMP_INPUT_ERROR };
|
|
|
|
const auto encodedAttributes = _DisplayAttributesToEncodedAttributes(DisplayAttributes,
|
|
CompCursorPos);
|
|
|
|
gsl::span<const BYTE> attributes(encodedAttributes.data(), encodedAttributes.size());
|
|
gsl::span<const WORD> colorArray(colors.data(), colors.size());
|
|
|
|
return ImeComposeData(CompStr, attributes, colorArray);
|
|
}
|
|
|
|
[[nodiscard]] HRESULT CConversionArea::ClearComposition()
|
|
{
|
|
return ImeClearComposeData();
|
|
}
|
|
|
|
[[nodiscard]] HRESULT CConversionArea::DrawResult(const std::wstring_view ResultStr)
|
|
{
|
|
return ImeComposeResult(ResultStr);
|
|
}
|
|
|
|
[[nodiscard]] std::vector<BYTE> CConversionArea::_DisplayAttributesToEncodedAttributes(const std::vector<TF_DISPLAYATTRIBUTE>& DisplayAttributes,
|
|
const DWORD CompCursorPos)
|
|
{
|
|
std::vector<BYTE> encodedAttrs;
|
|
for (const auto& da : DisplayAttributes)
|
|
{
|
|
BYTE bAttr;
|
|
|
|
if (da.bAttr == TF_ATTR_OTHER || da.bAttr > TF_ATTR_FIXEDCONVERTED)
|
|
{
|
|
bAttr = ATTR_TARGET_CONVERTED;
|
|
}
|
|
else
|
|
{
|
|
if (da.bAttr == TF_ATTR_INPUT_ERROR)
|
|
{
|
|
bAttr = ATTR_CONVERTED;
|
|
}
|
|
else
|
|
{
|
|
bAttr = (BYTE)da.bAttr;
|
|
}
|
|
}
|
|
encodedAttrs.emplace_back(bAttr);
|
|
}
|
|
|
|
if (CompCursorPos != -1)
|
|
{
|
|
if (CompCursorPos == 0)
|
|
{
|
|
encodedAttrs[CompCursorPos] |= CONIME_CURSOR_LEFT; // special handling for ConSrv... 0x20 = COMMON_LVB_GRID_SINGLEFLAG + COMMON_LVB_GRID_LVERTICAL
|
|
}
|
|
else if (CompCursorPos - 1 < DisplayAttributes.size())
|
|
{
|
|
encodedAttrs[CompCursorPos - 1] |= CONIME_CURSOR_RIGHT; // special handling for ConSrv... 0x10 = COMMON_LVB_GRID_SINGLEFLAG + COMMON_LVB_GRID_RVERTICAL
|
|
}
|
|
}
|
|
|
|
return encodedAttrs;
|
|
}
|