* cygheap.h (init_cygheap::ctty_on_hold): Remove conditionalized variable.
* dcrt0.cc (do_exit): Remove code which handled CYGWIN=tty style ttys. * devices.in: Remove "/dev/ttym". * dtable.cc: Rename tty to pty where appropriate throughout. (dtable::stdio_init): Use new t->is_console rather than using now-deleted hwnd element in tty structure. (dtable::init_std_file_from_handle): Remove code which handled CYGWIN=tty style ttys. (fh_alloc): Ditto. * fhandler.h: Rename tty to pty where appropriate. (fhandler_pty_common): Delete output_done_event, ioctl_request_event, ioctl_done_event. (fhandler_pty_master::setup): Delete argument. (fhandler_tty_master): Delete. (fhandler_union): Delete __tty_master. * fhandler_console.cc (use_tty): Delete. (fhandler_console::get_tty_stuff): Set is_console to true rather than calling sethwnd. (fhandler_console::send_winch_maybe): Remove CYGWIN=tty considerations. (fhandler_console::input_tcsetattr): Ditto. * fhandler_termios.cc (fhandler_termios::tcsetpgrp): Use new t->is_console rather than using now-deleted hwnd element in tty structure. * fhandler_tty.cc: Rename tty to pty where appropriate throughout. (tty_master): Delete. (process_input): Ditto. (process_output): Ditto. (process_ioctl): Ditto. (fhandler_tty_master::*): Ditto. (fhandler_pty_master::process_slave_output): Remove CYGWIN=tty considerations. (fhandler_pty_slave::open): Ditto for *_done_event. (fhandler_pty_slave::write): Ditto. (fhandler_pty_slave::ioctl): Ditto. (fhandler_pty_slave::fch_open_handles): Ditto. (fhandler_pty_slave::fch_set_sd): Ditto. (fhandler_pty_slave::fch_close_handles): Ditto. (fhandler_pty_common::close): Ditto. (fhandler_pty_master::setup): Ditto. Remove now-unneeded ispty parameter. (fhandler_pty_master::open): Reflect argument removal for tty::allocate. * select.cc: Rename tty to pty where appropriate throughout. * sigproc.cc (proc_subproc): Remove CYGWIN=tty considerations. * tty.cc (ttyslot): Accommodate CYGWIN=tty removal. (tty_list::init_session): Ditto. (tty_list::attach): Ditto. (tty::create_master): Delete. (tty_list::terminate): Ditto. (tty_list::allocate): Delete "with_console" parameter. Remove CYGWIN=tty considerations. (tty::init): Set is_console = false. Use 'false' for was_opened since it is a boolean. * tty.h (*_{DONE,REQUEST}_EVENT): Delete. (tty_min::is_console): Declare new field which replaces hwnd. (tty_min::gethwnd): Delete. (tty_min::sethwnd): Ditto. (tty_list::allocate): Delete parameter. (tty_list::terminate): Delete declaration. * include/sys/cygwin.h (PID_USETTY): Redefine to PID_UNUSED1 and change comment to reflect its availability.
This commit is contained in:
@@ -19,9 +19,6 @@ details. */
|
||||
|
||||
/* Input/Output/ioctl events */
|
||||
|
||||
#define OUTPUT_DONE_EVENT "cygtty.output.done"
|
||||
#define IOCTL_REQUEST_EVENT "cygtty.ioctl.request"
|
||||
#define IOCTL_DONE_EVENT "cygtty.ioctl.done"
|
||||
#define RESTART_OUTPUT_EVENT "cygtty.output.restart"
|
||||
#define INPUT_AVAILABLE_EVENT "cygtty.input.avail"
|
||||
#define OUTPUT_MUTEX "cygtty.output.mutex"
|
||||
@@ -50,7 +47,7 @@ public:
|
||||
int output_stopped;
|
||||
fh_devices ntty;
|
||||
DWORD last_ctrl_c; /* tick count of last ctrl-c */
|
||||
HWND hwnd; /* Console window handle tty belongs to */
|
||||
bool is_console;
|
||||
|
||||
IMPLEMENT_STATUS_FLAG (bool, initialized)
|
||||
IMPLEMENT_STATUS_FLAG (bool, rstcons)
|
||||
@@ -82,8 +79,6 @@ public:
|
||||
void setsid (pid_t tsid) {sid = tsid;}
|
||||
void kill_pgrp (int);
|
||||
int is_orphaned_process_group (int);
|
||||
HWND gethwnd () const {return hwnd;}
|
||||
void sethwnd (HWND wnd) {hwnd = wnd;}
|
||||
const char *ttyname () __attribute ((regparm (1)));
|
||||
};
|
||||
|
||||
@@ -125,9 +120,8 @@ class tty_list
|
||||
|
||||
public:
|
||||
tty * operator [](int n) {return ttys + device::minor (n);}
|
||||
int allocate (bool); /* true if allocate a tty, pty otherwise */
|
||||
int allocate (); /* allocate a pty */
|
||||
int connect (int);
|
||||
void terminate ();
|
||||
void init ();
|
||||
tty_min *get_cttyp ();
|
||||
int __stdcall attach (int n) __attribute__ ((regparm (2)));
|
||||
|
Reference in New Issue
Block a user