X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Ffirework.c;h=62f4637b57470140ed34915c0aa52f7a59c45f45;hb=92e187a3459ab7ce1613a3684ca6642447c73620;hp=1337e97690cc21e7f941f665e0e4f2d63830803e;hpb=027ae42953e3186daed8f3882da73de48291b606;p=ncurses.git

diff --git a/test/firework.c b/test/firework.c
index 1337e976..62f4637b 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-2009,2010 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,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: firework.c,v 1.24 2006/05/20 15:36:08 tom Exp $
+ * $Id: firework.c,v 1.26 2010/05/01 19:12:26 tom Exp $
  */
 #include <test.priv.h>
 
@@ -90,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(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(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(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(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(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();
 }
 
@@ -173,9 +173,9 @@ main(
 	    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++) {
-	    mvprintw(LINES - row, start + (row * direction),
+	    MvPrintw(LINES - row, start + (row * direction),
 		     (direction < 0) ? "\\" : "/");
 	    if (flag++) {
 		showit();