Correctly report the terminal size on windows, fixes #136

jline · Jun 11, 2018 · 9999987 · 9999987
1 parent 65c3450
commit 9999987
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java
@@ -84,9 +84,12 @@ protected void setConsoleMode(int mode) {
     }
 
     public Size getSize() {
+        long outputHandle = Kernel32.GetStdHandle(Kernel32.STD_OUTPUT_HANDLE);
+        CONSOLE_SCREEN_BUFFER_INFO info = new CONSOLE_SCREEN_BUFFER_INFO();
+        Kernel32.GetConsoleScreenBufferInfo(outputHandle, info);
         Size size = new Size();
-        size.setColumns(WindowsSupport.getWindowsTerminalWidth());
-        size.setRows(WindowsSupport.getWindowsTerminalHeight());
+        size.setColumns(info.size.x);
+        size.setRows(info.size.y);
         return size;
     }
 

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java
@@ -85,7 +85,7 @@ protected void setConsoleMode(int mode) {
     public Size getSize() {
         Kernel32.CONSOLE_SCREEN_BUFFER_INFO info = new Kernel32.CONSOLE_SCREEN_BUFFER_INFO();
         Kernel32.INSTANCE.GetConsoleScreenBufferInfo(consoleOut, info);
-        return new Size(info.windowWidth(), info.windowHeight());
+        return new Size(info.dwSize.X, info.dwSize.Y);
     }
 
     protected boolean processConsoleInput() throws IOException {