Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch fix for #1360 until WriteStream (#780) can be implemented. #2924

Merged
4 commits merged into from
Oct 1, 2019
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/cascadia/TerminalCore/Terminal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,18 @@ void Terminal::_WriteBuffer(const std::wstring_view& stringView)
}
}

// If we're about to try to place the cursor past the right edge of the buffer, move it down a row
// This is another patch that GH#780 should supercede. This is really correcting for other bad situations
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

supersede*

DHowett-MSFT marked this conversation as resolved.
Show resolved Hide resolved
// like bisecting (writing only the leading half because there's no room for the trailing) a wide character
// into the buffer. However, it's not really all-up correctable without implementing a full WriteStream here.
// Also, this particular code RIGHT HERE shouldn't need to know anything about the cursor or the cells advanced
// which also will be solved by GH#780 (hopefully).
if (proposedCursorPosition.X > bufferSize.RightInclusive())
{
proposedCursorPosition.X = 0;
proposedCursorPosition.Y++;
}

// If we're about to scroll past the bottom of the buffer, instead cycle the buffer.
const auto newRows = proposedCursorPosition.Y - bufferSize.Height() + 1;
if (newRows > 0)
Expand Down