ncurses 6.0 - patch 20170408

[ncurses.git] / test / echochar.c

diff --git a/test/echochar.c b/test/echochar.c
index 9f2d11c5bb9476796ac87a67c2f43ba0e0cbd535..b2cf99bbef78f73accb2f7e0fb8f62c1607b1bbd 100644 (file)
--- a/test/echochar.c
+++ b/test/echochar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2006-2014,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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: echochar.c,v 1.3 2006/12/03 00:14:29 tom Exp $
+ * $Id: echochar.c,v 1.11 2017/04/08 21:53:51 tom Exp $

  *
  * Demonstrate the echochar function (compare to dots.c).
  * Thomas Dickey - 2006/11/4
  *
  * Demonstrate the echochar function (compare to dots.c).
  * Thomas Dickey - 2006/11/4


@@ -49,7 +49,7 @@ cleanup(void)
 
     printf("\n\n%ld total chars, rate %.2f/sec\n",
           total_chars,
 
     printf("\n\n%ld total chars, rate %.2f/sec\n",
           total_chars,

-          ((double) (total_chars) / (time((time_t *) 0) - started)));
+          ((double) (total_chars) / (double) (time((time_t *) 0) - started)));

 }
 
 static void
 }
 
 static void


@@ -58,38 +58,41 @@ onsig(int n GCC_UNUSED)
     interrupted = TRUE;
 }
 
     interrupted = TRUE;
 }
 

-static float
+static double

 ranf(void)
 {
     long r = (rand() & 077777);
 ranf(void)
 {
     long r = (rand() & 077777);

-    return ((float) r / 32768.);
+    return ((double) r / 32768.);

 }
 
 static void
 set_color(char *my_pairs, int fg, int bg)
 {
     int pair = (fg * COLORS) + bg;
 }
 
 static void
 set_color(char *my_pairs, int fg, int bg)
 {
     int pair = (fg * COLORS) + bg;

-    if (!my_pairs[pair]) {
-       init_pair(pair, fg, bg);
+    if (pair < COLOR_PAIRS) {
+       if (!my_pairs[pair]) {
+           init_pair((short) pair,
+                     (short) fg,
+                     (short) bg);
+       }
+       attron(COLOR_PAIR(pair));

     }
     }

-    attron(COLOR_PAIR(pair));

 }
 
 int
 }
 
 int

-main(
-       int argc GCC_UNUSED,
-       char *argv[]GCC_UNUSED)
+main(int argc GCC_UNUSED,
+     char *argv[]GCC_UNUSED)

 {
     int ch, x, y, z, p;
 {
     int ch, x, y, z, p;

-    float r;
-    float c;
+    double r;
+    double c;

     bool use_colors;
     bool opt_r = FALSE;
     char *my_pairs = 0;
     int last_fg = 0;
     int last_bg = 0;
 
     bool use_colors;
     bool opt_r = FALSE;
     char *my_pairs = 0;
     int last_fg = 0;
     int last_bg = 0;
 

-    while ((ch = getopt(argc, argv, "r")) != EOF) {
+    while ((ch = getopt(argc, argv, "r")) != -1) {

        switch (ch) {
        case 'r':
            opt_r = TRUE;
        switch (ch) {
        case 'r':
            opt_r = TRUE;


@@ -107,7 +110,7 @@ main(
     if (use_colors) {
        start_color();
        if (COLOR_PAIRS > 0) {
     if (use_colors) {
        start_color();
        if (COLOR_PAIRS > 0) {

-           my_pairs = calloc(COLOR_PAIRS, sizeof(*my_pairs));
+           my_pairs = typeCalloc(char, (size_t) COLOR_PAIRS);

        }
        use_colors = (my_pairs != 0);
     }
        }
        use_colors = (my_pairs != 0);
     }


@@ -116,8 +119,8 @@ main(
 
     curs_set(0);
 
 
     curs_set(0);
 

-    r = (float) (LINES - 4);
-    c = (float) (COLS - 4);
+    r = (double) (LINES - 4);
+    c = (double) (COLS - 4);

     started = time((time_t *) 0);
 
     while (!interrupted) {
     started = time((time_t *) 0);
 
     while (!interrupted) {


@@ -146,10 +149,10 @@ main(
            }
        }
        if (opt_r) {
            }
        }
        if (opt_r) {

-           addch(p);
+           addch(UChar(p));

            refresh();
        } else {
            refresh();
        } else {

-           echochar(p);
+           echochar(UChar(p));

        }
        ++total_chars;
     }
        }
        ++total_chars;
     }