Address feedback, Fix scrolling bug

doc/COOKED_READ_DATA.md

@@ -4,12 +4,8 @@
 
 All of the following ✅ marks must be fulfilled during manual testing:
 * ASCII input
-* Chinese input (中文維基百科) ❔
-  * Resizing the window properly wraps/unwraps wide glyphs ❌
-    Broken due to `TextBuffer::Reflow` bugs
-* Surrogate pair input (🙂) ❔
-  * Resizing the window properly wraps/unwraps surrogate pairs ❌
-    Broken due to `TextBuffer::Reflow` bugs
+* Chinese input (中文維基百科) ✅
+* Surrogate pair input (🙂) ✅
 * In cmd.exe
   * Create 2 file: "a😊b.txt" and "a😟b.txt"
   * Press tab: Autocomplete to "a😊b.txt" ✅
@@ -62,21 +58,20 @@ All of the following ✅ marks must be fulfilled during manual testing:
 * F6 inserts Ctrl+Z ✅
 * F7 without modifiers starts "command list" prompt ✅
   * Escape dismisses prompt ✅
-  * Minimum size of 40x10 characters ✅
-  * Width expands to fit the widest history command ✅
+  * Entries wider than the window width are truncated ✅
   * Height expands up to 20 rows with longer histories ✅
   * F9 starts "command number" prompt ✅
-  * Left/Right paste replace the buffer with the given command ✅
+  * Left/Right replace the buffer with the given command ✅
     * And put cursor at the end of the buffer ✅
   * Up/Down navigate selection through history ✅
     * Stops at start/end with <10 entries ✅
     * Stops at start/end with >20 entries ✅
-    * Wide text rendering during pagination with >20 entries ✅
+    * Scrolls through the entries if there are too many ✅
   * Shift+Up/Down moves history items around ✅
   * Home navigates to first entry ✅
   * End navigates to last entry ✅
-  * PageUp navigates by 20 items at a time or to first ✅
-  * PageDown navigates by 20 items at a time or to last ✅
+  * PageUp navigates by $height items at a time or to first ✅
+  * PageDown navigates by $height items at a time or to last ✅
 * Alt+F7 clears command history ✅
 * F8 cycles through commands that start with the same text as
   the current buffer up until the current cursor position ✅

src/host/VtIo.cpp

@@ -511,7 +511,7 @@ static size_t formatAttributes(char (&buffer)[16], WORD attributes) noexcept
     {
         // The Console API represents colors in BGR order, but VT represents them in RGB order.
         // This LUT transposes them. This is for foreground colors. Add +10 to get the background ones.
-        static const uint8_t lut[] = { 30, 34, 32, 36, 31, 35, 33, 37, 90, 94, 92, 96, 91, 95, 93, 97 };
+        static constexpr uint8_t lut[] = { 30, 34, 32, 36, 31, 35, 33, 37, 90, 94, 92, 96, 91, 95, 93, 97 };
         fg = lut[attributes & 0xf];
         bg = lut[(attributes >> 4) & 0xf] + 10;
     }

src/host/readDataCooked.cpp

@@ -777,7 +777,7 @@ void COOKED_READ_DATA::_redisplay()
         return;
     }
 
-    const auto size = _screenInfo.GetBufferSize().Dimensions();
+    const auto size = _screenInfo.GetVtPageArea().Dimensions();
     auto originInViewportFinal = _originInViewport;
     til::point cursorPositionFinal;
     til::point pagerPromptEnd;
@@ -959,8 +959,9 @@ void COOKED_READ_DATA::_redisplay()
         _popupOpened = popupOpened;
     }
 
-    // Scroll the contents of the pager if needed, so we only need to write what actually changed.
-    if (const auto delta = pagerContentTop - _pagerContentTop; delta != 0)
+    // If we have so much text that it doesn't fit into the viewport (origin == {0,0}),
+    // then we can scroll the existing contents of the pager and only write what got newly uncovered.
+    if (const auto delta = pagerContentTop - _pagerContentTop; delta != 0 && _originInViewport == til::point{})
     {
         const auto deltaAbs = abs(delta);
         til::CoordType beg = 0;

src/host/readDataCooked.hpp

@@ -169,6 +169,5 @@ class COOKED_READ_DATA final : public ReadData
     til::CoordType _pagerContentHeight = 0;
 
     std::vector<Popup> _popups;
-    std::wstring _popupAttr;
     bool _popupOpened = false;
 };