From e8145f87397f263f543b3893e40e43a5a2d8a53a Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Mon, 16 Jan 2017 09:53:34 +0100 Subject: [PATCH] 8171386: jshell tool: paging of javadoc output broken on Windows Fixing detection of console window size. Reviewed-by: rfield --- .../windows/native/lible/WindowsTerminal.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jdk/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp b/jdk/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp index b6c0bc62638..f0299ee8a02 100644 --- a/jdk/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp +++ b/jdk/src/jdk.internal.le/windows/native/lible/WindowsTerminal.cpp @@ -102,26 +102,26 @@ JNIEXPORT jint JNICALL Java_jdk_internal_jline_WindowsTerminal_getConsoleOutputC JNIEXPORT jint JNICALL Java_jdk_internal_jline_WindowsTerminal_getWindowsTerminalWidth (JNIEnv *, jobject) { - HANDLE hStdIn; - if ((hStdIn = GetStdHandle(STD_INPUT_HANDLE)) == INVALID_HANDLE_VALUE) { + HANDLE hStdOut; + if ((hStdOut = GetStdHandle(STD_OUTPUT_HANDLE)) == INVALID_HANDLE_VALUE) { return -1; } CONSOLE_SCREEN_BUFFER_INFO info; - if (! GetConsoleScreenBufferInfo(hStdIn, &info)) { + if (! GetConsoleScreenBufferInfo(hStdOut, &info)) { return -1; } - return info.dwSize.X; + return info.srWindow.Right - info.srWindow.Left; } JNIEXPORT jint JNICALL Java_jdk_internal_jline_WindowsTerminal_getWindowsTerminalHeight (JNIEnv *, jobject) { - HANDLE hStdIn; - if ((hStdIn = GetStdHandle(STD_INPUT_HANDLE)) == INVALID_HANDLE_VALUE) { + HANDLE hStdOut; + if ((hStdOut = GetStdHandle(STD_OUTPUT_HANDLE)) == INVALID_HANDLE_VALUE) { return -1; } CONSOLE_SCREEN_BUFFER_INFO info; - if (! GetConsoleScreenBufferInfo(hStdIn, &info)) { + if (! GetConsoleScreenBufferInfo(hStdOut, &info)) { return -1; } - return info.dwSize.Y; + return info.srWindow.Bottom - info.srWindow.Top + 1; }