win32: improvements to get_terminal_width_height

- move winansi_get_terminal_width_height from winansi.c to ioctl.c,
  the only caller;
- check both stdout and stderr for a connection to a console;
- omit unnecessary code in get_terminal_width_height (because the
  WIN32 implementation ignores the file descriptor).

1 files changed, 0 insertions, 17 deletions

diff --git a/win32/winansi.c b/win32/winansi.c
index ad6016ddc..a8f5dba79 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -596,23 +596,6 @@ int winansi_printf(const char *format, ...)
         return rv;
 }
 
-int winansi_get_terminal_width_height(struct winsize *win)
-{
-        BOOL ret;
-        CONSOLE_SCREEN_BUFFER_INFO sbi;
-
-        init();
-
-        win->ws_row = 0;
-        win->ws_col = 0;
-        if ((ret=GetConsoleScreenBufferInfo(console, &sbi)) != 0) {
-                win->ws_row = sbi.srWindow.Bottom - sbi.srWindow.Top + 1;
-                win->ws_col = sbi.srWindow.Right - sbi.srWindow.Left + 1;
-        }
-
-        return ret ? 0 : -1;
-}
-
 static int ansi_emulate_write(int fd, const void *buf, size_t count)
 {
         int rv = 0, i;