X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fhanoi.c;h=671c0cb47ed3ca2e76a11518e7cea05b4a1195f3;hp=45d6b97d2093f348629537c20120d6ec6c837416;hb=cf94c7485f7b40ff7870b5bf9a65e7ab87481a76;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01

diff --git a/test/hanoi.c b/test/hanoi.c
index 45d6b97d..671c0cb4 100644
--- a/test/hanoi.c
+++ b/test/hanoi.c
@@ -1,3 +1,30 @@
+/****************************************************************************
+ * Copyright (c) 1998-2008,2009 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.                                                           *
+ ****************************************************************************/
 /*
  *	Name: Towers of Hanoi.
  *
@@ -14,7 +41,7 @@
  *
  *	Date: 05.Nov.90
  *
- * $Id: hanoi.c,v 1.24 2002/06/29 23:32:18 tom Exp $
+ * $Id: hanoi.c,v 1.28 2009/08/29 19:02:25 tom Exp $
  */
 
 #include <test.priv.h>
@@ -54,6 +81,7 @@ static int TileColour[] =
     COLOR_RED,			/* Length 19 */
 };
 static int NMoves = 0;
+static bool AutoFlag = FALSE;
 
 static void InitTiles(int NTiles);
 static void DisplayTiles(void);
@@ -68,7 +96,6 @@ int
 main(int argc, char **argv)
 {
     int NTiles, FromCol, ToCol;
-    bool AutoFlag = 0;
 
     setlocale(LC_ALL, "");
 
@@ -202,7 +229,7 @@ DisplayTiles(void)
     mvaddstr(1, 24, "T O W E R S   O F   H A N O I");
     mvaddstr(3, 34, "SJR 1990");
     mvprintw(19, 5, "Moves : %d", NMoves);
-    attrset(A_REVERSE);
+    (void) attrset(A_REVERSE);
     mvaddstr(BASELINE, 8,
 	     "                                                               ");
 
@@ -214,23 +241,26 @@ DisplayTiles(void)
     mvaddch(BASELINE, LEFTPEG, '1');
     mvaddch(BASELINE, MIDPEG, '2');
     mvaddch(BASELINE, RIGHTPEG, '3');
-    attrset(A_NORMAL);
+    (void) attrset(A_NORMAL);
 
     /* Draw tiles */
     for (peg = 0; peg < NPEGS; peg++) {
 	for (SlotNo = 0; SlotNo < Pegs[peg].Count; SlotNo++) {
-	    memset(TileBuf, ' ', Pegs[peg].Length[SlotNo]);
-	    TileBuf[Pegs[peg].Length[SlotNo]] = '\0';
-	    if (has_colors())
-		attrset(COLOR_PAIR(LENTOIND(Pegs[peg].Length[SlotNo])));
-	    else
-		attrset(A_REVERSE);
-	    mvaddstr(BASELINE - (SlotNo + 1),
-		     (int) (PegPos[peg] - Pegs[peg].Length[SlotNo] / 2),
-		     TileBuf);
+	    unsigned len = Pegs[peg].Length[SlotNo];
+	    if (len < sizeof(TileBuf) - 1 && len < (unsigned) PegPos[peg]) {
+		memset(TileBuf, ' ', len);
+		TileBuf[len] = '\0';
+		if (has_colors())
+		    (void) attrset(COLOR_PAIR(LENTOIND(len)));
+		else
+		    (void) attrset(A_REVERSE);
+		mvaddstr(BASELINE - (SlotNo + 1),
+			 (int) (PegPos[peg] - len / 2),
+			 TileBuf);
+	    }
 	}
     }
-    attrset(A_NORMAL);
+    (void) attrset(A_NORMAL);
     refresh();
 }
 
@@ -251,7 +281,8 @@ GetMove(int *From, int *To)
 	return TRUE;
     *To -= ('0' + 1);
     refresh();
-    napms(500);
+    if (!AutoFlag)
+	napms(500);
 
     move(STATUSLINE, 0);
     clrtoeol();