ncurses 6.0 - patch 20151226

[ncurses.git] / test / dots.c

diff --git a/test/dots.c b/test/dots.c
index a5ddcaad58884dd668b8b5455e96ca5630ad1302..474d8805179efbc69225a08bc515fe9fbc401d22 100644 (file)
--- a/test/dots.c
+++ b/test/dots.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1999-2011,2013 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,35 +29,40 @@
 /*
  * Author: Thomas E. Dickey <dickey@clark.net> 1999
  *
- * $Id: dots.c,v 1.4 2000/02/13 01:05:13 tom Exp $
+ * $Id: dots.c,v 1.25 2013/09/28 22:12:09 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
+#define USE_TINFO
 #include <test.priv.h>
 
-#include <term.h>              /* for tparm() */
+#if HAVE_SETUPTERM
 
 #include <time.h>
-#include <signal.h>
 
 #define valid(s) ((s != 0) && s != (char *)-1)
 
 static bool interrupted = FALSE;
+static long total_chars = 0;
+static time_t started;
 
-static int
-outc(int c)
+static
+TPUTS_PROTO(outc, c)
 {
+    int rc = c;
+
     if (interrupted) {
-       char tmp = c;
-       write(STDOUT_FILENO, &tmp, 1);
+       char tmp = (char) c;
+       if (write(STDOUT_FILENO, &tmp, (size_t) 1) == -1)
+           rc = EOF;
     } else {
-       putc(c, stdout);
+       rc = putc(c, stdout);
     }
-    return 0;
+    TPUTS_RETURN(rc);
 }
 
 static bool
-outs(char *s)
+outs(const char *s)
 {
     if (valid(s)) {
        tputs(s, 1, outc);
@@ -74,70 +79,88 @@ cleanup(void)
        outs(orig_pair);
     outs(clear_screen);
     outs(cursor_normal);
+
+    printf("\n\n%ld total chars, rate %.2f/sec\n",
+          total_chars,
+          ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
 }
 
 static void
 onsig(int n GCC_UNUSED)
 {
     interrupted = TRUE;
-    cleanup();
-    exit(EXIT_FAILURE);
 }
 
-static float
+static double
 ranf(void)
 {
     long r = (rand() & 077777);
-    return ((float) r / 32768.);
+    return ((double) r / 32768.);
 }
 
 int
-main(
-    int argc GCC_UNUSED,
-    char *argv[]GCC_UNUSED)
+main(int argc GCC_UNUSED,
+     char *argv[]GCC_UNUSED)
 {
-    int x, y, z, j, p;
-    float r;
-    float c;
+    int x, y, z, p;
+    double r;
+    double c;
+    int my_colors;
 
-    for (j = SIGHUP; j <= SIGTERM; j++)
-       if (signal(j, SIG_IGN) != SIG_IGN)
-           signal(j, onsig);
+    CATCHALL(onsig);
 
-    srand(time(0));
+    srand((unsigned) time(0));
     setupterm((char *) 0, 1, (int *) 0);
     outs(clear_screen);
     outs(cursor_invisible);
-    if (max_colors > 1) {
+    my_colors = max_colors;
+    if (my_colors > 1) {
        if (!valid(set_a_foreground)
            || !valid(set_a_background)
            || (!valid(orig_colors) && !valid(orig_pair)))
-           max_colors = -1;
+           my_colors = -1;
     }
 
-    r = (float) (lines - 4);
-    c = (float) (columns - 4);
+    r = (double) (lines - 4);
+    c = (double) (columns - 4);
+    started = time((time_t *) 0);
 
-    for (;;) {
+    while (!interrupted) {
        x = (int) (c * ranf()) + 2;
        y = (int) (r * ranf()) + 2;
        p = (ranf() > 0.9) ? '*' : ' ';
 
-       tputs(tparm(cursor_address, y, x), 1, outc);
-       if (max_colors > 0) {
-           z = (int)(ranf() * max_colors);
+       tputs(tparm3(cursor_address, y, x), 1, outc);
+       if (my_colors > 0) {
+           z = (int) (ranf() * my_colors);
            if (ranf() > 0.01) {
-               tputs(tparm(set_a_foreground, z), 1, outc);
+               tputs(tparm2(set_a_foreground, z), 1, outc);
            } else {
-               tputs(tparm(set_a_background, z), 1, outc);
+               tputs(tparm2(set_a_background, z), 1, outc);
+               napms(1);
            }
        } else if (valid(exit_attribute_mode)
-           && valid(enter_reverse_mode)) {
-           if (ranf() <= 0.01)
-               outs((ranf() > 0.6) ? enter_reverse_mode :
-                   exit_attribute_mode);
+                  && valid(enter_reverse_mode)) {
+           if (ranf() <= 0.01) {
+               outs((ranf() > 0.6)
+                    ? enter_reverse_mode
+                    : exit_attribute_mode);
+               napms(1);
+           }
        }
        outc(p);
        fflush(stdout);
+       ++total_chars;
     }
+    cleanup();
+    ExitProgram(EXIT_SUCCESS);
+}
+#else
+int
+main(int argc GCC_UNUSED,
+     char *argv[]GCC_UNUSED)
+{
+    fprintf(stderr, "This program requires terminfo\n");
+    exit(EXIT_FAILURE);
 }
+#endif