ncurses 6.0 - patch 20171007

[ncurses.git] / test / dots_curses.c

diff --git a/test/dots_curses.c b/test/dots_curses.c
index ef300ee4d3abd333cc46eb4b054eaa33c26ca8a9..d27f2e2303d77492f8607bb101fd413fd3f4b574 100644 (file)
--- a/test/dots_curses.c
+++ b/test/dots_curses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2014 Free Software Foundation, Inc.                        *
+ * Copyright (c) 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            *
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_curses.c,v 1.1 2014/06/21 16:07:50 tom Exp $
+ * $Id: dots_curses.c,v 1.5 2017/09/30 15:41:17 tom Exp $
  *
  * A simple demo of the curses interface used for comparison with termcap.
  */
@@ -82,7 +82,7 @@ set_colors(int fg, int bg)
 {
     int pair = mypair(fg, bg);
     if (pair > 0) {
-       attron((attr_t) COLOR_PAIR(mypair(fg, bg)));
+       attron(COLOR_PAIR(mypair(fg, bg)));
     }
 }
 
@@ -95,18 +95,16 @@ main(int argc GCC_UNUSED,
     double r;
     double c;
 
-    CATCHALL(onsig);
-
     srand((unsigned) time(0));
 
-    initscr();
+    InitAndCatch(initscr(), onsig);
     if (has_colors()) {
        start_color();
        for (fg = 0; fg < COLORS; fg++) {
            for (bg = 0; bg < COLORS; bg++) {
                int pair = mypair(fg, bg);
                if (pair > 0)
-                   init_pair(pair, fg, bg);
+                   init_pair((short) pair, (short) fg, (short) bg);
            }
        }
     }
@@ -127,7 +125,7 @@ main(int argc GCC_UNUSED,
            z = (int) (ranf() * COLORS);
            if (ranf() > 0.01) {
                set_colors(fg = z, bg);
-               attron((attr_t) COLOR_PAIR(mypair(fg, bg)));
+               attron(COLOR_PAIR(mypair(fg, bg)));
            } else {
                set_colors(fg, bg = z);
                napms(1);
@@ -142,7 +140,7 @@ main(int argc GCC_UNUSED,
                napms(1);
            }
        }
-       addch(p);
+       AddCh(p);
        refresh();
        ++total_chars;
     }