ncurses 6.0 - patch 20170930

[ncurses.git] / test / echochar.c

diff --git a/test/echochar.c b/test/echochar.c
index 8cb0833aa023b1e158dfb41b62ea2d5e143489e5..1a3fd7d3a7833d68ef0b8ed9452f71aa7e96d75a 100644 (file)
--- a/test/echochar.c
+++ b/test/echochar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2006-2010,2012 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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: echochar.c,v 1.9 2012/06/09 20:30:32 tom Exp $
+ * $Id: echochar.c,v 1.15 2017/09/30 15:42:10 tom Exp $
  *
  * Demonstrate the echochar function (compare to dots.c).
  * Thomas Dickey - 2006/11/4
@@ -45,7 +45,7 @@ static time_t started;
 static void
 cleanup(void)
 {
-    endwin();
+    exit_curses();
 
     printf("\n\n%ld total chars, rate %.2f/sec\n",
           total_chars,
@@ -69,12 +69,14 @@ static void
 set_color(char *my_pairs, int fg, int bg)
 {
     int pair = (fg * COLORS) + bg;
-    if (!my_pairs[pair]) {
-       init_pair((short) pair,
-                 (short) fg,
-                 (short) bg);
+    if (pair < COLOR_PAIRS) {
+       if (!my_pairs[pair]) {
+           init_pair((short) pair,
+                     (short) fg,
+                     (short) bg);
+       }
+       attron(COLOR_PAIR(pair));
     }
-    attron((attr_t) COLOR_PAIR(pair));
 }
 
 int
@@ -101,8 +103,7 @@ main(int argc GCC_UNUSED,
        }
     }
 
-    CATCHALL(onsig);
-    initscr();
+    InitAndCatch(initscr(), onsig);
 
     use_colors = has_colors();
     if (use_colors) {
@@ -147,7 +148,7 @@ main(int argc GCC_UNUSED,
            }
        }
        if (opt_r) {
-           addch(UChar(p));
+           AddCh(UChar(p));
            refresh();
        } else {
            echochar(UChar(p));
@@ -155,5 +156,6 @@ main(int argc GCC_UNUSED,
        ++total_chars;
     }
     cleanup();
+    free(my_pairs);
     ExitProgram(EXIT_SUCCESS);
 }