Use termios instead of sgtty.
PR: 119107 Submitted by: Ed Schouten <ed@fxq.nl>
This commit is contained in:
@@ -1,6 +1,14 @@
|
||||
--- defines.h.orig Mon Feb 24 12:45:37 1992
|
||||
+++ defines.h Wed Dec 4 02:33:51 1996
|
||||
@@ -47,7 +47,7 @@
|
||||
@@ -40,14 +40,14 @@
|
||||
* If TERMIO is 0 your system must have /usr/include/sgtty.h.
|
||||
* This is normally the case for BSD.
|
||||
*/
|
||||
-/*#define TERMIO 1*/
|
||||
+#define TERMIO 1
|
||||
|
||||
/*
|
||||
* SIGSETMASK is 1 if your system has the sigsetmask() call.
|
||||
* This is normally the case only for BSD 4.2,
|
||||
* not for BSD 4.1 or System 5.
|
||||
*/
|
||||
|
||||
@@ -1,9 +1,64 @@
|
||||
--- screen.c.orig Mon Feb 24 12:45:41 1992
|
||||
+++ screen.c Sat May 20 01:40:56 2000
|
||||
@@ -481,5 +481,5 @@
|
||||
@@ -12,7 +12,7 @@
|
||||
#endif
|
||||
|
||||
#if TERMIO
|
||||
-#include <termio.h>
|
||||
+#include <termios.h>
|
||||
#else
|
||||
#include <sgtty.h>
|
||||
#endif
|
||||
@@ -92,21 +92,21 @@
|
||||
int on;
|
||||
{
|
||||
#if TERMIO
|
||||
- struct termio s;
|
||||
- static struct termio save_term;
|
||||
+ struct termios s;
|
||||
+ static struct termios save_term;
|
||||
|
||||
if (on)
|
||||
{
|
||||
/*
|
||||
* Get terminal modes.
|
||||
*/
|
||||
- ioctl(2, TCGETA, &s);
|
||||
+ tcgetattr(2, &s);
|
||||
|
||||
/*
|
||||
* Save modes and set certain variables dependent on modes.
|
||||
*/
|
||||
save_term = s;
|
||||
- ospeed = s.c_cflag & CBAUD;
|
||||
+ ospeed = cfgetospeed(&s);
|
||||
erase_char = s.c_cc[VERASE];
|
||||
kill_char = s.c_cc[VKILL];
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
* Set the modes to the way we want them.
|
||||
*/
|
||||
s.c_lflag &= ~(ICANON|ECHO|ECHOE|ECHOK|ECHONL);
|
||||
- s.c_oflag |= (OPOST|ONLCR|TAB3);
|
||||
+ s.c_oflag |= (OPOST|ONLCR|OXTABS);
|
||||
s.c_oflag &= ~(OCRNL|ONOCR|ONLRET);
|
||||
s.c_cc[VMIN] = 1;
|
||||
s.c_cc[VTIME] = 0;
|
||||
@@ -125,7 +125,7 @@
|
||||
*/
|
||||
s = save_term;
|
||||
}
|
||||
- ioctl(2, TCSETAW, &s);
|
||||
+ tcsetattr(2, TCSANOW, &s);
|
||||
#else
|
||||
struct sgttyb s;
|
||||
static struct sgttyb save_term;
|
||||
@@ -480,7 +480,7 @@
|
||||
* Clear the screen.
|
||||
*/
|
||||
public void
|
||||
-clear()
|
||||
+clearscr()
|
||||
{
|
||||
tputs(sc_clear, sc_height, putchr);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user