libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-22 00:38:06 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: console: Add code to restore console mode on close.

Browse Source 
- The console with 24bit color support has a problem that console
  mode is changed if cygwin process is executed in cmd.exe which
  started in cygwin shell. For example, cursor keys become not
  working if bash -> cmd -> true are executed in this order.
  This patch fixes the issue.
This commit is contained in:
Takashi Yano 2020-01-02 22:17:16 +09:00 committed by Corinna Vinschen
parent f03806b68a
commit 783eaa888f
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
winsup/cygwin/fhandler_console.cc
View File

@ -53,6 +53,9 @@ fhandler_console::console_state NO_COPY *fhandler_console::shared_console_info;
bool NO_COPY fhandler_console::invisible_console; bool NO_COPY fhandler_console::invisible_console;
static DWORD orig_conin_mode = (DWORD) -1;
static DWORD orig_conout_mode = (DWORD) -1;
static void static void
beep () beep ()
{ {
@ -1010,6 +1013,11 @@ fhandler_console::open (int flags, mode_t)
get_ttyp ()->rstcons (false); get_ttyp ()->rstcons (false);
set_open_status (); set_open_status ();
if (orig_conin_mode == (DWORD) -1)
GetConsoleMode (get_handle (), &orig_conin_mode);
if (orig_conout_mode == (DWORD) -1)
GetConsoleMode (get_output_handle (), &orig_conout_mode);
if (getpid () == con.owner && wincap.has_con_24bit_colors ()) if (getpid () == con.owner && wincap.has_con_24bit_colors ())
{ {
DWORD dwMode; DWORD dwMode;
@ -1079,6 +1087,19 @@ fhandler_console::close ()
SetConsoleMode (get_output_handle (), dwMode); SetConsoleMode (get_output_handle (), dwMode);
} }
/* Restore console mode if this is the last closure. */
OBJECT_BASIC_INFORMATION obi;
NTSTATUS status;
status = NtQueryObject (get_handle (), ObjectBasicInformation,
&obi, sizeof obi, NULL);
if (NT_SUCCESS (status) && obi.HandleCount == 1)
{
if (orig_conin_mode != (DWORD) -1)
SetConsoleMode (get_handle (), orig_conin_mode);
if (orig_conout_mode != (DWORD) -1)
SetConsoleMode (get_handle (), orig_conout_mode);
}
CloseHandle (get_handle ()); CloseHandle (get_handle ());
CloseHandle (get_output_handle ()); CloseHandle (get_output_handle ());