rip out sgtty

diff --git a/Changes b/Changes
index 979cfb4caeb6a4918ce570dc5b622b98d31cd385..68ac3ba8c8f0d14988f1a743f479df18b8f55c18 100644 (file)
--- 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 e6076096f594d8654a06e486a7fde52d6c3bd4fa..f65d14a33b267fcebdafda1e3525e06c70d34adc 100644 (file)
--- 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 94fc0e98db6fcebe45d6f5d732b4cf68518ec0de..745d853e01f042a8462f1a59e80403ad0a9cdaed 100644 (file)
--- 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 1b405c4a9ddb2f00c98ed8a448e8767ad1bb94b2..b110a547d57cce4509235446f88fd06c7513acfc 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -72,19 +72,8 @@
 typedef char *XPointer;
 #endif
 
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
+#include <termios.h>
 typedef struct termios ttymode_t;
-#else
-# include <sgtty.h>
-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