X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffirework.c;h=9fb236bf806d65014b5773e133875cadd8b13ec6;hp=ba5cbda2f7d464e7b45001388dece277a012a558;hb=31418a0e4a6f75ceffc9fee20ddbe390209a4ef4;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34 diff --git a/test/firework.c b/test/firework.c index ba5cbda2..9fb236bf 100644 --- a/test/firework.c +++ b/test/firework.c @@ -1,25 +1,50 @@ +/**************************************************************************** + * 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 * + * "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.16 1999/11/13 23:39:16 tom Exp $ + * $Id: firework.c,v 1.35 2017/09/30 15:42:24 tom Exp $ */ #include -#include #include -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(); - exit(EXIT_FAILURE); + ExitProgram(EXIT_FAILURE); } static void @@ -35,7 +60,7 @@ showit(void) #endif if (ch == 'q') { cleanup(); - exit(EXIT_SUCCESS); + ExitProgram(EXIT_SUCCESS); } else if (ch == 's') { nodelay(stdscr, FALSE); } else if (ch == ' ') { @@ -44,9 +69,8 @@ showit(void) } } -static -int -get_colour(chtype * bold) +static short +get_colour(chtype *bold) { int attr; attr = (rand() % 16) + 1; @@ -56,7 +80,7 @@ get_colour(chtype * bold) *bold = A_BOLD; attr &= 7; } - return (attr); + return (short) (attr); } static @@ -65,67 +89,101 @@ 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 j; - 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 - for (j = SIGHUP; j <= SIGTERM; j++) - if (signal(j, SIG_IGN) != SIG_IGN) - signal(j, onsig); + 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(); - initscr(); + InitAndCatch(initscr(), onsig); noecho(); cbreak(); keypad(stdscr, TRUE); @@ -133,14 +191,14 @@ main( if (has_colors()) { start_color(); -#ifdef HAVE_USE_DEFAULT_COLORS - if (use_default_colors() == OK) +#if HAVE_USE_DEFAULT_COLORS + 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 { @@ -151,10 +209,10 @@ 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), - (direction < 0) ? "\\" : "/"); + (void) attrset(AttrArg(0, A_NORMAL)); + for (row = 1; row < diff; row++) { + MvPrintw(LINES - row, start + (row * direction), + (direction < 0) ? "\\" : "/"); if (flag++) { showit(); erase(); @@ -165,7 +223,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();