Skip to content

Commit

Permalink
Added read lock and fix various cursor pos issue
Browse files Browse the repository at this point in the history
  • Loading branch information
skyline75489 committed Oct 17, 2019
1 parent b293b2b commit 30956d7
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions src/cascadia/TerminalCore/Terminal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,21 @@ void Terminal::UpdateSettings(winrt::Microsoft::Terminal::Settings::ICoreSetting
proposedTop -= (proposedBottom - bufferSize.Y);
}

Cursor& cursor = _buffer->GetCursor();
auto cursorPosition = cursor.GetPosition();
if (cursorPosition.X > viewportSize.X)
{
cursorPosition.X = viewportSize.X - 1;
}
if (cursorPosition.Y > viewportSize.Y)
{
cursorPosition.Y = viewportSize.Y;
}

cursor.StartDeferDrawing();
cursor.SetPosition(cursorPosition);
cursor.EndDeferDrawing();

_mutableViewport = Viewport::FromDimensions({ 0, proposedTop }, viewportSize);
_scrollOffset = 0;
_NotifyScrollEvent();
Expand Down Expand Up @@ -425,6 +440,11 @@ void Terminal::_WriteBuffer(const std::wstring_view& stringView)
}
}

if (proposedCursorPosition.X > bufferSize.RightInclusive())
{
proposedCursorPosition.X = 0;
}

// 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 Expand Up @@ -533,6 +553,8 @@ void Terminal::_InitializeColorTable()
// - isVisible: whether the cursor should be visible
void Terminal::SetCursorVisible(const bool isVisible) noexcept
{
auto lock = LockForReading();

auto& cursor = _buffer->GetCursor();
cursor.SetIsVisible(isVisible);
}
Expand Down

0 comments on commit 30956d7

Please sign in to comment.