Skip to content

Commit

Permalink
Patch fix for #1360 until WriteStream (#780) can be implemented.
Browse files Browse the repository at this point in the history
  • Loading branch information
miniksa committed Sep 26, 2019
1 parent 86c9e58 commit f60566c
Showing 1 changed file with 12 additions and 0 deletions.
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
// 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

0 comments on commit f60566c

Please sign in to comment.