Fix various cooked read issues #17556
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
src/host/readDataCooked.cpp
Outdated
| @@ -1134,7 +1178,10 @@ | |||
| const auto& line = lines.at(i + pagerContentTop); | |||
|
|
|||
| // Skip lines that aren't marked as dirty. | |||
| if (line.dirtyBegOffset >= line.text.size()) | |||
| // We use dirtyBegColumn instead of dirtyBegOffset to test for dirtiness, because a line that has 1 column | |||
| // of space for layout and was asked to fit a wide glyph will have no text, but stil be "dirty". | |||
Check failure
Code scanning / check-spelling
Unrecognized Spelling
lhecker
force-pushed
the
dev/lhecker/17554-cooked-fixup
branch
from
ff17a2a
to
04c04b7
Compare
| @@ -445,7 +445,6 @@ size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::Coord | |||
| while (dist < len) | |||
| { | |||
| cwd.GraphemeNext(state, chars); | |||
| dist += state.len; | |||
There was a problem hiding this comment.
We shouldn't mark this grapheme as consumed (dist) if we'll early return in the if right below.
| { | ||
| pagerPromptEnd.x = 0; | ||
| pagerPromptEnd.y++; | ||
| } |
There was a problem hiding this comment.
Modifying pagerPromptEnd like this throws off the if condition right after this one.
| @@ -960,12 +955,14 @@ void COOKED_READ_DATA::_redisplay() | |||
| auto& line = lines.back(); | |||
|
|
|||
| // CSI K may be expensive, so use spaces if we can. | |||
| if (remaining <= 8) | |||
| if (remaining <= 16) | |||
There was a problem hiding this comment.
I felt like 16 would be more appropriate for word-wise deletions.
| if (it != end && column < columnLimit) | ||
| { | ||
| output.append(columnLimit - column, L' '); | ||
| column = columnLimit; | ||
| } |
There was a problem hiding this comment.
Removing this stops us from inserting padding spaces manually (that's the job of the terminal). But with the if condition gone, we need to move the column = columnLimit; elsewhere of course, because otherwise the caller doesn't know that we line-wrapped.
as narrow glyphs which broke line layout.
padded with whitespace which broke Ctrl+A + Ctrl+C in conhost.
parts of the viewport with leftover text and not clear it away.
its first two characters.
Closes #17554