From: root Date: Sat, 20 Jan 2007 00:45:30 +0000 (+0000) Subject: rip out sgtty X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b63769b83f9694f3e513fe40d7bf73db777148e8;p=dana%2Furxvt.git rip out sgtty --- diff --git a/Changes b/Changes index 979cfb4c..68ac3ba8 100644 --- a/Changes +++ b/Changes @@ -41,6 +41,7 @@ TODO: fix rounding of colors when !xft (#aaaaaa => #a9a900) (do not use correct, - delay setting the IUTF8 flag to after the tty settings have been set so its value does not get lost (reported and analysed by Andrei Paskevich). + - rip out support for obsolete sgtty.h interface. 8.1 Thu Dec 7 22:27:25 CET 2006 - ケリスマスプレゼント - zomg!!1, it's too early!!! diff --git a/src/init.C b/src/init.C index e6076096..f65d14a3 100644 --- a/src/init.C +++ b/src/init.C @@ -1081,7 +1081,6 @@ rxvt_term::create_windows (int argc, const char *const *argv) void rxvt_get_ttymode (ttymode_t *tio, int erase) { -#ifdef HAVE_TERMIOS_H /* * standard System V termios interface */ @@ -1158,53 +1157,6 @@ rxvt_get_ttymode (ttymode_t *tio, int erase) | ECHOCTL | ECHOKE # endif | ECHOE | ECHOK); -# else /* HAVE_TERMIOS_H */ - - /* - * sgtty interface - */ - - /* get parameters -- gtty */ - if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) - { - tio->sg.sg_erase = CERASE; /* ^H */ - tio->sg.sg_kill = CKILL; /* ^U */ - } - - if (erase != -1) - tio->sg.sg_erase = (char)erase; - - tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); - - /* get special characters */ - if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0) - { - tio->tc.t_intrc = CINTR; /* ^C */ - tio->tc.t_quitc = CQUIT; /* ^\ */ - tio->tc.t_startc = CSTART; /* ^Q */ - tio->tc.t_stopc = CSTOP; /* ^S */ - tio->tc.t_eofc = CEOF; /* ^D */ - tio->tc.t_brkc = -1; - } - - /* get local special chars */ - if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) - { - tio->lc.t_suspc = CSUSP; /* ^Z */ - tio->lc.t_dsuspc = CDSUSP; /* ^Y */ - tio->lc.t_rprntc = CRPRNT; /* ^R */ - tio->lc.t_flushc = CFLUSH; /* ^O */ - tio->lc.t_werasc = CWERASE; /* ^W */ - tio->lc.t_lnextc = CLNEXT; /* ^V */ - } - /* get line discipline */ - ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); -# ifdef NTTYDISC - tio->line = NTTYDISC; -# endif /* NTTYDISC */ - - tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); -#endif /* HAVE_TERMIOS_H */ /* * Debugging diff --git a/src/init.h b/src/init.h index 94fc0e98..745d853e 100644 --- a/src/init.h +++ b/src/init.h @@ -19,7 +19,6 @@ /* ways to deal with getting/setting termios structure */ -#ifdef HAVE_TERMIOS_H /* termios interface */ # ifdef TCSANOW /* POSIX */ # define GET_TERMIOS(fd,tios) tcgetattr (fd, tios) @@ -41,17 +40,6 @@ # endif # endif # define SET_TTYMODE(fd,tios) SET_TERMIOS (fd, tios) -#else -/* sgtty interface */ - -# define SET_TTYMODE(fd,tt) \ - tt->sg.sg_ispeed = tt->sg.sg_ospeed = BAUDRATE, \ - ioctl (fd, TIOCSETP, & (tt->sg)), \ - ioctl (fd, TIOCSETC, & (tt->tc)), \ - ioctl (fd, TIOCSLTC, & (tt->lc)), \ - ioctl (fd, TIOCSETD, & (tt->line)), \ - ioctl (fd, TIOCLSET, & (tt->local)) -#endif /* HAVE_TERMIOS_H */ /* use the fastest baud-rate */ #ifdef B38400 diff --git a/src/rxvt.h b/src/rxvt.h index 1b405c4a..b110a547 100644 --- a/src/rxvt.h +++ b/src/rxvt.h @@ -72,19 +72,8 @@ typedef char *XPointer; #endif -#ifdef HAVE_TERMIOS_H -# include +#include typedef struct termios ttymode_t; -#else -# include -typedef struct { - struct sgttyb sg; - struct tchars tc; - struct ltchars lc; - int line; - int local; -} ttymode_t; -#endif #ifdef XPM_BACKGROUND # ifdef XPM_INC_X11