From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26003 invoked by alias); 26 Feb 2020 20:22:37 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 25988 invoked by uid 9078); 26 Feb 2020 20:22:37 -0000 Date: Wed, 26 Feb 2020 20:22:00 -0000 Message-ID: <20200226202237.25987.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: console: Add emulation of CSI3J on Win10 1809. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: 0d7bbc0bc3da7d7c9e0a76243cbeaf458724d32d X-Git-Newrev: c13cdfd00ed09d23e5cf1864033a1bfd54bc3aab X-SW-Source: 2020-q1/txt/msg00089.txt https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=c13cdfd00ed09d23e5cf1864033a1bfd54bc3aab commit c13cdfd00ed09d23e5cf1864033a1bfd54bc3aab Author: Takashi Yano Date: Thu Feb 27 00:33:02 2020 +0900 Cygwin: console: Add emulation of CSI3J on Win10 1809. - This patch add emulation of CSI3J, which is broken in Win10 1809, rather than ignoring it as before. Diff: --- winsup/cygwin/fhandler_console.cc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index f87d932..4ab9bca 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -2102,8 +2102,23 @@ fhandler_console::char_command (char c) break; case 'J': /* ED */ wpbuf_put (c); - /* Ignore CSI3J in Win10 1809 because it is broken. */ - if (con.args[0] != 3 || !wincap.has_con_broken_csi3j ()) + if (con.args[0] == 3 && wincap.has_con_broken_csi3j ()) + { /* Workaround for broken CSI3J in Win10 1809 */ + CONSOLE_SCREEN_BUFFER_INFO sbi; + GetConsoleScreenBufferInfo (get_output_handle (), &sbi); + SMALL_RECT r = {0, sbi.srWindow.Top, + (SHORT) (sbi.dwSize.X - 1), (SHORT) (sbi.dwSize.Y - 1)}; + CHAR_INFO f = {' ', sbi.wAttributes}; + COORD d = {0, 0}; + ScrollConsoleScreenBufferA (get_output_handle (), + &r, NULL, d, &f); + SetConsoleCursorPosition (get_output_handle (), d); + d = sbi.dwCursorPosition; + d.Y -= sbi.srWindow.Top; + SetConsoleCursorPosition (get_output_handle (), d); + } + else + /* Just send the sequence */ WriteConsoleA (get_output_handle (), wpbuf, wpixput, &wn, 0); break; case 'h': /* DECSET */