X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffirework.c;h=6d35d501545fe29f8ad7bac95cb89522ec4879ee;hp=70099fb89278fe840b017334f89942ba3a4a8ce4;hb=690589d8f19e38925db061296d4f704e4a965bb2;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8 diff --git a/test/firework.c b/test/firework.c index 70099fb8..6d35d501 100644 --- a/test/firework.c +++ b/test/firework.c @@ -1,11 +1,38 @@ +/**************************************************************************** + * Copyright (c) 1998-2013,2014 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.21 2005/05/28 21:39:04 tom Exp $ + * $Id: firework.c,v 1.30 2014/08/02 17:24:07 tom Exp $ */ #include #include -static int my_bg = COLOR_BLACK; +static short my_bg = COLOR_BLACK; static void cleanup(void) @@ -14,7 +41,7 @@ cleanup(void) endwin(); } -static RETSIGTYPE +static void onsig(int n GCC_UNUSED) { cleanup(); @@ -43,9 +70,8 @@ showit(void) } } -static -int -get_colour(chtype * bold) +static short +get_colour(chtype *bold) { int attr; attr = (rand() % 16) + 1; @@ -55,7 +81,7 @@ get_colour(chtype * bold) *bold = A_BOLD; attr &= 7; } - return (attr); + return (short) (attr); } static @@ -64,50 +90,50 @@ 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(); } @@ -116,13 +142,10 @@ main( int argc GCC_UNUSED, char *argv[]GCC_UNUSED) { - int j; 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(); @@ -139,7 +162,7 @@ main( } curs_set(0); - seed = time((time_t *) 0); + seed = (unsigned) time((time_t *) 0); srand(seed); for (;;) { do { @@ -150,9 +173,9 @@ main( direction = (start > end) ? -1 : 1; diff = abs(start - end); } while (diff < 2 || diff >= LINES - 2); - attrset(A_NORMAL); + (void) attrset(AttrArg(0, A_NORMAL)); for (row = 0; row < diff; row++) { - mvprintw(LINES - row, start + (row * direction), + MvPrintw(LINES - row, start + (row * direction), (direction < 0) ? "\\" : "/"); if (flag++) { showit(); @@ -164,7 +187,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();