diff options
author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2021-12-02 06:35:47 +0300 |
---|---|---|
committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2021-12-02 05:27:28 +0300 |
commit | 5cc4b92c25af1af9250e4498e60943fcc82b7487 (patch) | |
tree | a3615e36beadeb063d5d0802aa4e24657d402678 | |
parent | 362598b118e93b8f1e14df2789a063d3371c55dc (diff) |
Cygwin: console: Fix OSC sequence handling.cygwin-3_3_3-release
- Currently, some OSC escape sequences, such as 'OSC 110 BEL', are
not handled correctly. This patch fixes the issue.
-rw-r--r-- | winsup/cygwin/fhandler_console.cc | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 4b7922dea..68567f9a8 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -3308,13 +3308,30 @@ fhandler_console::write (const void *vsrc, size_t len) case gotrsquare: if (isdigit (*src)) con.rarg = con.rarg * 10 + (*src - '0'); - else if (*src == ';' && (con.rarg == 2 || con.rarg == 0)) - con.state = gettitle; - else if (*src == ';' && (con.rarg == 4 || con.rarg == 104 - || (con.rarg >= 10 && con.rarg <= 19))) - con.state = eatpalette; - else - con.state = eattitle; + else if (*src == ';') + { + if (con.rarg == 0 || con.rarg == 2) + con.state = gettitle; + else if ((con.rarg >= 4 && con.rarg <= 6) + || (con.rarg >=10 && con.rarg <= 19) + || (con.rarg >=104 && con.rarg <= 106) + || (con.rarg >=110 && con.rarg <= 119)) + con.state = eatpalette; + else + con.state = eattitle; + } + else if (*src == '\033') + con.state = endpalette; + else if (*src == '\007') + { + wpbuf.put (*src); + if (wincap.has_con_24bit_colors () && !con_is_legacy) + wpbuf.send (get_output_handle ()); + wpbuf.empty (); + con.state = normal; + src++; + break; + } wpbuf.put (*src); src++; break; |