From 65438ec635d9cede44bb9e59438f80668422d704 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 19 Dec 2005 04:34:13 +0000 Subject: * fhandler.h (fhandler_pipe::fixup_in_child): Declare new function. (fhandler_console::invisible_console): Declare new variable. (fhandler_console::need_invisible): Ditto. (fhandler_console::has_a): Ditto. * fhandler_console.cc (set_console_state_for_spawn): Eliminate return value. Set up an invisible console if necessary prior to spawning. (fhandler_console::invisible_console): Define. * fhandler_tty.cc (fhandler_tty_slave::open): Use fhandler_console::invisible_console to setup an invisible console. * pipe.cc (fhandler_pipe::fixup_in_child): Define new function from fixup_after_exec. (fhandler_pipe::fixup_after_exec): Use fixup_in_child when appropriate. (fhandler_pipe::fixup_after_fork): Ditto. * spawn.cc (handle): Reorganize and modernize a little. (spawn_guts): Rely on set_console_state_for_spawn to set the console into the right state but don't create the process with "detached" flag if we have no controlling tty since that confuses 'cmd'. * dtable.cc (dtable::stdio_init): Don't set console as controlling terminal if we have an invisible console. * sigproc.cc (child_info::sync): Use correct name in ForceCloseHandle1. --- winsup/cygwin/fhandler_tty.cc | 48 ++----------------------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) (limited to 'winsup/cygwin/fhandler_tty.cc') diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 8b7c2d52c..f7afce061 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -576,52 +576,8 @@ fhandler_tty_slave::open (int flags, mode_t) set_open_status (); if (cygheap->manage_console_count ("fhandler_tty_slave::open", 1) == 1 - && !GetConsoleCP () && !output_done_event - && wincap.pty_needs_alloc_console ()) - { - BOOL b; - HWINSTA h, horig; - /* The intent here is to allocate an "invisible" console if we have no - controlling tty or to reuse the existing console if we already have - a tty. So, first get the old windows station. If there is no controlling - terminal, create a new windows station and then set it as the current - windows station. The subsequent AllocConsole will then be allocated - invisibly. But, after doing that we have to restore any existing windows - station or, strangely, characters will not be displayed in any windows - drawn on the current screen. We only do this if we have changed to - a new windows station and if we had an existing windows station previously. - We also close the previously opened work station even though AllocConsole - is now "using" it. This doesn't seem to cause any problems. - - Things to watch out for if you make changes in this code: - - - Flashing, black consoles showing up when you start, e.g., ssh in - an xterm. - - Non-displaying of characters in rxvt or xemacs if you start a - process using setsid: bash -lc "setsid rxvt". */ - - h = horig = GetProcessWindowStation (); - if (myself->ctty == -1) - { - h = CreateWindowStation (NULL, 0, WINSTA_ALL_ACCESS, &sec_none_nih); - termios_printf ("CreateWindowStation %p, %E", h); - if (h) - { - b = SetProcessWindowStation (h); - termios_printf ("SetProcessWindowStation %d, %E", b); - } - } - b = AllocConsole (); // will cause flashing if workstation - // stuff fails - if (horig && h && h != horig) - { - SetProcessWindowStation (horig); - CloseHandle (h); - } - termios_printf ("%d = AllocConsole (), %E", b); - if (b) - init_console_handler (TRUE); - } + && !output_done_event && fhandler_console::need_invisible ()) + init_console_handler (TRUE); // FIXME: Do this better someday arch = (fhandler_tty_slave *) cmalloc (HEAP_ARCHETYPES, sizeof (*this)); -- cgit v1.2.3