X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ftermsbr.c;h=fbf5f1620a32d92edf3356c008e56f09be7604f3;hp=0568bf312309efac57a1746321cc82c6f48196d8;hb=1642d62841486ade88ec2c48dd581e3249c98c94;hpb=5b9d883db0318ed2b84bb82dee880d7381f99188 diff --git a/uip/termsbr.c b/uip/termsbr.c index 0568bf3..fbf5f16 100644 --- a/uip/termsbr.c +++ b/uip/termsbr.c @@ -8,15 +8,7 @@ #include -#ifdef HAVE_TERMIOS_H -# include -#else -# ifdef HAVE_TERMIO_H -# include -# else -# include -# endif -#endif +#include #ifdef HAVE_TERMCAP_H # include @@ -41,51 +33,23 @@ # 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]; static void read_termcap(void) { - char *bp, *cp; char *term; #ifndef TGETENT_ACCEPTS_NULL 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,28 +69,10 @@ 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; - - cp = termcap; - if ((bp = tgetstr("pc", &cp))) - PC = *bp; - if (tgetnum("sg") <= 0) { - SE = tgetstr("se", &cp); - SO = tgetstr("so", &cp); - } } @@ -147,27 +93,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; -}