LibVT: Rewrap the terminal history along with the normal buffer

2 files changed, 33 insertions, 19 deletions

diff --git a/Userland/Libraries/LibVT/Position.h b/Userland/Libraries/LibVT/Position.h
index 90b6d724aa..886a635b48 100644
--- a/Userland/Libraries/LibVT/Position.h
+++ b/Userland/Libraries/LibVT/Position.h
@@ -52,8 +52,8 @@ private:
 };
 
 struct CursorPosition {
-    u16 row { 0 };
-    u16 column { 0 };
+    size_t row { 0 };
+    size_t column { 0 };
 
     void clamp(u16 max_row, u16 max_column)
     {
diff --git a/Userland/Libraries/LibVT/Terminal.cpp b/Userland/Libraries/LibVT/Terminal.cpp
index c3673666fd..19bd308da9 100644
--- a/Userland/Libraries/LibVT/Terminal.cpp
+++ b/Userland/Libraries/LibVT/Terminal.cpp
@@ -1502,28 +1502,42 @@ void Terminal::set_size(u16 columns, u16 rows)
         return old_cursor;
     };
 
-    CursorPosition cursor_tracker { cursor_row(), cursor_column() };
-    resize_and_rewrap(m_normal_screen_buffer, cursor_tracker);
-    if (m_normal_screen_buffer.size() > rows) {
-        if (auto extra_lines = m_normal_screen_buffer.size() - rows) {
-            while (extra_lines > 0) {
-                if (m_normal_screen_buffer.size() <= cursor_tracker.row)
-                    break;
-                if (m_normal_screen_buffer.last().is_empty()) {
-                    if (m_normal_screen_buffer[m_normal_screen_buffer.size() - 2].termination_column().has_value())
-                        break;
-                    --extra_lines;
-                    m_normal_screen_buffer.take_last();
-                    continue;
-                }
+    auto old_history_size = m_history.size();
+    m_history.extend(move(m_normal_screen_buffer));
+    CursorPosition cursor_tracker { cursor_row() + old_history_size, cursor_column() };
+    resize_and_rewrap(m_history, cursor_tracker);
+    if (auto extra_lines = m_history.size() - rows) {
+        while (extra_lines > 0) {
+            if (m_history.size() <= cursor_tracker.row)
                 break;
+            if (m_history.last().is_empty()) {
+                if (m_history.size() >= 2 && m_history[m_history.size() - 2].termination_column().has_value())
+                    break;
+                --extra_lines;
+                m_history.take_last();
+                continue;
             }
-            for (size_t i = 0; i < extra_lines; ++i)
-                m_history.append(m_normal_screen_buffer.take_first());
-            m_client.terminal_history_changed(extra_lines);
+            break;
         }
     }
 
+    // FIXME: This can use a more performant way to move the last N entries
+    //        from the history into the normal buffer
+    m_normal_screen_buffer.ensure_capacity(rows);
+    while (m_normal_screen_buffer.size() < rows) {
+        if (!m_history.is_empty())
+            m_normal_screen_buffer.prepend(m_history.take_last());
+        else
+            m_normal_screen_buffer.unchecked_append(make<Line>(columns));
+    }
+
+    cursor_tracker.row -= m_history.size();
+
+    if (m_history.size() != old_history_size) {
+        m_client.terminal_history_changed(-old_history_size);
+        m_client.terminal_history_changed(m_history.size());
+    }
+
     CursorPosition dummy_cursor_tracker {};
     resize_and_rewrap(m_alternate_screen_buffer, dummy_cursor_tracker);
     if (m_alternate_screen_buffer.size() > rows)