X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Frailroad.c;h=12844cbdd7041009e528fc61884d5f77b80df51a;hp=d3dc2eae80248fd9e1097afe82c1ffbe07fbefdf;hb=22a4b929f47f85588dc07fddf98b09776cec658f;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34

diff --git a/test/railroad.c b/test/railroad.c
index d3dc2eae..12844cbd 100644
--- a/test/railroad.c
+++ b/test/railroad.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2000 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2000-2013,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -27,17 +27,21 @@
  ****************************************************************************/
 
 /*
- * Author: Thomas E. Dickey <dickey@clark.net> 2000
+ * Author: Thomas E. Dickey - 2000
  *
- * $Id: railroad.c,v 1.1 2000/01/15 02:41:27 tom Exp $
+ * $Id: railroad.c,v 1.22 2017/09/30 17:55:22 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
+#define USE_TINFO
 #include <test.priv.h>
 
-#include <termcap.h>
-#include <ctype.h>
-#include <signal.h>
+#if HAVE_TGETENT
+
+static char *wipeit;
+static char *moveit;
+static int length;
+static int height;
 
 static char *finisC;
 static char *finisS;
@@ -51,16 +55,20 @@ static char *backup;
 
 static bool interrupted = FALSE;
 
-static int
-outc(int c)
+static
+TPUTS_PROTO(outc, c)
 {
+    int rc = OK;
+
     if (interrupted) {
-	char tmp = c;
-	write(STDOUT_FILENO, &tmp, 1);
+	char tmp = (char) c;
+	if (write(STDOUT_FILENO, &tmp, (size_t) 1) == -1)
+	    rc = ERR;
     } else {
-	putc(c, stdout);
+	if (putc(c, stdout) == EOF)
+	    rc = ERR;
     }
-    return 0;
+    TPUTS_RETURN(rc);
 }
 
 static void
@@ -68,7 +76,7 @@ PutChar(int ch)
 {
     putchar(ch);
     fflush(stdout);
-    napms(50);			/* not really termcap... */
+    napms(moveit ? 10 : 50);	/* not really termcap... */
 }
 
 static void
@@ -78,7 +86,7 @@ Backup(void)
 }
 
 static void
-ShowCursor(int flag)
+MyShowCursor(int flag)
 {
     if (startC != 0 && finisC != 0) {
 	tputs(flag ? startC : finisC, 1, outc);
@@ -104,26 +112,47 @@ Underline(int flag)
 static void
 ShowSign(char *string)
 {
+    char *base = string;
     int ch, first, last;
 
+    if (moveit != 0) {
+	tputs(tgoto(moveit, 0, height - 1), 1, outc);
+	tputs(wipeit, 1, outc);
+    }
+
     while (*string != 0) {
 	ch = *string;
-	last = ch;
-	if (isalpha(ch)) {
-	    first = isupper(ch) ? 'A' : 'a';
-	} else if (isdigit(ch)) {
-	    first = '0';
-	} else {
-	    first = ch;
-	}
-	if (first < last) {
-	    Underline(1);
-	    while (first < last) {
-		PutChar(first);
-		Backup();
-		first++;
+	if (ch != ' ') {
+	    if (moveit != 0) {
+		for (first = length - 2; first >= (string - base); first--) {
+		    if (first < length - 1) {
+			tputs(tgoto(moveit, first + 1, height - 1), 1, outc);
+			PutChar(' ');
+		    }
+		    tputs(tgoto(moveit, first, height - 1), 1, outc);
+		    PutChar(ch);
+		}
+	    } else {
+		last = ch;
+		if (isalpha(ch)) {
+		    first = isupper(ch) ? 'A' : 'a';
+		} else if (isdigit(ch)) {
+		    first = '0';
+		} else {
+		    first = ch;
+		}
+		if (first < last) {
+		    Underline(1);
+		    while (first < last) {
+			PutChar(first);
+			Backup();
+			first++;
+		    }
+		    Underline(0);
+		}
 	    }
-	    Underline(0);
+	    if (moveit != 0)
+		Backup();
 	}
 	StandOut(1);
 	PutChar(ch);
@@ -131,6 +160,8 @@ ShowSign(char *string)
 	fflush(stdout);
 	string++;
     }
+    if (moveit != 0)
+	tputs(wipeit, 1, outc);
     putchar('\n');
 }
 
@@ -139,7 +170,7 @@ cleanup(void)
 {
     Underline(0);
     StandOut(0);
-    ShowCursor(1);
+    MyShowCursor(1);
 }
 
 static void
@@ -147,20 +178,38 @@ onsig(int n GCC_UNUSED)
 {
     interrupted = TRUE;
     cleanup();
-    exit(EXIT_FAILURE);
+    ExitProgram(EXIT_FAILURE);
 }
 
 static void
 railroad(char **args)
 {
-    char *name = getenv("TERM");
+    NCURSES_CONST char *name = getenv("TERM");
     char buffer[1024];
     char area[1024], *ap = area;
-    int j;
+    int z;
 
     if (name == 0)
 	name = "dumb";
-    if (tgetent(buffer, name)) {
+
+    InitAndCatch(z = tgetent(buffer, name), onsig);
+    if (z >= 0) {
+
+	wipeit = tgetstr("ce", &ap);
+	height = tgetnum("li");
+	length = tgetnum("co");
+	moveit = tgetstr("cm", &ap);
+
+	if (wipeit == 0
+	    || moveit == 0
+	    || height <= 0
+	    || length <= 0) {
+	    wipeit = 0;
+	    moveit = 0;
+	    height = 0;
+	    length = 0;
+	}
+
 	startS = tgetstr("so", &ap);
 	finisS = tgetstr("se", &ap);
 
@@ -172,30 +221,35 @@ railroad(char **args)
 	startC = tgetstr("ve", &ap);
 	finisC = tgetstr("vi", &ap);
 
-	ShowCursor(0);
-
-	for (j = SIGHUP; j <= SIGTERM; j++)
-	    if (signal(j, SIG_IGN) != SIG_IGN)
-		signal(j, onsig);
+	MyShowCursor(0);
 
 	while (*args) {
 	    ShowSign(*args++);
 	}
-	ShowCursor(1);
+	MyShowCursor(1);
     }
 }
 
 int
-main(
-    int argc,
-    char *argv[])
+main(int argc, char *argv[])
 {
     if (argc > 1) {
 	railroad(argv + 1);
     } else {
+	static char world[] = "Hello World";
 	static char *hello[] =
-	{"Hello World", 0};
+	{world, 0};
 	railroad(hello);
     }
-    return EXIT_SUCCESS;
+    ExitProgram(EXIT_SUCCESS);
+}
+
+#else
+int
+main(int argc GCC_UNUSED,
+     char *argv[]GCC_UNUSED)
+{
+    printf("This program requires termcap\n");
+    exit(EXIT_FAILURE);
 }
+#endif