drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: pty: Discard "OSC Ps; ? BEL/ST" in pseudo console output. 

- If vim is executed in WSL in mintty, some garbage string caused
  by "OSC Ps;? BEL/ST" will be shown in some situations. This patch
  fixes the issue by removing "OSC Ps;? BEL/ST" from pseudo console
  output.
This commit is contained in:
Takashi Yano via Cygwin-patches 2020-11-23 20:03:03 +09:00 committed by Corinna Vinschen
parent 65ee05d326
commit 2eee095928
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
winsup/cygwin/fhandler_tty.cc
View File

@ -2069,6 +2069,36 @@ fhandler_pty_master::pty_master_fwd_thread ()
else else
state = 0; state = 0;
/* Remove OSC Ps ; ? BEL/ST */
for (DWORD i = 0; i < rlen; i++)
if (state == 0 && outbuf[i] == '\033')
{
start_at = i;
state = 1;
continue;
}
else if ((state == 1 && outbuf[i] == ']')
|| (state == 2 && outbuf[i] == ';')
|| (state == 3 && outbuf[i] == '?')
|| (state == 4 && outbuf[i] == '\033'))
{
state ++;
continue;
}
else if (state == 2 && isdigit (outbuf[i]))
continue;
else if ((state == 4 && outbuf[i] == '\a')
|| (state == 5 && outbuf[i] == '\\'))
{
memmove (&outbuf[start_at], &outbuf[i+1], rlen-i-1);
rlen = wlen = start_at + rlen - i - 1;
state = 0;
i = start_at - 1;
continue;
}
else
state = 0;
if (get_ttyp ()->term_code_page != CP_UTF8) if (get_ttyp ()->term_code_page != CP_UTF8)
{ {
size_t nlen = NT_MAX_PATH; size_t nlen = NT_MAX_PATH;