maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert two cursor changes that cause crashing and rendering art… (#3292)

Browse source 
Revert "Fix cursor redrawing crash (#2965)"
This reverts commit 926a2e3d80.

Revert "Fix double width cursor for CJK characters (#2932)"
This reverts commit eafa884fc4.

Fixes #3277.
Fully reverts #2965, #2932.
This commit is contained in:
Dustin L. Howett (MSFT) 2019-10-22 14:42:57 -07:00 committed by Michael Niksa
parent 06f2706c40
commit d6790c023f
3 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/cascadia/TerminalCore/Terminal.cpp
View file

@ -178,18 +178,6 @@ void Terminal::UpdateSettings(winrt::Microsoft::Terminal::Settings::ICoreSetting
proposedTop -= (proposedBottom - bufferSize.Y);
}
Cursor& cursor = _buffer->GetCursor();
auto cursorPosition = cursor.GetPosition();
// If the cursor is positioned beyond the range of the viewport, then
// set the cursor position to a legal value.
cursorPosition.X = std::min(cursorPosition.X, static_cast<SHORT>(viewportSize.X - 1));
cursorPosition.Y = std::min(cursorPosition.Y, static_cast<SHORT>(viewportSize.Y - 1));
cursor.StartDeferDrawing();
cursor.SetPosition(cursorPosition);
cursor.EndDeferDrawing();
_mutableViewport = Viewport::FromDimensions({ 0, proposedTop }, viewportSize);
_scrollOffset = 0;
_NotifyScrollEvent();
@ -437,11 +425,6 @@ 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)
@ -550,8 +533,6 @@ void Terminal::_InitializeColorTable()
// - isVisible: whether the cursor should be visible
void Terminal::SetCursorVisible(const bool isVisible) noexcept
{
auto lock = LockForWriting();
auto& cursor = _buffer->GetCursor();
cursor.SetIsVisible(isVisible);
}

1
src/cascadia/TerminalCore/Terminal.hpp
View file

@ -11,7 +11,6 @@
#include "../../terminal/input/terminalInput.hpp"
#include "../../types/inc/Viewport.hpp"
#include "../../types/inc/GlyphWidth.hpp"
#include "../../types/IUiaData.h"
#include "../../cascadia/terminalcore/ITerminalApi.hpp"
#include "../../cascadia/terminalcore/ITerminalInput.hpp"

4
src/cascadia/TerminalCore/terminalrenderdata.cpp
View file

@ -92,9 +92,7 @@ COLORREF Terminal::GetCursorColor() const noexcept
bool Terminal::IsCursorDoubleWidth() const noexcept
{
const auto position = _buffer->GetCursor().GetPosition();
TextBufferTextIterator it(TextBufferCellIterator(*_buffer, position));
return IsGlyphFullWidth(*it);
return false;
}
const std::vector<RenderOverlay> Terminal::GetOverlays() const noexcept