Windows: Correct result of Terminal::size

murarth · Apr 19, 2020 · 57c8301 · 57c8301
1 parent 23dbfcf
commit 57c8301
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/windows/terminal.rs b/src/windows/terminal.rs
@@ -1019,7 +1019,13 @@ unsafe fn console_mode(handle: HANDLE) -> io::Result<DWORD> {
 unsafe fn console_size(handle: HANDLE) -> io::Result<Size> {
     let info = console_info(handle)?;
 
-    Ok(coord_to_size(info.dwSize))
+    let lines = (info.srWindow.Right - info.srWindow.Left + 1) as usize;
+    let columns = (info.srWindow.Bottom - info.srWindow.Top + 1) as usize;
+
+    Ok(Size {
+        lines,
+        columns,
+    })
 }
 
 unsafe fn set_console_mode(handle: HANDLE, mode: DWORD) -> io::Result<()> {
@@ -1102,13 +1108,6 @@ fn coord_to_cursor(pos: COORD) -> Cursor {
     }
 }
 
-fn coord_to_size(size: COORD) -> Size {
-    Size{
-        lines: size.Y as usize,
-        columns: size.X as usize,
-    }
-}
-
 fn cursor_to_coord(pos: Cursor) -> COORD {
     COORD{
         Y: to_short(pos.line),