Fix GetVirtualViewport, Fix popup alignment

src/host/readDataCooked.cpp

@@ -110,7 +110,7 @@ COOKED_READ_DATA::COOKED_READ_DATA(_In_ InputBuffer* const pInputBuffer,
         absoluteCursorPos.y = gsl::narrow_cast<til::CoordType>(cols / w);
     }
 
-    _screenInfo.GetVirtualViewport().ConvertToOrigin(&absoluteCursorPos);
+    _screenInfo.GetVirtualBufferViewport().ConvertToOrigin(&absoluteCursorPos);
     absoluteCursorPos.x = std::max(0, absoluteCursorPos.x);
     absoluteCursorPos.y = std::max(0, absoluteCursorPos.y);
 
@@ -259,7 +259,7 @@ bool COOKED_READ_DATA::PresentingPopup() const noexcept
 til::point_span COOKED_READ_DATA::GetBoundaries() const noexcept
 {
     const auto viewport = _screenInfo.GetViewport();
-    const auto virtualViewport = _screenInfo.GetVirtualViewport();
+    const auto virtualViewport = _screenInfo.GetVirtualBufferViewport();
 
     static constexpr til::point min;
     const til::point max{ viewport.RightInclusive(), viewport.BottomInclusive() };
@@ -777,7 +777,7 @@ void COOKED_READ_DATA::_redisplay()
         return;
     }
 
-    const auto size = _screenInfo.GetVirtualViewport().Dimensions();
+    const auto size = _screenInfo.GetBufferSize().Dimensions();
     auto originInViewportFinal = _originInViewport;
     til::point cursorPositionFinal;
     til::point pagerPromptEnd;
@@ -868,16 +868,11 @@ void COOKED_READ_DATA::_redisplay()
         {
             auto& popup = _popups.back();
 
-            // But it should not be right on the line where the prompt starts.
-            // That would look goofy otherwise, since there's where the text is supposed to go.
-            if (lines.empty())
-            {
-                lines.emplace_back();
-            }
-
             // Ensure that the popup is not considered part of the prompt line. That is, if someone double-clicks
             // to select the last word in the prompt, it should not select the first word in the popup.
-            lines.back().text.append(L"\r\n");
+            auto& lastLine = lines.back();
+            lastLine.text.append(L"\r\n");
+            lastLine.columns = size.width;
 
             switch (popup.kind)
             {
@@ -913,7 +908,7 @@ void COOKED_READ_DATA::_redisplay()
             // a line because otherwise it won't have any space to be visible.
             if (_bufferCursor == _buffer.size())
             {
-                lines.emplace_back(L" \b");
+                lines.emplace_back(L" \b", 0, 0, 0);
             }
         }
 
@@ -1383,7 +1378,7 @@ void COOKED_READ_DATA::_popupDrawPrompt(std::vector<Line>& lines, const til::siz
     const auto res = _layoutLine(line, str, 0, 0, size.width);
     line.append(L"\x1b[m");
 
-    lines.emplace_back(std::move(line), 0, res.column);
+    lines.emplace_back(std::move(line), 0, 0, res.column);
 }
 
 void COOKED_READ_DATA::_popupDrawCommandList(std::vector<Line>& lines, const til::size size, Popup& popup) const
@@ -1467,7 +1462,6 @@ void COOKED_READ_DATA::_popupDrawCommandList(std::vector<Line>& lines, const til
         if (res.offset < str.size())
         {
             line.push_back(L'…');
-            res.column++;
         }
 
         if (selected)
@@ -1476,7 +1470,7 @@ void COOKED_READ_DATA::_popupDrawCommandList(std::vector<Line>& lines, const til
         }
 
         line.append(L"\r\n");
-        lines.emplace_back(std::move(line), 0, 0, res.column);
+        lines.emplace_back(std::move(line), 0, 0, size.width);
     }
 
     auto& lastLine = lines.back();

src/host/screenInfo.cpp

@@ -2451,20 +2451,24 @@ void SCREEN_INFORMATION::UpdateBottom()
     _virtualBottom = _viewport.BottomInclusive();
 }
 
-// Method Description:
-// - Returns the "virtual" Viewport - the viewport with its bottom at
-//      `_virtualBottom`. For VT operations, this is essentially the mutable
-//      section of the buffer.
-// Arguments:
-// - <none>
-// Return Value:
-// - the virtual terminal viewport
+// Returns the section of the text buffer that would be visible on the screen
+// if the user didn't scroll away vertically. It's essentially the same as
+// GetVirtualBufferViewport() but includes the horizontal scroll offset.
 Viewport SCREEN_INFORMATION::GetVirtualViewport() const noexcept
 {
     const auto newTop = _virtualBottom - _viewport.Height() + 1;
     return Viewport::FromDimensions({ _viewport.Left(), newTop }, _viewport.Dimensions());
 }
 
+// Returns the section of the text buffer that's addressable by VT sequences.
+Viewport SCREEN_INFORMATION::GetVirtualBufferViewport() const noexcept
+{
+    const auto viewportHeight = _viewport.Height();
+    const auto bufferWidth = _textBuffer->GetSize().Width();
+    const auto top = std::max(0, _virtualBottom - viewportHeight + 1);
+    return Viewport::FromExclusive({ 0, top, bufferWidth, top + viewportHeight });
+}
+
 // Method Description:
 // - Returns true if the character at the cursor's current position is wide.
 //   See IsGlyphFullWidth

src/host/screenInfo.hpp

@@ -115,6 +115,7 @@ class SCREEN_INFORMATION : public ConsoleObjectHeader, public Microsoft::Console
     const Microsoft::Console::Types::Viewport& GetViewport() const noexcept;
     void SetViewport(const Microsoft::Console::Types::Viewport& newViewport, const bool updateBottom);
     Microsoft::Console::Types::Viewport GetVirtualViewport() const noexcept;
+    Microsoft::Console::Types::Viewport GetVirtualBufferViewport() const noexcept;
 
     void ProcessResizeWindow(const til::rect* const prcClientNew, const til::rect* const prcClientOld);
     void SetViewportSize(const til::size* const pcoordSize);