X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Ftermsbr.c;h=e1ea5f8c2218287fe5ef70efafb3f2fc82ef5a21;hb=1ec4ef34243a756d1f51718e7e15b094f4b36618;hp=0568bf312309efac57a1746321cc82c6f48196d8;hpb=5b9d883db0318ed2b84bb82dee880d7381f99188;p=mmh

diff --git a/uip/termsbr.c b/uip/termsbr.c
index 0568bf3..e1ea5f8 100644
--- a/uip/termsbr.c
+++ b/uip/termsbr.c
@@ -8,15 +8,7 @@
 
 #include <h/mh.h>
 
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#else
-# ifdef HAVE_TERMIO_H
-#  include <termio.h>
-# else
-#  include <sgtty.h>
-# endif
-#endif
+#include <termios.h>
 
 #ifdef HAVE_TERMCAP_H
 # include <termcap.h>
@@ -41,27 +33,11 @@
 # define TXTSIZ BUFSIZ
 #endif
 
-/*
-** These variables are sometimes defined in,
-** and needed by the termcap library.
-*/
-#ifdef HAVE_OSPEED
-# ifdef MUST_DEFINE_OSPEED
-extern short ospeed;
-extern char PC;
-# endif
-#else
-short ospeed;
-char PC;
-#endif
-
 static long speedcode;
 
 static int initCO = 0;
 
 static int CO = 80;      /* number of colums */
-static char *SE = NULL;  /* termcap string to end standout mode   */
-static char *SO = NULL;  /* termcap string to begin standout mode */
 
 static char termcap[TXTSIZ];
 
@@ -76,16 +52,7 @@ read_termcap(void)
 	char termbuf[TXTSIZ];
 #endif
 
-#ifdef HAVE_TERMIOS_H
 	struct termios tio;
-#else
-# ifdef HAVE_TERMIO_H
-	struct termio tio;
-# else
-	struct sgttyb tio;
-# endif
-#endif
-
 	static int inited = 0;
 
 	if (inited++)
@@ -105,17 +72,7 @@ read_termcap(void)
 		return;
 #endif
 
-#ifdef HAVE_TERMIOS_H
 	speedcode = cfgetospeed(&tio);
-#else
-# ifdef HAVE_TERMIO_H
-	speedcode = ioctl(fileno(stdout), TCGETA, &tio) != NOTOK ?
-			tio.c_cflag & CBAUD : 0;
-# else
-	speedcode = ioctl(fileno(stdout), TIOCGETP, (char *) &tio) != NOTOK ?
-			tio.sg_ospeed : 0;
-# endif
-#endif
 
 	if (!initCO && (CO = tgetnum("co")) <= 0)
 		CO = 80;
@@ -123,10 +80,6 @@ read_termcap(void)
 	cp = termcap;
 	if ((bp = tgetstr("pc", &cp)))
 		PC = *bp;
-	if (tgetnum("sg") <= 0) {
-		SE = tgetstr("se", &cp);
-		SO = tgetstr("so", &cp);
-	}
 }
 
 
@@ -147,27 +100,3 @@ sc_width(void)
 
 	return CO;
 }
-
-
-/*
-** print in standout mode
-*/
-int
-SOprintf(char *fmt, ...)
-{
-	va_list ap;
-
-	read_termcap();
-	if (!(SO && SE))
-		return NOTOK;
-
-	tputs(SO, 1, putchar);
-
-	va_start(ap, fmt);
-	vprintf(fmt, ap);
-	va_end(ap);
-
-	tputs(SE, 1, putchar);
-
-	return OK;
-}