ncurses 5.7 - patch 20081220

[ncurses.git] / test / hanoi.c

diff --git a/test/hanoi.c b/test/hanoi.c
index 0b032f8318cae2d51c9c220f788bae278b122963..bd0fb10e1f8e9a3aaca0067f3aca82357921ae4e 100644 (file)
--- a/test/hanoi.c
+++ b/test/hanoi.c
@@ -1,3 +1,30 @@
+/****************************************************************************
+ * Copyright (c) 1998-2006,2008 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,17 +41,15 @@
  *
  *     Date: 05.Nov.90
  *
- * $Id: hanoi.c,v 1.19 2000/09/02 18:51:16 tom Exp $
+ * $Id: hanoi.c,v 1.27 2008/08/04 10:57:59 tom Exp $
  */
 
 #include <test.priv.h>
 
-#include <string.h>
-
 #define NPEGS                  3       /* This is not configurable !! */
 #define MINTILES               3
 #define MAXTILES               9
-#define DEFAULTTILES   7
+#define DEFAULTTILES           7
 #define TOPLINE                        6
 #define BASELINE               16
 #define STATUSLINE             (LINES-3)
@@ -56,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);
@@ -70,7 +96,8 @@ int
 main(int argc, char **argv)
 {
     int NTiles, FromCol, ToCol;
-    unsigned char AutoFlag = 0;
+
+    setlocale(LC_ALL, "");
 
     switch (argc) {
     case 1:
@@ -80,24 +107,24 @@ main(int argc, char **argv)
        NTiles = atoi(argv[1]);
        if (NTiles > MAXTILES || NTiles < MINTILES) {
            fprintf(stderr, "Range %d to %d\n", MINTILES, MAXTILES);
-           return EXIT_FAILURE;
+           ExitProgram(EXIT_FAILURE);
        }
        break;
     case 3:
        if (strcmp(argv[2], "a")) {
            Usage();
-           return EXIT_FAILURE;
+           ExitProgram(EXIT_FAILURE);
        }
        NTiles = atoi(argv[1]);
        if (NTiles > MAXTILES || NTiles < MINTILES) {
            fprintf(stderr, "Range %d to %d\n", MINTILES, MAXTILES);
-           return EXIT_FAILURE;
+           ExitProgram(EXIT_FAILURE);
        }
        AutoFlag = TRUE;
        break;
     default:
        Usage();
-       return EXIT_FAILURE;
+       ExitProgram(EXIT_FAILURE);
     }
 #ifdef TRACE
     trace(TRACE_MAXIMUM);
@@ -118,7 +145,7 @@ main(int argc, char **argv)
     if (LINES < 24) {
        endwin();
        fprintf(stderr, "Min screen length 24 lines\n");
-       return EXIT_FAILURE;
+       ExitProgram(EXIT_FAILURE);
     }
     if (AutoFlag) {
        curs_set(0);
@@ -154,7 +181,7 @@ main(int argc, char **argv)
        }
     }
     endwin();
-    return EXIT_SUCCESS;
+    ExitProgram(EXIT_SUCCESS);
 }
 
 static int
@@ -219,15 +246,18 @@ DisplayTiles(void)
     /* 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())
+                   attrset(COLOR_PAIR(LENTOIND(len)));
+               else
+                   attrset(A_REVERSE);
+               mvaddstr(BASELINE - (SlotNo + 1),
+                        (int) (PegPos[peg] - len / 2),
+                        TileBuf);
+           }
        }
     }
     attrset(A_NORMAL);
@@ -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();
@@ -295,7 +326,7 @@ Solved(int NumTiles)
 }
 
 static void
-Usage()
+Usage(void)
 {
     fprintf(stderr, "Usage: hanoi [<No Of Tiles>] [a]\n");
     fprintf(stderr,