ncurses 6.0 - patch 20171014

[ncurses.git] / test / dots_mvcur.c

diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c
index 90b9c4e5b17b7582ebffc6a823bfe3d396a8cbe7..d6ce9329014a5a761fc6650800d6da4e3ad09321 100644 (file)
--- a/test/dots_mvcur.c
+++ b/test/dots_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007-2009,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 2007-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            *
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey - 2007
  *
- * $Id: dots_mvcur.c,v 1.10 2013/09/28 22:44:18 tom Exp $
+ * $Id: dots_mvcur.c,v 1.15 2017/10/11 08:15:46 tom Exp $
  *
  * A simple demo of the terminfo interface, and mvcur.
  */
@@ -40,8 +40,6 @@
 
 #include <time.h>
 
-#define valid(s) ((s != 0) && s != (char *)-1)
-
 static bool interrupted = FALSE;
 static long total_chars = 0;
 static time_t started;
@@ -65,7 +63,7 @@ TPUTS_PROTO(outc, c)
 static bool
 outs(const char *s)
 {
-    if (valid(s)) {
+    if (VALID_STRING(s)) {
        tputs(s, 1, outc);
        return TRUE;
     }
@@ -81,7 +79,7 @@ cleanup(void)
     outs(clear_screen);
     outs(cursor_normal);
 
-    printf("\n\n%ld total chars, rate %.2f/sec\n",
+    printf("\n\n%ld total cells, rate %.2f/sec\n",
           total_chars,
           ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
 }
@@ -110,18 +108,24 @@ main(int argc GCC_UNUSED,
     SCREEN *sp;
     int my_colors;
 
-    CATCHALL(onsig);
+    InitAndCatch((sp = newterm((char *) 0, stdout, stdin)), onsig);
+    refresh();                 /* needed with Solaris curses to cancel endwin */
+
+    if (sp == 0) {
+       fprintf(stderr, "Cannot initialize terminal\n");
+       ExitProgram(EXIT_FAILURE);
+    }
 
     srand((unsigned) time(0));
-    sp = newterm((char *) 0, stdout, stdin);
+
     outs(clear_screen);
     outs(cursor_home);
     outs(cursor_invisible);
     my_colors = max_colors;
     if (my_colors > 1) {
-       if (!valid(set_a_foreground)
-           || !valid(set_a_background)
-           || (!valid(orig_colors) && !valid(orig_pair)))
+       if (!VALID_STRING(set_a_foreground)
+           || !VALID_STRING(set_a_background)
+           || (!VALID_STRING(orig_colors) && !VALID_STRING(orig_pair)))
            my_colors = -1;
     }
 
@@ -147,8 +151,8 @@ main(int argc GCC_UNUSED,
                tputs(tparm2(set_a_background, z), 1, outc);
                napms(1);
            }
-       } else if (valid(exit_attribute_mode)
-                  && valid(enter_reverse_mode)) {
+       } else if (VALID_STRING(exit_attribute_mode)
+                  && VALID_STRING(enter_reverse_mode)) {
            if (ranf() <= 0.01) {
                outs((ranf() > 0.6)
                     ? enter_reverse_mode