ncurses 5.9 - patch 20130608

[ncurses.git] / test / firework.c

diff --git a/test/firework.c b/test/firework.c
index 557a7bf231ece347aade3b97e5316a51e6f9d6a8..27d8fdfa86685cda3a6d5e45afb09c8d56d2ed83 100644 (file)
--- a/test/firework.c
+++ b/test/firework.c
@@ -1,12 +1,38 @@
+/****************************************************************************
+ * Copyright (c) 1998-2010,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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/

 /*
 /*

- * $Id: firework.c,v 1.15 1999/10/16 21:33:39 tom Exp $
+ * $Id: firework.c,v 1.29 2013/04/27 19:46:53 tom Exp $

  */
 #include <test.priv.h>
 
  */
 #include <test.priv.h>
 

-#include <signal.h>

 #include <time.h>
 
 #include <time.h>
 

-static int my_bg = COLOR_BLACK;
+static short my_bg = COLOR_BLACK;

 
 static void
 cleanup(void)
 
 static void
 cleanup(void)


@@ -15,11 +41,11 @@ cleanup(void)
     endwin();
 }
 
     endwin();
 }
 

-static RETSIGTYPE
+static void

 onsig(int n GCC_UNUSED)
 {
     cleanup();
 onsig(int n GCC_UNUSED)
 {
     cleanup();

-    exit(EXIT_FAILURE);
+    ExitProgram(EXIT_FAILURE);

 }
 
 static void
 }
 
 static void


@@ -35,7 +61,7 @@ showit(void)
 #endif
        if (ch == 'q') {
            cleanup();
 #endif
        if (ch == 'q') {
            cleanup();

-           exit(EXIT_SUCCESS);
+           ExitProgram(EXIT_SUCCESS);

        } else if (ch == 's') {
            nodelay(stdscr, FALSE);
        } else if (ch == ' ') {
        } else if (ch == 's') {
            nodelay(stdscr, FALSE);
        } else if (ch == ' ') {


@@ -44,9 +70,8 @@ showit(void)
     }
 }
 
     }
 }
 

-static
-int
-get_colour(chtype * bold)
+static short
+get_colour(chtype *bold)

 {
     int attr;
     attr = (rand() % 16) + 1;
 {
     int attr;
     attr = (rand() % 16) + 1;


@@ -56,7 +81,7 @@ get_colour(chtype * bold)
        *bold = A_BOLD;
        attr &= 7;
     }
        *bold = A_BOLD;
        attr &= 7;
     }

-    return (attr);
+    return (short) (attr);

 }
 
 static
 }
 
 static


@@ -65,65 +90,62 @@ explode(int row, int col)
 {
     chtype bold;
     erase();
 {
     chtype bold;
     erase();

-    mvprintw(row, col, "-");
+    MvPrintw(row, col, "-");

     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);

-    attrset(COLOR_PAIR(1) | bold);
-    mvprintw(row - 1, col - 1, " - ");
-    mvprintw(row + 0, col - 1, "-+-");
-    mvprintw(row + 1, col - 1, " - ");
+    (void) attrset((chtype) COLOR_PAIR(1) | bold);
+    MvPrintw(row - 1, col - 1, " - ");
+    MvPrintw(row + 0, col - 1, "-+-");
+    MvPrintw(row + 1, col - 1, " - ");

     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);

-    attrset(COLOR_PAIR(1) | bold);
-    mvprintw(row - 2, col - 2, " --- ");
-    mvprintw(row - 1, col - 2, "-+++-");
-    mvprintw(row + 0, col - 2, "-+#+-");
-    mvprintw(row + 1, col - 2, "-+++-");
-    mvprintw(row + 2, col - 2, " --- ");
+    (void) attrset((chtype) COLOR_PAIR(1) | bold);
+    MvPrintw(row - 2, col - 2, " --- ");
+    MvPrintw(row - 1, col - 2, "-+++-");
+    MvPrintw(row + 0, col - 2, "-+#+-");
+    MvPrintw(row + 1, col - 2, "-+++-");
+    MvPrintw(row + 2, col - 2, " --- ");

     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);

-    attrset(COLOR_PAIR(1) | bold);
-    mvprintw(row - 2, col - 2, " +++ ");
-    mvprintw(row - 1, col - 2, "++#++");
-    mvprintw(row + 0, col - 2, "+# #+");
-    mvprintw(row + 1, col - 2, "++#++");
-    mvprintw(row + 2, col - 2, " +++ ");
+    (void) attrset((chtype) COLOR_PAIR(1) | bold);
+    MvPrintw(row - 2, col - 2, " +++ ");
+    MvPrintw(row - 1, col - 2, "++#++");
+    MvPrintw(row + 0, col - 2, "+# #+");
+    MvPrintw(row + 1, col - 2, "++#++");
+    MvPrintw(row + 2, col - 2, " +++ ");

     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);

-    attrset(COLOR_PAIR(1) | bold);
-    mvprintw(row - 2, col - 2, "  #  ");
-    mvprintw(row - 1, col - 2, "## ##");
-    mvprintw(row + 0, col - 2, "#   #");
-    mvprintw(row + 1, col - 2, "## ##");
-    mvprintw(row + 2, col - 2, "  #  ");
+    (void) attrset((chtype) COLOR_PAIR(1) | bold);
+    MvPrintw(row - 2, col - 2, "  #  ");
+    MvPrintw(row - 1, col - 2, "## ##");
+    MvPrintw(row + 0, col - 2, "#   #");
+    MvPrintw(row + 1, col - 2, "## ##");
+    MvPrintw(row + 2, col - 2, "  #  ");

     showit();
 
     init_pair(1, get_colour(&bold), my_bg);
     showit();
 
     init_pair(1, get_colour(&bold), my_bg);

-    attrset(COLOR_PAIR(1) | bold);
-    mvprintw(row - 2, col - 2, " # # ");
-    mvprintw(row - 1, col - 2, "#   #");
-    mvprintw(row + 0, col - 2, "     ");
-    mvprintw(row + 1, col - 2, "#   #");
-    mvprintw(row + 2, col - 2, " # # ");
+    (void) attrset((chtype) COLOR_PAIR(1) | bold);
+    MvPrintw(row - 2, col - 2, " # # ");
+    MvPrintw(row - 1, col - 2, "#   #");
+    MvPrintw(row + 0, col - 2, "     ");
+    MvPrintw(row + 1, col - 2, "#   #");
+    MvPrintw(row + 2, col - 2, " # # ");

     showit();
 }
 
 int
 main(
     showit();
 }
 
 int
 main(

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

 {
 {

-    int j;

     int start, end, row, diff, flag = 0, direction;
     unsigned seed;
 
     int start, end, row, diff, flag = 0, direction;
     unsigned seed;
 

-    for (j = SIGHUP; j <= SIGTERM; j++)
-       if (signal(j, SIG_IGN) != SIG_IGN)
-           signal(j, onsig);
+    CATCHALL(onsig);

 
     initscr();
     noecho();
 
     initscr();
     noecho();


@@ -133,14 +155,14 @@ main(
 
     if (has_colors()) {
        start_color();
 
     if (has_colors()) {
        start_color();

-#ifdef NCURSES_VERSION
+#if HAVE_USE_DEFAULT_COLORS

        if (use_default_colors() == OK)
            my_bg = -1;
 #endif
     }
     curs_set(0);
 
        if (use_default_colors() == OK)
            my_bg = -1;
 #endif
     }
     curs_set(0);
 

-    seed = time((time_t *) 0);
+    seed = (unsigned) time((time_t *) 0);

     srand(seed);
     for (;;) {
        do {
     srand(seed);
     for (;;) {
        do {


@@ -151,10 +173,10 @@ main(
            direction = (start > end) ? -1 : 1;
            diff = abs(start - end);
        } while (diff < 2 || diff >= LINES - 2);
            direction = (start > end) ? -1 : 1;
            diff = abs(start - end);
        } while (diff < 2 || diff >= LINES - 2);

-       attrset(A_NORMAL);
+       (void) attrset(A_NORMAL);

        for (row = 0; row < diff; row++) {
        for (row = 0; row < diff; row++) {

-           mvprintw(LINES - row, start + (row * direction),
-               (direction < 0) ? "\\" : "/");
+           MvPrintw(LINES - row, start + (row * direction),
+                    (direction < 0) ? "\\" : "/");

            if (flag++) {
                showit();
                erase();
            if (flag++) {
                showit();
                erase();


@@ -165,7 +187,7 @@ main(
            showit();
            flag = 0;
        }
            showit();
            flag = 0;
        }

-       seed = time((time_t *) 0);
+       seed = (unsigned) time((time_t *) 0);

        srand(seed);
        explode(LINES - row, start + (diff * direction));
        erase();
        srand(seed);
        explode(LINES - row, start + (diff * direction));
        erase();