Reduce cost of cursor invalidation

microsoft · Jun 2, 2023 · 3cb78a4 · 3cb78a4
1 parent 9ad4e16
commit 3cb78a4
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 117 deletions.
diff --git a/src/buffer/out/LineRendition.hpp b/src/buffer/out/LineRendition.hpp
@@ -21,6 +21,13 @@ enum class LineRendition : uint8_t
     DoubleHeightBottom
 };
 
+constexpr til::rect ScreenToBufferLine(const til::rect& line, const LineRendition lineRendition)
+{
+    // Use shift right to quickly divide the Left and Right by 2 for double width lines.
+    const auto scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
+    return { line.left >> scale, line.top, line.right >> scale, line.bottom };
+}
+
 constexpr til::inclusive_rect ScreenToBufferLine(const til::inclusive_rect& line, const LineRendition lineRendition)
 {
     // Use shift right to quickly divide the Left and Right by 2 for double width lines.
@@ -35,6 +42,13 @@ constexpr til::point ScreenToBufferLine(const til::point& line, const LineRendit
     return { line.x >> scale, line.y };
 }
 
+constexpr til::rect BufferToScreenLine(const til::rect& line, const LineRendition lineRendition)
+{
+    // Use shift left to quickly multiply the Left and Right by 2 for double width lines.
+    const auto scale = lineRendition == LineRendition::SingleWidth ? 0 : 1;
+    return { line.left << scale, line.top, (line.right << scale) + scale, line.bottom };
+}
+
 constexpr til::inclusive_rect BufferToScreenLine(const til::inclusive_rect& line, const LineRendition lineRendition)
 {
     // Use shift left to quickly multiply the Left and Right by 2 for double width lines.

diff --git a/src/buffer/out/cursor.cpp b/src/buffer/out/cursor.cpp
@@ -188,11 +188,7 @@ void Cursor::_RedrawCursor() noexcept
 // - <none>
 void Cursor::_RedrawCursorAlways() noexcept
 {
-    try
-    {
-        _parentBuffer.TriggerRedrawCursor(_cPosition);
-    }
-    CATCH_LOG();
+    _parentBuffer.NotifyPaintFrame();
 }
 
 void Cursor::SetPosition(const til::point cPosition) noexcept

diff --git a/src/buffer/out/textBuffer.cpp b/src/buffer/out/textBuffer.cpp
@@ -1020,19 +1020,19 @@ Microsoft::Console::Render::Renderer& TextBuffer::GetRenderer() noexcept
     return _renderer;
 }
 
-void TextBuffer::TriggerRedraw(const Viewport& viewport)
+void TextBuffer::NotifyPaintFrame() noexcept
 {
     if (_isActiveBuffer)
     {
-        _renderer.TriggerRedraw(viewport);
+        _renderer.NotifyPaintFrame();
     }
 }
 
-void TextBuffer::TriggerRedrawCursor(const til::point position)
+void TextBuffer::TriggerRedraw(const Viewport& viewport)
 {
     if (_isActiveBuffer)
     {
-        _renderer.TriggerRedrawCursor(&position);
+        _renderer.TriggerRedraw(viewport);
     }
 }
 

diff --git a/src/buffer/out/textBuffer.hpp b/src/buffer/out/textBuffer.hpp
@@ -147,8 +147,8 @@ class TextBuffer final
 
     Microsoft::Console::Render::Renderer& GetRenderer() noexcept;
 
+    void NotifyPaintFrame() noexcept;
     void TriggerRedraw(const Microsoft::Console::Types::Viewport& viewport);
-    void TriggerRedrawCursor(const til::point position);
     void TriggerRedrawAll();
     void TriggerScroll();
     void TriggerScroll(const til::point delta);

diff --git a/src/cascadia/PublicTerminalCore/HwndTerminal.cpp b/src/cascadia/PublicTerminalCore/HwndTerminal.cpp
@@ -238,15 +238,8 @@ try
     // This ensures that teardown is reentrant.
 
     // Shut down the renderer (and therefore the thread) before we implode
-    if (auto localRenderEngine{ std::exchange(_renderEngine, nullptr) })
-    {
-        if (auto localRenderer{ std::exchange(_renderer, nullptr) })
-        {
-            localRenderer->TriggerTeardown();
-            // renderer is destroyed
-        }
-        // renderEngine is destroyed
-    }
+    _renderer.reset();
+    _renderEngine.reset();
 
     if (auto localHwnd{ _hwnd.release() })
     {

diff --git a/src/cascadia/TerminalControl/ControlCore.cpp b/src/cascadia/TerminalControl/ControlCore.cpp
@@ -210,11 +210,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     ControlCore::~ControlCore()
     {
         Close();
-
-        if (_renderer)
-        {
-            _renderer->TriggerTeardown();
-        }
     }
 
     void ControlCore::Detach()

diff --git a/src/host/getset.cpp b/src/host/getset.cpp
@@ -743,7 +743,7 @@ void ApiRoutines::GetLargestConsoleWindowSizeImpl(const SCREEN_INFORMATION& cont
             // When evaluating the X offset, we must convert the buffer position to
             // equivalent screen coordinates, taking line rendition into account.
             const auto lineRendition = buffer.GetTextBuffer().GetLineRendition(position.y);
-            const auto screenPosition = BufferToScreenLine({ position.x, position.y, position.x, position.y }, lineRendition);
+            const auto screenPosition = BufferToScreenLine(til::inclusive_rect{ position.x, position.y, position.x, position.y }, lineRendition);
 
             if (currentViewport.left > screenPosition.left)
             {