X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffirework.c;h=198c58d7dbe43d4d89187f314a35afd560cbfd52;hp=1337e97690cc21e7f941f665e0e4f2d63830803e;hb=5d8dbcdd9423bf9821db414fd9ec792ccf1f1027;hpb=027ae42953e3186daed8f3882da73de48291b606;ds=sidebyside

diff --git a/test/firework.c b/test/firework.c
index 1337e976..198c58d7 100644
--- a/test/firework.c
+++ b/test/firework.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-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,22 +26,21 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: firework.c,v 1.24 2006/05/20 15:36:08 tom Exp $
+ * $Id: firework.c,v 1.34 2017/09/09 00:35:56 tom Exp $
  */
 #include <test.priv.h>
 
 #include <time.h>
 
-static int my_bg = COLOR_BLACK;
+static short my_bg = COLOR_BLACK;
 
 static void
 cleanup(void)
 {
-    curs_set(1);
-    endwin();
+    exit_curses();
 }
 
-static RETSIGTYPE
+static void
 onsig(int n GCC_UNUSED)
 {
     cleanup();
@@ -70,7 +69,7 @@ showit(void)
     }
 }
 
-static int
+static short
 get_colour(chtype *bold)
 {
     int attr;
@@ -81,7 +80,7 @@ get_colour(chtype *bold)
 	*bold = A_BOLD;
 	attr &= 7;
     }
-    return (attr);
+    return (short) (attr);
 }
 
 static
@@ -90,60 +89,99 @@ explode(int row, int col)
 {
     chtype bold;
     erase();
-    mvprintw(row, col, "-");
+    MvPrintw(row, col, "-");
     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(AttrArg(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);
-    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(AttrArg(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);
-    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(AttrArg(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);
-    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(AttrArg(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);
-    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(AttrArg(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();
 }
 
+static void
+usage(void)
+{
+    static const char *msg[] =
+    {
+	"Usage: firework [options]"
+	,""
+	,"Options:"
+#if HAVE_USE_DEFAULT_COLORS
+	," -d       invoke use_default_colors, repeat to use in init_pair"
+#endif
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(EXIT_FAILURE);
+}
+
 int
-main(
-	int argc GCC_UNUSED,
-	char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
-    int start, end, row, diff, flag = 0, direction;
+    int ch;
+    int start, end;
+    int row, diff;
+    int flag = 0;
+    int direction;
     unsigned seed;
+#if HAVE_USE_DEFAULT_COLORS
+    bool d_option = FALSE;
+#endif
+
+    while ((ch = getopt(argc, argv, "d")) != -1) {
+	switch (ch) {
+#if HAVE_USE_DEFAULT_COLORS
+	case 'd':
+	    d_option = TRUE;
+	    break;
+#endif
+	default:
+	    usage();
+	}
+    }
+    if (optind < argc)
+	usage();
 
     CATCHALL(onsig);
 
@@ -156,13 +194,13 @@ main(
     if (has_colors()) {
 	start_color();
 #if HAVE_USE_DEFAULT_COLORS
-	if (use_default_colors() == OK)
+	if (d_option && (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 {
@@ -173,9 +211,9 @@ main(
 	    direction = (start > end) ? -1 : 1;
 	    diff = abs(start - end);
 	} while (diff < 2 || diff >= LINES - 2);
-	attrset(A_NORMAL);
-	for (row = 0; row < diff; row++) {
-	    mvprintw(LINES - row, start + (row * direction),
+	(void) attrset(AttrArg(0, A_NORMAL));
+	for (row = 1; row < diff; row++) {
+	    MvPrintw(LINES - row, start + (row * direction),
 		     (direction < 0) ? "\\" : "/");
 	    if (flag++) {
 		showit();
@@ -187,7 +225,7 @@ main(
 	    showit();
 	    flag = 0;
 	}
-	seed = time((time_t *) 0);
+	seed = (unsigned) time((time_t *) 0);
 	srand(seed);
 	explode(LINES - row, start + (diff * direction));
 	erase();