From c8b779aff447966ec467c3a52edab34a6ab76277 Mon Sep 17 00:00:00 2001 From: Takashi Yano Date: Thu, 18 Nov 2021 12:28:53 +0900 Subject: Cygwin: console: Fix interference issue regarding master thread. - This patch fixes the issue that ReadConsoleInputW() call in the master thread interferes with the input process of non-cygwin apps. --- winsup/cygwin/fhandler.h | 1 + winsup/cygwin/fhandler_console.cc | 11 +++++++++++ 2 files changed, 12 insertions(+) (limited to 'winsup') diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index ea8d6e9..c838d15 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -2042,6 +2042,7 @@ class dev_console char cons_rabuf[40]; // cannot get longer than char buf[40] in char_command char *cons_rapoi; bool cursor_key_app_mode; + bool disable_master_thread; inline UINT get_console_cp (); DWORD con_to_str (char *d, int dlen, WCHAR w); diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index f4241ee..d9ed71a 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -208,6 +208,12 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp) DWORD total_read, n, i; INPUT_RECORD input_rec[INREC_SIZE]; + if (con.disable_master_thread) + { + cygwait (40); + continue; + } + WaitForSingleObject (p->input_mutex, INFINITE); total_read = 0; switch (cygwait (p->input_handle, (DWORD) 0)) @@ -427,6 +433,7 @@ fhandler_console::setup () con.cons_rapoi = NULL; shared_console_info->tty_min_state.is_console = true; con.cursor_key_app_mode = false; + con.disable_master_thread = false; } } @@ -480,6 +487,8 @@ fhandler_console::set_input_mode (tty::cons_mode m, const termios *t, flags |= ENABLE_VIRTUAL_TERMINAL_INPUT; else flags |= ENABLE_MOUSE_INPUT; + if (shared_console_info) + con.disable_master_thread = false; break; case tty::native: if (t->c_lflag & ECHO) @@ -492,6 +501,8 @@ fhandler_console::set_input_mode (tty::cons_mode m, const termios *t, flags &= ~ENABLE_ECHO_INPUT; if (t->c_lflag & ISIG) flags |= ENABLE_PROCESSED_INPUT; + if (shared_console_info) + con.disable_master_thread = true; break; } SetConsoleMode (p->input_handle, flags); -- cgit v1.1