From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 5D49B3858414; Sat, 26 Feb 2022 10:52:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D49B3858414 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_3-branch] Cygwin: pty: Stop to send CTRL_C_EVENT if pcon activated. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/cygwin-3_3-branch X-Git-Oldrev: 3ad4df8570d91dc156f98b5c72b64b796bfcd7af X-Git-Newrev: d5e5babda58c43de89ac06adccdd72cd24485068 Message-Id: <20220226105228.5D49B3858414@sourceware.org> Date: Sat, 26 Feb 2022 10:52:28 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2022 10:52:28 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dd5e5babda58= c43de89ac06adccdd72cd24485068 commit d5e5babda58c43de89ac06adccdd72cd24485068 Author: Takashi Yano Date: Sat Feb 26 04:19:03 2022 +0900 Cygwin: pty: Stop to send CTRL_C_EVENT if pcon activated. =20 - The commit "Cygwin: console: Redesign handling of special keys." removes special treatment for pty in with pseudo console activated, however, it is necessary on second thought. This is because sending CTRL_C_EVENT to non-cygwin apps will be done in pseudo console, therefore, sending it in fhandler_pty_master::write() duplicates that event for non-cygwin apps. Diff: --- winsup/cygwin/fhandler.h | 2 ++ winsup/cygwin/fhandler_termios.cc | 11 ++++------- winsup/cygwin/fhandler_tty.cc | 11 +++++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 3acb5986d..eedf2b7d7 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1957,6 +1957,7 @@ class fhandler_termios: public fhandler_base static bool path_iscygexec_w (LPCWSTR n, LPWSTR c); virtual void cleanup_before_exit () {} virtual bool need_console_handler () { return false; } + virtual bool need_send_ctrl_c_event () { return true; } }; =20 enum ansi_intensity @@ -2491,6 +2492,7 @@ public: void get_master_thread_param (master_thread_param_t *p); void get_master_fwd_thread_param (master_fwd_thread_param_t *p); void set_mask_flusho (bool m) { get_ttyp ()->mask_flusho =3D m; } + bool need_send_ctrl_c_event (); }; =20 class fhandler_dev_null: public fhandler_base diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_ter= mios.cc index b236c1b62..568523390 100644 --- a/winsup/cygwin/fhandler_termios.cc +++ b/winsup/cygwin/fhandler_termios.cc @@ -359,16 +359,12 @@ fhandler_termios::process_sigs (char c, tty* ttyp, fh= andler_termios *fh) instead. */ if ((p->process_state & PID_NEW_PG) && (p->process_state & PID_NOTCYGWIN)) - { - GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT, - p->dwProcessId); - need_discard_input =3D true; - } - else if (!ctrl_c_event_sent) + GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT, p->dwProcessId); + else if ((!fh || fh->need_send_ctrl_c_event () || cyg_leader) + && !ctrl_c_event_sent) { GenerateConsoleCtrlEvent (CTRL_C_EVENT, 0); ctrl_c_event_sent =3D true; - need_discard_input =3D true; } if (resume_pid && fh && !fh->is_console ()) { @@ -377,6 +373,7 @@ fhandler_termios::process_sigs (char c, tty* ttyp, fhan= dler_termios *fh) if (::cygheap->ctty && ::cygheap->ctty->is_console ()) init_console_handler (true); } + need_discard_input =3D true; } if (p && p->ctty =3D=3D ttyp->ntty && p->pgid =3D=3D pgid) { diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 979232d96..f82d1e9fd 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -4054,3 +4054,14 @@ fhandler_pty_slave::cleanup_for_non_cygwin_app (hand= le_set_t *p, tty *ttyp, close_pseudoconsole (ttyp); ReleaseMutex (p->pcon_mutex); } + +bool +fhandler_pty_master::need_send_ctrl_c_event () +{ + /* If pseudo console is activated, sending CTRL_C_EVENT to non-cygwin + apps will be done in pseudo console, therefore, sending it in + fhandler_pty_master::write() duplicates that event for non-cygwin + apps. So return false if pseudo console is activated. */ + return !(to_be_read_from_pcon () && get_ttyp ()->pcon_activated + && get_ttyp ()->pcon_input_state =3D=3D tty::to_nat); +}