/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * 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 *
* authorization. *
****************************************************************************/
/*
- * $Id: firework.c,v 1.26 2010/05/01 19:12:26 tom Exp $
+ * $Id: firework.c,v 1.30 2014/08/02 17:24:07 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)
endwin();
}
-static RETSIGTYPE
+static void
onsig(int n GCC_UNUSED)
{
cleanup();
}
}
-static int
+static short
get_colour(chtype *bold)
{
int attr;
*bold = A_BOLD;
attr &= 7;
}
- return (attr);
+ return (short) (attr);
}
static
showit();
init_pair(1, get_colour(&bold), my_bg);
- (void) attrset(COLOR_PAIR(1) | bold);
+ (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);
- (void) attrset(COLOR_PAIR(1) | bold);
+ (void) attrset(AttrArg(COLOR_PAIR(1), bold));
MvPrintw(row - 2, col - 2, " --- ");
MvPrintw(row - 1, col - 2, "-+++-");
MvPrintw(row + 0, col - 2, "-+#+-");
showit();
init_pair(1, get_colour(&bold), my_bg);
- (void) attrset(COLOR_PAIR(1) | bold);
+ (void) attrset(AttrArg(COLOR_PAIR(1), bold));
MvPrintw(row - 2, col - 2, " +++ ");
MvPrintw(row - 1, col - 2, "++#++");
MvPrintw(row + 0, col - 2, "+# #+");
showit();
init_pair(1, get_colour(&bold), my_bg);
- (void) attrset(COLOR_PAIR(1) | bold);
+ (void) attrset(AttrArg(COLOR_PAIR(1), bold));
MvPrintw(row - 2, col - 2, " # ");
MvPrintw(row - 1, col - 2, "## ##");
MvPrintw(row + 0, col - 2, "# #");
showit();
init_pair(1, get_colour(&bold), my_bg);
- (void) attrset(COLOR_PAIR(1) | bold);
+ (void) attrset(AttrArg(COLOR_PAIR(1), bold));
MvPrintw(row - 2, col - 2, " # # ");
MvPrintw(row - 1, col - 2, "# #");
MvPrintw(row + 0, col - 2, " ");
}
curs_set(0);
- seed = time((time_t *) 0);
+ seed = (unsigned) time((time_t *) 0);
srand(seed);
for (;;) {
do {
direction = (start > end) ? -1 : 1;
diff = abs(start - end);
} while (diff < 2 || diff >= LINES - 2);
- (void) attrset(A_NORMAL);
+ (void) attrset(AttrArg(0, A_NORMAL));
for (row = 0; row < diff; row++) {
MvPrintw(LINES - row, start + (row * direction),
(direction < 0) ? "\\" : "/");
showit();
flag = 0;
}
- seed = time((time_t *) 0);
+ seed = (unsigned) time((time_t *) 0);
srand(seed);
explode(LINES - row, start + (diff * direction));
erase();