ncurses 5.9 - patch 20140705

[ncurses.git] / test / hanoi.c

diff --git a/test/hanoi.c b/test/hanoi.c
index a763dce8eb2cec0f27042c4846788e3bc56dcc79..2262a5203bd073638cab1558266f80a660c5896d 100644 (file)
--- a/test/hanoi.c
+++ b/test/hanoi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2013 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            *
@@ -41,10 +41,11 @@
  *
  *     Date: 05.Nov.90
  *
- * $Id: hanoi.c,v 1.25 2006/04/22 22:41:22 tom Exp $
+ * $Id: hanoi.c,v 1.35 2013/09/28 22:02:17 tom Exp $
  */
 
 #include <test.priv.h>
+#include <math.h>
 
 #define NPEGS                  3       /* This is not configurable !! */
 #define MINTILES               3
@@ -57,7 +58,7 @@
 #define MIDPEG                 39
 #define RIGHTPEG               59
 
-#define LENTOIND(x)            (((x)-1)/2)
+#define LENTOIND(x)            (((int)(x)-1)/2)
 #define OTHER(a,b)             (3-((a)+(b)))
 
 struct Peg {
@@ -67,8 +68,12 @@ struct Peg {
 
 static struct Peg Pegs[NPEGS];
 static int PegPos[] =
-{LEFTPEG, MIDPEG, RIGHTPEG};
-static int TileColour[] =
+{
+    LEFTPEG,
+    MIDPEG,
+    RIGHTPEG
+};
+static short TileColour[] =
 {
     COLOR_GREEN,               /* Length 3 */
     COLOR_MAGENTA,             /* Length 5 */
@@ -80,9 +85,11 @@ static int TileColour[] =
     COLOR_MAGENTA,             /* Length 17 */
     COLOR_RED,                 /* Length 19 */
 };
+static int NTiles = 0;
 static int NMoves = 0;
+static bool AutoFlag = FALSE;
 
-static void InitTiles(int NTiles);
+static void InitTiles(void);
 static void DisplayTiles(void);
 static void MakeMove(int From, int To);
 static void AutoMove(int From, int To, int Num);
@@ -94,8 +101,7 @@ static int InvalidMove(int From, int To);
 int
 main(int argc, char **argv)
 {
-    int NTiles, FromCol, ToCol;
-    bool AutoFlag = 0;
+    int FromCol, ToCol;
 
     setlocale(LC_ALL, "");
 
@@ -126,20 +132,17 @@ main(int argc, char **argv)
        Usage();
        ExitProgram(EXIT_FAILURE);
     }
-#ifdef TRACE
-    trace(TRACE_MAXIMUM);
-#endif
     initscr();
     if (has_colors()) {
        int i;
-       int bg = COLOR_BLACK;
+       short bg = COLOR_BLACK;
        start_color();
 #if HAVE_USE_DEFAULT_COLORS
        if (use_default_colors() == OK)
            bg = -1;
 #endif
        for (i = 0; i < 9; i++)
-           init_pair(i + 1, bg, TileColour[i]);
+           init_pair((short) (i + 1), bg, TileColour[i]);
     }
     cbreak();
     if (LINES < 24) {
@@ -151,7 +154,7 @@ main(int argc, char **argv)
        curs_set(0);
        leaveok(stdscr, TRUE);  /* Attempt to remove cursor */
     }
-    InitTiles(NTiles);
+    InitTiles();
     DisplayTiles();
     if (AutoFlag) {
        do {
@@ -165,14 +168,14 @@ main(int argc, char **argv)
            if (GetMove(&FromCol, &ToCol))
                break;
            if (InvalidMove(FromCol, ToCol)) {
-               mvaddstr(STATUSLINE, 0, "Invalid Move !!");
+               MvAddStr(STATUSLINE, 0, "Invalid Move !!");
                refresh();
                beep();
                continue;
            }
            MakeMove(FromCol, ToCol);
            if (Solved(NTiles)) {
-               mvprintw(STATUSLINE, 0,
+               MvPrintw(STATUSLINE, 0,
                         "Well Done !! You did it in %d moves", NMoves);
                refresh();
                sleep(5);
@@ -207,12 +210,12 @@ InvalidMove(int From, int To)
 }
 
 static void
-InitTiles(int NTiles)
+InitTiles(void)
 {
     int Size, SlotNo;
 
     for (Size = NTiles * 2 + 1, SlotNo = 0; Size >= 3; Size -= 2)
-       Pegs[0].Length[SlotNo++] = Size;
+       Pegs[0].Length[SlotNo++] = (size_t) Size;
 
     Pegs[0].Count = NTiles;
     Pegs[1].Count = 0;
@@ -226,45 +229,48 @@ DisplayTiles(void)
     char TileBuf[BUFSIZ];
 
     erase();
-    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);
-    mvaddstr(BASELINE, 8,
+    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 of %.0f", NMoves, pow(2.0, (float) NTiles) - 1);
+    (void) attrset(A_REVERSE);
+    MvAddStr(BASELINE, 8,
             "                                                               ");
 
     for (Line = TOPLINE; Line < BASELINE; Line++) {
-       mvaddch(Line, LEFTPEG, ' ');
-       mvaddch(Line, MIDPEG, ' ');
-       mvaddch(Line, RIGHTPEG, ' ');
+       MvAddCh(Line, LEFTPEG, ' ');
+       MvAddCh(Line, MIDPEG, ' ');
+       MvAddCh(Line, RIGHTPEG, ' ');
     }
-    mvaddch(BASELINE, LEFTPEG, '1');
-    mvaddch(BASELINE, MIDPEG, '2');
-    mvaddch(BASELINE, RIGHTPEG, '3');
-    attrset(A_NORMAL);
+    MvAddCh(BASELINE, LEFTPEG, '1');
+    MvAddCh(BASELINE, MIDPEG, '2');
+    MvAddCh(BASELINE, RIGHTPEG, '3');
+    (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);
+           size_t len = Pegs[peg].Length[SlotNo];
+           if (len < sizeof(TileBuf) - 1 && len < (size_t) PegPos[peg]) {
+               memset(TileBuf, ' ', len);
+               TileBuf[len] = '\0';
+               if (has_colors())
+                   (void) attrset((attr_t) COLOR_PAIR(LENTOIND(len)));
+               else
+                   (void) attrset(A_REVERSE);
+               MvAddStr(BASELINE - (SlotNo + 1),
+                        (PegPos[peg] - (int) len / 2),
+                        TileBuf);
+           }
        }
     }
-    attrset(A_NORMAL);
+    (void) attrset(A_NORMAL);
     refresh();
 }
 
 static int
 GetMove(int *From, int *To)
 {
-    mvaddstr(STATUSLINE, 0, "Next move ('q' to quit) from ");
+    MvAddStr(STATUSLINE, 0, "Next move ('q' to quit) from ");
     clrtoeol();
     refresh();
     if ((*From = getch()) == 'q')
@@ -278,7 +284,8 @@ GetMove(int *From, int *To)
        return TRUE;
     *To -= ('0' + 1);
     refresh();
-    napms(500);
+    if (!AutoFlag)
+       napms(500);
 
     move(STATUSLINE, 0);
     clrtoeol();
@@ -302,12 +309,12 @@ AutoMove(int From, int To, int Num)
     if (Num == 1) {
        MakeMove(From, To);
        napms(500);
-       return;
+    } else {
+       AutoMove(From, OTHER(From, To), Num - 1);
+       MakeMove(From, To);
+       napms(500);
+       AutoMove(OTHER(From, To), To, Num - 1);
     }
-    AutoMove(From, OTHER(From, To), Num - 1);
-    MakeMove(From, To);
-    napms(500);
-    AutoMove(OTHER(From, To), To, Num - 1);
 }
 
 static int