ncurses 6.2 - patch 20200509

[ncurses.git] / test / dots.c

diff --git a/test/dots.c b/test/dots.c
index 36509ee0f887ca28d2763f1bf658319dc1ce0e97..11fc1cfef4b708285e3ab4ff995bd40844e05117 100644 (file)
--- a/test/dots.c
+++ b/test/dots.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1999-2017,2019 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 1999-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 +30,7 @@
 /*
  * Author: Thomas E. Dickey <dickey@clark.net> 1999
  *
- * $Id: dots.c,v 1.34 2019/01/21 14:20:18 tom Exp $
+ * $Id: dots.c,v 1.39 2020/05/10 00:31:03 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -78,9 +79,10 @@ cleanup(void)
     outs(clear_screen);
     outs(cursor_normal);
 
-    printf("\n\n%ld total cells, rate %.2f/sec\n",
-          total_chars,
-          ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
+    fflush(stdout);
+    fprintf(stderr, "\n\n%ld total cells, rate %.2f/sec\n",
+           total_chars,
+           ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
 }
 
 static void
@@ -122,6 +124,7 @@ usage(void)
 #endif
        ," -f       use tigetnum rather than <term.h> mapping"
        ," -m SIZE  set margin (default: 2)"
+       ," -r SECS  self-interrupt/exit after specified number of seconds"
        ," -s MSECS delay 1% of the time (default: 1 msecs)"
     };
     size_t n;
@@ -136,18 +139,19 @@ int
 main(int argc,
      char *argv[])
 {
-    int x, y, z, p;
+    int ch;
     double r;
     double c;
     int my_colors;
     int f_option = 0;
     int m_option = 2;
+    int r_option = 0;
     int s_option = 1;
     size_t need;
     char *my_env;
 
-    while ((x = getopt(argc, argv, "T:efm:s:")) != -1) {
-       switch (x) {
+    while ((ch = getopt(argc, argv, "T:efm:r:s:")) != -1) {
+       switch (ch) {
        case 'T':
            need = 6 + strlen(optarg);
            my_env = malloc(need);
@@ -165,6 +169,9 @@ main(int argc,
        case 'm':
            m_option = atoi(optarg);
            break;
+       case 'r':
+           r_option = atoi(optarg);
+           break;
        case 's':
            s_option = atoi(optarg);
            break;
@@ -174,6 +181,7 @@ main(int argc,
        }
     }
 
+    SetupAlarm(r_option);
     InitAndCatch(setupterm((char *) 0, 1, (int *) 0), onsig);
 
     srand((unsigned) time(0));
@@ -195,13 +203,13 @@ main(int argc,
     started = time((time_t *) 0);
 
     while (!interrupted) {
-       x = (int) (c * ranf()) + m_option;
-       y = (int) (r * ranf()) + m_option;
-       p = (ranf() > 0.9) ? '*' : ' ';
+       int x = (int) (c * ranf()) + m_option;
+       int y = (int) (r * ranf()) + m_option;
+       int p = (ranf() > 0.9) ? '*' : ' ';
 
        tputs(tparm3(cursor_address, y, x), 1, outc);
        if (my_colors > 0) {
-           z = (int) (ranf() * my_colors);
+           int z = (int) (ranf() * my_colors);
            if (ranf() > 0.01) {
                tputs(tparm2(set_a_foreground, z), 1, outc);
            } else {