Use an enum for Agent::resetConsoleTracking and reuse the window rect

agent/Agent.cc

@@ -103,7 +103,7 @@ Agent::Agent(LPCWSTR controlPipeName,
     m_terminal = new Terminal(m_dataSocket);
     m_consoleInput = new ConsoleInput(this);
 
-    resetConsoleTracking(false);
+    resetConsoleTracking(Terminal::OmitClear, m_console->windowRect());
 
     // Setup Ctrl-C handling.  First restore default handling of Ctrl-C.  This
     // attribute is inherited by child processes.  Then register a custom
@@ -146,7 +146,8 @@ NamedPipe *Agent::makeSocket(LPCWSTR pipeName)
     return pipe;
 }
 
-void Agent::resetConsoleTracking(bool sendClear)
+void Agent::resetConsoleTracking(
+    Terminal::SendClearFlag sendClear, const SmallRect &windowRect)
 {
     for (std::vector<ConsoleLine>::iterator
             it = m_bufferData.begin(), itEnd = m_bufferData.end();
@@ -155,7 +156,7 @@ void Agent::resetConsoleTracking(bool sendClear)
         it->reset();
     }
     m_syncRow = -1;
-    m_scrapedLineCount = m_console->windowRect().top();
+    m_scrapedLineCount = windowRect.top();
     m_scrolledCount = 0;
     m_maxBufferedLine = -1;
     m_dirtyWindowTop = -1;
@@ -531,7 +532,7 @@ void Agent::syncConsoleContentAndSize(bool forceResize)
     const bool newDirectMode = (info.bufferSize().Y != BUFFER_LINE_COUNT);
     if (newDirectMode != m_directMode) {
         trace("Entering %s mode", newDirectMode ? "direct" : "scrolling");
-        resetConsoleTracking();
+        resetConsoleTracking(Terminal::SendClear, info.windowRect());
         m_directMode = newDirectMode;
 
         // When we switch from direct->scrolling mode, make sure the console is
@@ -608,7 +609,7 @@ void Agent::scrollingScrapeOutput(const ConsoleScreenBufferInfo &info)
             trace("Sync marker has disappeared -- resetting the terminal"
                   " (m_syncCounter=%d)",
                   m_syncCounter);
-            resetConsoleTracking();
+            resetConsoleTracking(Terminal::SendClear, windowRect);
         } else if (markerRow != m_syncRow) {
             ASSERT(markerRow < m_syncRow);
             m_scrolledCount += (m_syncRow - markerRow);
@@ -634,7 +635,7 @@ void Agent::scrollingScrapeOutput(const ConsoleScreenBufferInfo &info)
             trace("Window moved upward -- resetting the terminal"
                   " (m_syncCounter=%d)",
                   m_syncCounter);
-            resetConsoleTracking();
+            resetConsoleTracking(Terminal::SendClear, windowRect);
         }
     }
     m_dirtyWindowTop = windowRect.top();

agent/Agent.h

@@ -31,10 +31,10 @@
 #include "Coord.h"
 #include "SmallRect.h"
 #include "ConsoleLine.h"
+#include "Terminal.h"
 
 class Win32Console;
 class ConsoleInput;
-class Terminal;
 class ReadBuffer;
 class NamedPipe;
 struct ConsoleScreenBufferInfo;
@@ -55,7 +55,8 @@ public:
 
 private:
     NamedPipe *makeSocket(LPCWSTR pipeName);
-    void resetConsoleTracking(bool sendClear = true);
+    void resetConsoleTracking(
+        Terminal::SendClearFlag sendClear, const SmallRect &windowRect);
 
 private:
     void pollControlSocket();

agent/Terminal.cc

@@ -290,9 +290,9 @@ void Terminal::setConsoleMode(int mode)
         m_consoleMode = false;
 }
 
-void Terminal::reset(bool sendClearFirst, int newLine)
+void Terminal::reset(SendClearFlag sendClearFirst, int newLine)
 {
-    if (sendClearFirst && !m_consoleMode) {
+    if (sendClearFirst == SendClear && !m_consoleMode) {
         // 0m   ==> reset SGR parameters
         // 1;1H ==> move cursor to top-left position
         // 2J   ==> clear the entire screen

agent/Terminal.h

@@ -32,7 +32,8 @@ class Terminal
 {
 public:
     explicit Terminal(NamedPipe *output);
-    void reset(bool sendClearFirst, int newLine);
+    enum SendClearFlag { OmitClear, SendClear };
+    void reset(SendClearFlag sendClearFirst, int newLine);
     void sendLine(int line, CHAR_INFO *lineData, int width);
     void finishOutput(const std::pair<int, int> &newCursorPos);
     void setConsoleMode(int mode);