[PATCH 2/2] Cygwin: pty: Discard "OSC Ps; ? BEL/ST" in pseudo console output.
Takashi Yano
takashi.yano@nifty.ne.jp
Mon Nov 23 05:28:15 GMT 2020
- 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.
---
winsup/cygwin/fhandler_tty.cc | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 911945675..38285c7f4 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2069,6 +2069,36 @@ fhandler_pty_master::pty_master_fwd_thread ()
else
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)
{
size_t nlen = NT_MAX_PATH;
--
2.29.2
More information about the Cygwin-patches
mailing list