From 5758fdf31d8cee2c3f75abf08b2f1bd54f2f25c7 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 17 Nov 2000 03:01:14 +0000 Subject: [PATCH] * fhandler_console.cc: New member variable `dwBufferSize' for `info'. (fillin_info): Set `dwBufferSize' to the size of the console buffer. (clear_screen): Use width of console buffer to calculate how many spaces to clear. --- winsup/cygwin/ChangeLog | 7 +++++++ winsup/cygwin/fhandler_console.cc | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 4209488a3..f8e224cbe 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 16 15:59:58 2000 Bradley A. Town + + * fhandler_console.cc: New member variable `dwBufferSize' for `info'. + (fillin_info): Set `dwBufferSize' to the size of the console buffer. + (clear_screen): Use width of console buffer to calculate how many + spaces to clear. + Thu Nov 16 15:24:45 2000 Christopher Faylor * Makefile.in: Make import library creation 'make -j2' friendly. diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index fcb55c2a8..3e49e1480 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -264,6 +264,7 @@ static struct SHORT winTop; SHORT winBottom; COORD dwWinSize; + COORD dwBufferSize; COORD dwCursorPosition; WORD wAttributes; } info; @@ -280,6 +281,7 @@ fhandler_console::fillin_info (void) info.winBottom = linfo.srWindow.Bottom; info.dwWinSize.Y = 1 + linfo.srWindow.Bottom - linfo.srWindow.Top; info.dwWinSize.X = 1 + linfo.srWindow.Right - linfo.srWindow.Left; + info.dwBufferSize = linfo.dwSize; info.dwCursorPosition = linfo.dwCursorPosition; info.wAttributes = linfo.wAttributes; } @@ -648,9 +650,9 @@ fhandler_console::clear_screen (int x1, int y1, int x2, int y2) if (y2 < 0) y2 = info.winBottom; - num = abs (y1 - y2) * info.dwWinSize.X + abs (x1 - x2) + 1; + num = abs (y1 - y2) * info.dwBufferSize.X + abs (x1 - x2) + 1; - if ((y2 * info.dwWinSize.X + x2) > (y1 * info.dwWinSize.X + x1)) + if ((y2 * info.dwBufferSize.X + x2) > (y1 * info.dwBufferSize.X + x1)) { tlc.X = x1; tlc.Y = y1;