microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-11 13:56:33 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

Backup and restore attributes during cooked reads (#18797)

Browse Source 
Use DECSC/DECRC and XTPUSHSGR/XTPOPSGR while redrawing
popups, since they're drawn using the current popup colors.

I wish we could just use the reverse video rendition...

Closes #18742

## Validation Steps Performed
* Run `color 3f` and then press F7
* Works fine in conhost (VtPipeTerm) ✅
* Works as expected (black background) in VS Code ✅
This commit is contained in:
Leonard Hecker 2025-04-15 01:59:46 +02:00 committed by GitHub
parent f7e853cd9f
commit 8b01f546cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/host/readDataCooked.cpp
View File

@ -1119,12 +1119,33 @@ void COOKED_READ_DATA::_redisplay()
output.append(L"\x1b[J"); output.append(L"\x1b[J");
} }
// Disable the cursor when opening a popup, reenable it when closing them. // Backup the attributes (DECSC) and disable the cursor when opening a popup (DECTCEM).
// Restore the attributes (DECRC) reenable the cursor when closing them (DECTCEM).
if (const auto popupOpened = !_popups.empty(); _popupOpened != popupOpened) if (const auto popupOpened = !_popups.empty(); _popupOpened != popupOpened)
{ {
wchar_t buf[] = L"\x1b[?25l"; wchar_t buf[] =
buf[5] = popupOpened ? 'l' : 'h'; // Back/restore cursor position & attributes (commonly supported)
output.append(&buf[0], 6); L"\u001b7"
// Show/hide cursor (commonly supported)
"\u001b[?25l"
// The popup code uses XTPUSHSGR (CSI # {) / XTPOPSGR (CSI # }) to draw the popups in the popup-colors,
// while properly restoring the previous VT attributes. On terminals that support them, the following
// won't do anything. On other terminals however, it'll reset the attributes to default.
// This is important as the first thing the popup drawing code uses CSI K to erase the previous contents
// and CSI m to reset the attributes on terminals that don't support XTPUSHSGR/XTPOPSGR. In order for
// the first CSI K to behave as if there had a previous CSI m, we must emit an initial CSI m here.
// (rarely supported)
"\x1b[#{\x1b[m\x1b[#}";
buf[1] = popupOpened ? '7' : '8';
buf[7] = popupOpened ? 'l' : 'h';
// When the popup closes we skip the XTPUSHSGR/XTPOPSGR sequence. This is crucial because we
// use DECRC to restore the cursor position and attributes with a widely supported sequence.
// If we emitted that XTPUSHSGR/XTPOPSGR sequence it would reset the attributes again.
const size_t len = popupOpened ? 19 : 8;
output.append(buf, len);
_popupOpened = popupOpened; _popupOpened = popupOpened;
} }
@ -1595,10 +1616,10 @@ void COOKED_READ_DATA::_popupDrawPrompt(std::vector<Line>& lines, const til::Coo
str.append(suffix); str.append(suffix);
std::wstring line; std::wstring line;
line.append(L"\x1b[K"); line.append(L"\x1b[#{\x1b[K");
_appendPopupAttr(line); _appendPopupAttr(line);
const auto res = _layoutLine(line, str, 0, 0, width); const auto res = _layoutLine(line, str, 0, 0, width);
line.append(L"\x1b[m"); line.append(L"\x1b[m\x1b[#}");
lines.emplace_back(std::move(line), 0, 0, res.column); lines.emplace_back(std::move(line), 0, 0, res.column);
} }
@ -1654,7 +1675,7 @@ void COOKED_READ_DATA::_popupDrawCommandList(std::vector<Line>& lines, const til
const auto selected = index == cl.selected && !stackedCommandNumberPopup; const auto selected = index == cl.selected && !stackedCommandNumberPopup;
std::wstring line; std::wstring line;
line.append(L"\x1b[K"); line.append(L"\x1b[#{\x1b[K");
_appendPopupAttr(line); _appendPopupAttr(line);
wchar_t scrollbarChar = L' '; wchar_t scrollbarChar = L' ';
@ -1681,7 +1702,7 @@ void COOKED_READ_DATA::_popupDrawCommandList(std::vector<Line>& lines, const til
} }
else else
{ {
line.append(L"\x1b[m "); line.append(L"\x1b[m\x1b[#} ");
} }
fmt::format_to(std::back_inserter(line), FMT_COMPILE(L"{:{}}: "), index, indexWidth); fmt::format_to(std::back_inserter(line), FMT_COMPILE(L"{:{}}: "), index, indexWidth);
@ -1690,7 +1711,7 @@ void COOKED_READ_DATA::_popupDrawCommandList(std::vector<Line>& lines, const til
if (selected) if (selected)
{ {
line.append(L"\x1b[m"); line.append(L"\x1b[m\x1b[#}");
} }
line.append(L"\r\n"); line.append(L"\r\n");