JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: console: Unify workaround code for CSI3J and CSI?1049h/l.

Browse Source 
- This patch unifies workaround code for CSI3J and CSI?1049h/l into
  the code handling other escape sequences in xterm mode.
This commit is contained in:
Takashi Yano 2020-02-27 00:33:00 +09:00 committed by Corinna Vinschen
parent 7dfe04e933
commit 3b42762e0b
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
winsup/cygwin/fhandler_console.cc
View File

@ -1786,24 +1786,6 @@ static const wchar_t __vt100_conv[31] = {
inline bool inline bool
fhandler_console::write_console (PWCHAR buf, DWORD len, DWORD& done) fhandler_console::write_console (PWCHAR buf, DWORD len, DWORD& done)
{ {
bool need_fix_tab_position = false;
/* Check if screen will be alternated. */
if (wincap.has_con_24bit_colors () && !con_is_legacy
&& memmem (buf, len*sizeof (WCHAR), L"\033[?1049", 7*sizeof (WCHAR)))
need_fix_tab_position = true;
/* Workaround for broken CSI3J (ESC[3J) support in xterm compatible mode. */
if (wincap.has_con_24bit_colors () && !con_is_legacy &&
wincap.has_con_broken_csi3j ())
{
WCHAR *p = buf;
while ((p = (WCHAR *) memmem (p, (len - (p - buf))*sizeof (WCHAR),
L"\033[3J", 4*sizeof (WCHAR))))
{
memmove (p, p+4, (len - (p+4 - buf))*sizeof (WCHAR));
len -= 4;
}
}
if (con.iso_2022_G1 if (con.iso_2022_G1
? con.vt100_graphics_mode_G1 ? con.vt100_graphics_mode_G1
: con.vt100_graphics_mode_G0) : con.vt100_graphics_mode_G0)
@ -1822,9 +1804,6 @@ fhandler_console::write_console (PWCHAR buf, DWORD len, DWORD& done)
len -= done; len -= done;
buf += done; buf += done;
} }
/* Call fix_tab_position() if screen has been alternated. */
if (need_fix_tab_position)
fix_tab_position ();
return true; return true;
} }
@ -2089,6 +2068,28 @@ fhandler_console::char_command (char c)
WriteConsoleA (get_output_handle (), wpbuf, wpixput, &wn, 0); WriteConsoleA (get_output_handle (), wpbuf, wpixput, &wn, 0);
} }
break; 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 ())
WriteConsoleA (get_output_handle (), wpbuf, wpixput, &wn, 0);
break;
case 'h': /* DECSET */
case 'l': /* DECRST */
wpbuf_put (c);
/* Just send the sequence */
WriteConsoleA (get_output_handle (), wpbuf, wpixput, &wn, 0);
if (con.saw_question_mark)
{
bool need_fix_tab_position = false;
for (int i = 0; i < con.nargs; i++)
if (con.args[i] == 1049)
need_fix_tab_position = true;
/* Call fix_tab_position() if screen has been alternated. */
if (need_fix_tab_position)
fix_tab_position ();
}
break;
default: default:
/* Other escape sequences */ /* Other escape sequences */
wpbuf_put (c); wpbuf_put (c);