Use buffer width and window height for screen size

Author: mridgers

clink/dll/getc.c

@@ -146,7 +146,8 @@ static int getc_internal(int* alt)
         GetConsoleScreenBufferInfo(handle_stdout, &csbi);
 
         // Check for a new buffer size for simulated SIGWINCH signals.
-        i = (csbi.dwSize.X << 16) | csbi.dwSize.Y;
+        i = (csbi.dwSize.X << 16);
+        i |= (csbi.srWindow.Bottom - csbi.srWindow.Top) + 1;
         if (!g_knownBufferSize || g_knownBufferSize != i)
         {
             if (g_knownBufferSize)

readline/compat/termcap.c

@@ -19,7 +19,7 @@
  * SOFTWARE.
  */
 
-#define TERMCAP_DEBUG               0
+#define TERMCAP_DEBUG   0
 
 #include <Windows.h>
 
@@ -275,7 +275,7 @@ static void get_screen_size(int* width, int* height)
         if (GetConsoleScreenBufferInfo(handle, &csbi))
         {
             *width = csbi.dwSize.X;
-            *height = csbi.dwSize.Y;
+            *height = (csbi.srWindow.Bottom - csbi.srWindow.Top) + 1;
             return;
         }
     }