From: Gisle Vanem <gisle.vanem@gmail.com>
Date: Tue, 23 Jan 2018 21:41:50 +0000 (+0100)
Subject: progress-bar: get screen width on windows
X-Git-Tag: curl-7_58_0~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0b5e894455aed4624682064b511d6522af7e6b2;p=curl

progress-bar: get screen width on windows
---

diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c
index dd8941631..cf3251b29 100644
--- a/src/tool_cb_prg.c
+++ b/src/tool_cb_prg.c
@@ -202,6 +202,21 @@ void progressbarinit(struct ProgressData *bar,
     struct winsize ts;
     if(!ioctl(STDIN_FILENO, TIOCGWINSZ, &ts))
       cols = ts.ws_col;
+#elif defined(_WIN32)
+    {
+      HANDLE  stderr_hnd = GetStdHandle(STD_ERROR_HANDLE);
+      CONSOLE_SCREEN_BUFFER_INFO console_info;
+
+      if((stderr_hnd != INVALID_HANDLE_VALUE) &&
+         GetConsoleScreenBufferInfo(stderr_hnd, &console_info)) {
+        /*
+         * Do not use +1 to get the true screen-width since writing a
+         * character at the right edge will cause a line wrap.
+         */
+        cols = (int)
+          (console_info.srWindow.Right - console_info.srWindow.Left);
+      }
+    }
 #endif /* TIOCGSIZE */
     bar->width = cols;
   }