screen_buffer::set_cursor() should be relative to the visible area.

singlemindedt · Jun 28, 2018 · 8fb24ea · 8fb24ea
1 parent 5c624ed
commit 8fb24ea
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/clink/terminal/src/win_screen_buffer.cpp b/clink/terminal/src/win_screen_buffer.cpp
@@ -155,10 +155,14 @@ void win_screen_buffer::set_cursor(int column, int row)
     CONSOLE_SCREEN_BUFFER_INFO csbi;
     GetConsoleScreenBufferInfo(m_handle, &csbi);
 
-    COORD xy = {
-        clamp(column, 0, csbi.dwSize.X - 1),
-        clamp(row, 0, csbi.dwSize.Y - 1),
-    };
+    const SMALL_RECT& window = csbi.srWindow;
+    int width = (window.Right - window.Left) + 1;
+    int height = (window.Bottom - window.Top) + 1;
+
+    column = clamp(column, 0, width);
+    row = clamp(row, 0, height);
+
+    COORD xy = { window.Left + column, window.Top + row };
     SetConsoleCursorPosition(m_handle, xy);
 }