starred/terminal-microsoft
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-07-08 17:46:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Korean IME overlay hiding characters to the right of cursor (#20041)

Browse Source 
This commit fixes a regression in v1.24, where composing Korean text
in-between existing characters causes text to the right to be hidden.
This is problematic for the Korean IME, because it commonly inserts
the composed syllable between existing characters.

The fix compresses (removes/absorbs) available whitespace to the right
of the composition to make space for any existing text. This means
that a composition now virtually acts in insert mode.

Closes #20040
Refs #19738
Refs #20039

## Validation Steps Performed

1. Korean IME: compose `ㄷ` between `가` and `나` → display shows `가ㄷ나`,
`나` visible.
2. TUI box (vim prompt with padding): compose inside padded text box →
border preserved in place.
3. Composition at end of line (no chars to right): unaffected.
4. English and other IME input: not affected (no active composition
row).

Co-authored-by: jason <drvoss@users.noreply.github.com>
Co-authored-by: Leonard Hecker <lhecker@microsoft.com>
This commit is contained in:
jason
2026-04-17 09:12:19 +09:00
committed by GitHub
parent b2666fb346
commit 7a83c0f167
4 changed files with 111 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/buffer/out/Row.cpp
View File

@@ -1143,6 +1143,13 @@ til::CoordType ROW::GetTrailingColumnAtCharOffset(const ptrdiff_t offset) const
return _createCharToColumnMapper(offset).GetTrailingColumnAt(offset);
}
uint16_t ROW::GetCharOffset(til::CoordType col) const noexcept
{
const auto columns = GetReadableColumnCount();
const auto colBeg = clamp(col, 0, columns);
return _uncheckedCharOffset(gsl::narrow_cast<size_t>(colBeg));
}
DelimiterClass ROW::DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept
{
const auto col = _clampedColumn(column);

1
src/buffer/out/Row.hpp
View File

@@ -172,6 +172,7 @@ public:
std::wstring_view GetText(til::CoordType columnBegin, til::CoordType columnEnd) const noexcept;
til::CoordType GetLeadingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
til::CoordType GetTrailingColumnAtCharOffset(ptrdiff_t offset) const noexcept;
uint16_t GetCharOffset(til::CoordType col) const noexcept;
DelimiterClass DelimiterClassAt(til::CoordType column, const std::wstring_view& wordDelimiters) const noexcept;
auto AttrBegin() const noexcept { return _attr.begin(); }

134
src/renderer/base/renderer.cpp
View File

@@ -1061,38 +1061,7 @@ void Renderer::_PaintBufferOutput(_In_ IRenderEngine* const pEngine)
ROW* rowBackup = nullptr;
if (row == compositionRow)
{
auto& scratch = buffer.GetScratchpadRow();
scratch.CopyFrom(r);
rowBackup = &scratch;
std::wstring_view text{ activeComposition.text };
RowWriteState state{
.columnLimit = r.GetReadableColumnCount(),
.columnEnd = _compositionCache->absoluteOrigin.x,
};
size_t off = 0;
for (const auto& range : activeComposition.attributes)
{
const auto len = range.len;
auto attr = range.attr;
// Use the color at the cursor if TSF didn't specify any explicit color.
if (attr.GetBackground().IsDefault())
{
attr.SetBackground(_compositionCache->baseAttribute.GetBackground());
}
if (attr.GetForeground().IsDefault())
{
attr.SetForeground(_compositionCache->baseAttribute.GetForeground());
}
state.text = text.substr(off, len);
state.columnBegin = state.columnEnd;
const_cast<ROW&>(r).ReplaceText(state);
const_cast<ROW&>(r).ReplaceAttributes(state.columnBegin, state.columnEnd, attr);
off += len;
}
rowBackup = _PaintBufferOutputComposition(buffer, r, activeComposition);
}
const auto restore = wil::scope_exit([&] {
if (rowBackup)
@@ -1132,6 +1101,107 @@ void Renderer::_PaintBufferOutput(_In_ IRenderEngine* const pEngine)
}
}
ROW* Renderer::_PaintBufferOutputComposition(TextBuffer& buffer, const ROW& r, const Composition& activeComposition)
{
auto& scratch = buffer.GetScratchpadRow();
scratch.CopyFrom(r);
// *Overwrite* the original text with the active composition...
til::CoordType compositionEnd = 0;
{
std::wstring_view text{ activeComposition.text };
RowWriteState state{
.columnLimit = r.GetReadableColumnCount(),
.columnEnd = _compositionCache->absoluteOrigin.x,
};
size_t off = 0;
for (const auto& range : activeComposition.attributes)
{
const auto len = range.len;
auto attr = range.attr;
// Use the color at the cursor if TSF didn't specify any explicit color.
if (attr.GetBackground().IsDefault())
{
attr.SetBackground(_compositionCache->baseAttribute.GetBackground());
}
if (attr.GetForeground().IsDefault())
{
attr.SetForeground(_compositionCache->baseAttribute.GetForeground());
}
state.text = text.substr(off, len);
state.columnBegin = state.columnEnd;
const_cast<ROW&>(r).ReplaceText(state);
const_cast<ROW&>(r).ReplaceAttributes(state.columnBegin, state.columnEnd, attr);
off += len;
}
compositionEnd = state.columnEnd;
}
// The text we've overwritten may have been crucial to the user,
// so copy it back by absorbing available whitespace to the right
// and re-inserting the non-whitespace characters instead.
const auto compositionWidth = compositionEnd - _compositionCache->absoluteOrigin.x;
const auto colLimit = r.GetReadableColumnCount();
if (compositionWidth > 0 && compositionEnd < colLimit)
{
const auto text = scratch.GetText();
auto srcCol = _compositionCache->absoluteOrigin.x;
auto dstCol = compositionEnd;
auto remaining = compositionWidth;
size_t i = scratch.GetCharOffset(srcCol);
while (i < text.size() && dstCol < colLimit)
{
// Treat whitespace we encounter as a credit towards our composition width.
// This loop essentially absorbs the whitespace.
while (i < text.size() && til::at(text, i) == L' ' && remaining > 0)
{
remaining--;
srcCol++;
i++;
}
if (remaining <= 0)
{
break;
}
// Find the end of the non-whitespace span: Our span of text to insert.
auto spanEnd = i;
while (spanEnd < text.size() && til::at(text, spanEnd) != L' ')
{
spanEnd++;
}
// Copy the non-whitespace segment from the original text (scratch) back in.
RowCopyTextFromState state{
.source = scratch,
.columnBegin = dstCol,
.columnLimit = colLimit,
.sourceColumnBegin = srcCol,
.sourceColumnLimit = scratch.GetLeadingColumnAtCharOffset(spanEnd),
};
const_cast<ROW&>(r).CopyTextFrom(state);
const auto srcBeg = gsl::narrow_cast<uint16_t>(srcCol);
const auto srcEnd = gsl::narrow_cast<uint16_t>(state.sourceColumnEnd);
const auto attr = scratch.Attributes().slice(srcBeg, srcEnd);
const auto dstBeg = gsl::narrow_cast<uint16_t>(dstCol);
const auto dstEnd = gsl::narrow_cast<uint16_t>(dstCol + attr.size());
const_cast<ROW&>(r).Attributes().replace(dstBeg, dstEnd, attr);
dstCol = state.columnEnd;
srcCol = state.sourceColumnEnd;
i = spanEnd;
}
}
return &scratch;
}
static bool _IsAllSpaces(const std::wstring_view v)
{
// first non-space char is not found (is npos)

1
src/renderer/base/renderer.hpp
View File

@@ -121,6 +121,7 @@ namespace Microsoft::Console::Render
void _scheduleRenditionBlink();
[[nodiscard]] HRESULT _PaintBackground(_In_ IRenderEngine* const pEngine);
void _PaintBufferOutput(_In_ IRenderEngine* const pEngine);
ROW* _PaintBufferOutputComposition(TextBuffer& buffer, const ROW& r, const Composition& activeComposition);
void _PaintBufferOutputHelper(_In_ IRenderEngine* const pEngine, TextBufferCellIterator it, const til::point target);
void _PaintBufferOutputGridLineHelper(_In_ IRenderEngine* const pEngine, const TextAttribute textAttribute, const size_t cchLine, const til::point coordTarget);
bool _isHoveredHyperlink(const TextAttribute& textAttribute) const noexcept;