drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fhandler.h (fhandler_tty_master::set_winsize): Declare new function. 

* fhandler_console.cc (fhandler_console::send_winch_maybe): If appropriate,
call tty master function to handle screen size change.
* fhandler_tty.cc (fhandler_tty_master::set_winsize): New function.
(fhandler_tty_master::init): Call set_winsize to set initial screen size.
This commit is contained in:
Christopher Faylor 2002-12-27 05:31:30 +00:00
parent 3bfed277d6
commit 66dcfc4498
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2002-12-27 Christopher Faylor <cgf@redhat.com>
* fhandler.h (fhandler_tty_master::set_winsize): Declare new function.
* fhandler_console.cc (fhandler_console::send_winch_maybe): If
appropriate, call tty master function to handle screen size change.
* fhandler_tty.cc (fhandler_tty_master::set_winsize): New function.
(fhandler_tty_master::init): Call set_winsize to set initial screen
size.
2002-12-26 Christopher Faylor <cgf@redhat.com> 2002-12-26 Christopher Faylor <cgf@redhat.com>
* fhandler_tty.cc (fhandler_tty_master::init): Set initial size of tty * fhandler_tty.cc (fhandler_tty_master::init): Set initial size of tty

1
winsup/cygwin/fhandler.h
View File

@ -948,6 +948,7 @@ class fhandler_tty_master: public fhandler_pty_master
fhandler_tty_master (int unit); fhandler_tty_master (int unit);
int init (int); int init (int);
int init_console (); int init_console ();
void set_winsize (bool);
void fixup_after_fork (HANDLE parent); void fixup_after_fork (HANDLE parent);
void fixup_after_exec (HANDLE); void fixup_after_exec (HANDLE);
}; };

8
winsup/cygwin/fhandler_console.cc
View File

@ -213,7 +213,13 @@ fhandler_console::send_winch_maybe ()
fillin_info (); fillin_info ();
if (y != dev_state->info.dwWinSize.Y || x != dev_state->info.dwWinSize.X) if (y != dev_state->info.dwWinSize.Y || x != dev_state->info.dwWinSize.X)
tc->kill_pgrp (SIGWINCH); {
extern fhandler_tty_master *tty_master;
if (tty_master)
tty_master->set_winsize (true);
else
tc->kill_pgrp (SIGWINCH);
}
} }
void __stdcall void __stdcall

17
winsup/cygwin/fhandler_tty.cc
View File

@ -40,6 +40,16 @@ fhandler_tty_master::fhandler_tty_master (int unit)
{ {
} }
void
fhandler_tty_master::set_winsize (bool sendSIGWINCH)
{
winsize w;
console->ioctl (TIOCGWINSZ, &w);
get_ttyp ()->winsize = w;
if (sendSIGWINCH)
tc->kill_pgrp (SIGWINCH);
}
int int
fhandler_tty_master::init (int ntty) fhandler_tty_master::init (int ntty)
{ {
@ -54,14 +64,13 @@ fhandler_tty_master::init (int ntty)
termios ti; termios ti;
memset (&ti, 0, sizeof (ti)); memset (&ti, 0, sizeof (ti));
console->tcsetattr (0, &ti); console->tcsetattr (0, &ti);
winsize w;
console->ioctl (TIOCGWINSZ, &w);
this->ioctl (TIOCSWINSZ, &w);
ttynum = ntty; ttynum = ntty;
cygwin_shared->tty[ttynum]->common_init (this); cygwin_shared->tty[ttynum]->common_init (this);
set_winsize (false);
inuse = get_ttyp ()->create_inuse (TTY_MASTER_ALIVE); inuse = get_ttyp ()->create_inuse (TTY_MASTER_ALIVE);
cygthread *h; cygthread *h;
@ -1134,7 +1143,7 @@ fhandler_pty_master::ioctl (unsigned int cmd, void *arg)
pktmode = * (int *) arg; pktmode = * (int *) arg;
break; break;
case TIOCGWINSZ: case TIOCGWINSZ:
* (struct winsize *) arg = get_ttyp ()->winsize; *(struct winsize *) arg = get_ttyp ()->winsize;
break; break;
case TIOCSWINSZ: case TIOCSWINSZ:
if (get_ttyp ()->winsize.ws_row != ((struct winsize *) arg)->ws_row if (get_ttyp ()->winsize.ws_row != ((struct winsize *) arg)->ws_row