Add 1 to console lines and columns setting

murarth · Apr 19, 2020 · 68456c5 · 68456c5
1 parent 57c8301
commit 68456c5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/windows/terminal.rs b/src/windows/terminal.rs
@@ -28,7 +28,7 @@ use winapi::um::consoleapi::{
     SetConsoleMode,
 };
 use winapi::um::handleapi::{
-    CloseHandle,
+    CloseHandle, INVALID_HANDLE_VALUE,
 };
 use winapi::um::processenv::{
     GetStdHandle,
@@ -1117,8 +1117,8 @@ fn cursor_to_coord(pos: Cursor) -> COORD {
 
 fn size_to_coord(size: Size) -> COORD {
     COORD{
-        Y: to_short(size.lines),
-        X: to_short(size.columns),
+        Y: to_short(size.lines + 1),
+        X: to_short(size.columns + 1),
     }
 }
 
@@ -1256,7 +1256,7 @@ fn result_bool(b: BOOL) -> io::Result<()> {
 }
 
 fn result_handle(ptr: HANDLE) -> io::Result<HANDLE> {
-    if ptr.is_null() {
+    if ptr == INVALID_HANDLE_VALUE {
         Err(io::Error::last_os_error())
     } else {
         Ok(ptr)