X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ftermsbr.c;h=e7ba35ae2a3f0bc8cde31e7e64c87d9cb3c38d30;hp=f2b0a53e88304e276aff24a5489e064db0e98db4;hb=b7764c4a6b71d37918a97594d866258f154017ca;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/termsbr.c b/uip/termsbr.c
index f2b0a53..e7ba35a 100644
--- a/uip/termsbr.c
+++ b/uip/termsbr.c
@@ -60,7 +60,6 @@ static long speedcode;
 static int initLI = 0;
 static int initCO = 0;
 
-static int HC = 0;       /* are we on a hardcopy terminal? */
 static int LI = 40;      /* number of lines */
 static int CO = 80;      /* number of colums */
 static char *CL = NULL;  /* termcap string to clear screen */
@@ -95,17 +94,17 @@ read_termcap(void)
 	if (inited++)
 		return;
 
-	if (!(term = getenv ("TERM")))
+	if (!(term = getenv("TERM")))
 		return;
 
 /*
 ** If possible, we let tgetent allocate its own termcap buffer
 */
 #ifdef TGETENT_ACCEPTS_NULL
-	if (tgetent (NULL, term) != TGETENT_SUCCESS)
+	if (tgetent(NULL, term) != TGETENT_SUCCESS)
 		return;
 #else
-	if (tgetent (termbuf, term) != TGETENT_SUCCESS)
+	if (tgetent(termbuf, term) != TGETENT_SUCCESS)
 		return;
 #endif
 
@@ -121,32 +120,30 @@ read_termcap(void)
 # endif
 #endif
 
-	HC = tgetflag ("hc");
-
-	if (!initCO && (CO = tgetnum ("co")) <= 0)
+	if (!initCO && (CO = tgetnum("co")) <= 0)
 		CO = 80;
-	if (!initLI && (LI = tgetnum ("li")) <= 0)
+	if (!initLI && (LI = tgetnum("li")) <= 0)
 		LI = 24;
 
 	cp = termcap;
-	CL = tgetstr ("cl", &cp);
-	if ((bp = tgetstr ("pc", &cp)))
+	CL = tgetstr("cl", &cp);
+	if ((bp = tgetstr("pc", &cp)))
 		PC = *bp;
-	if (tgetnum ("sg") <= 0) {
-		SE = tgetstr ("se", &cp);
-		SO = tgetstr ("so", &cp);
+	if (tgetnum("sg") <= 0) {
+		SE = tgetstr("se", &cp);
+		SO = tgetstr("so", &cp);
 	}
 }
 
 
 int
-sc_width (void)
+sc_width(void)
 {
 #ifdef TIOCGWINSZ
 	struct winsize win;
 	int width;
 
-	if (ioctl (fileno (stderr), TIOCGWINSZ, &win) != NOTOK
+	if (ioctl(fileno(stderr), TIOCGWINSZ, &win) != NOTOK
 			&& (width = win.ws_col) > 0) {
 		CO = width;
 		initCO++;
@@ -159,12 +156,12 @@ sc_width (void)
 
 
 int
-sc_length (void)
+sc_length(void)
 {
 #ifdef TIOCGWINSZ
 	struct winsize win;
 
-	if (ioctl (fileno (stderr), TIOCGWINSZ, &win) != NOTOK
+	if (ioctl(fileno(stderr), TIOCGWINSZ, &win) != NOTOK
 			&& (LI = win.ws_row) > 0)
 		initLI++;
 	else
@@ -175,27 +172,20 @@ sc_length (void)
 }
 
 
-static int
-outc (int c)
-{
-	return putchar(c);
-}
-
-
 void
-clear_screen (void)
+clear_screen(void)
 {
-	read_termcap ();
+	read_termcap();
 
 	if (CL && speedcode)
-		tputs (CL, LI, outc);
+		tputs(CL, LI, putchar);
 	else {
-		printf ("\f");
+		printf("\f");
 		if (speedcode)
-			printf ("\200");
+			printf("\200");
 	}
 
-	fflush (stdout);
+	fflush(stdout);
 }
 
 
@@ -203,32 +193,21 @@ clear_screen (void)
 ** print in standout mode
 */
 int
-SOprintf (char *fmt, ...)
+SOprintf(char *fmt, ...)
 {
 	va_list ap;
 
-	read_termcap ();
+	read_termcap();
 	if (!(SO && SE))
 		return NOTOK;
 
-	tputs (SO, 1, outc);
+	tputs(SO, 1, putchar);
 
 	va_start(ap, fmt);
-	vprintf (fmt, ap);
+	vprintf(fmt, ap);
 	va_end(ap);
 
-	tputs (SE, 1, outc);
+	tputs(SE, 1, putchar);
 
 	return OK;
 }
-
-/*
-** Is this a hardcopy terminal?
-*/
-
-int
-sc_hardcopy(void)
-{
-	read_termcap();
-	return HC;
-}