ncurses 5.9 - patch 20140831

[ncurses.git] / test / hanoi.c

diff --git a/test/hanoi.c b/test/hanoi.c
index 0b032f8318cae2d51c9c220f788bae278b122963..7447ae2cca875522b5d91bfa2324c0ad46e01e01 100644 (file)
--- a/test/hanoi.c
+++ b/test/hanoi.c
@@ -1,3 +1,30 @@
+/****************************************************************************
+ * 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            *
+ * "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.
  *
 /*
  *     Name: Towers of Hanoi.
  *


@@ -14,17 +41,16 @@
  *
  *     Date: 05.Nov.90
  *
  *
  *     Date: 05.Nov.90
  *

- * $Id: hanoi.c,v 1.19 2000/09/02 18:51:16 tom Exp $
+ * $Id: hanoi.c,v 1.36 2014/08/02 17:24:07 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>

-
-#include <string.h>
+#include <math.h>

 
 #define NPEGS                  3       /* This is not configurable !! */
 #define MINTILES               3
 #define MAXTILES               9
 
 #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)
 #define TOPLINE                        6
 #define BASELINE               16
 #define STATUSLINE             (LINES-3)


@@ -32,7 +58,7 @@
 #define MIDPEG                 39
 #define RIGHTPEG               59
 
 #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 {
 #define OTHER(a,b)             (3-((a)+(b)))
 
 struct Peg {


@@ -42,8 +68,12 @@ struct Peg {
 
 static struct Peg Pegs[NPEGS];
 static int PegPos[] =
 
 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 */
 {
     COLOR_GREEN,               /* Length 3 */
     COLOR_MAGENTA,             /* Length 5 */


@@ -55,9 +85,11 @@ static int TileColour[] =
     COLOR_MAGENTA,             /* Length 17 */
     COLOR_RED,                 /* Length 19 */
 };
     COLOR_MAGENTA,             /* Length 17 */
     COLOR_RED,                 /* Length 19 */
 };

+static int NTiles = 0;

 static int NMoves = 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);
 static void DisplayTiles(void);
 static void MakeMove(int From, int To);
 static void AutoMove(int From, int To, int Num);


@@ -69,8 +101,9 @@ static int InvalidMove(int From, int To);
 int
 main(int argc, char **argv)
 {
 int
 main(int argc, char **argv)
 {

-    int NTiles, FromCol, ToCol;
-    unsigned char AutoFlag = 0;
+    int FromCol, ToCol;
+
+    setlocale(LC_ALL, "");

 
     switch (argc) {
     case 1:
 
     switch (argc) {
     case 1:


@@ -80,51 +113,48 @@ main(int argc, char **argv)
        NTiles = atoi(argv[1]);
        if (NTiles > MAXTILES || NTiles < MINTILES) {
            fprintf(stderr, "Range %d to %d\n", MINTILES, MAXTILES);
        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();
        }
        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);
        }
        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();
        }
        AutoFlag = TRUE;
        break;
     default:
        Usage();

-       return EXIT_FAILURE;
+       ExitProgram(EXIT_FAILURE);

     }
     }

-#ifdef TRACE
-    trace(TRACE_MAXIMUM);
-#endif

     initscr();
     if (has_colors()) {
        int i;
     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++)
        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) {
        endwin();
        fprintf(stderr, "Min screen length 24 lines\n");
     }
     cbreak();
     if (LINES < 24) {
        endwin();
        fprintf(stderr, "Min screen length 24 lines\n");

-       return EXIT_FAILURE;
+       ExitProgram(EXIT_FAILURE);

     }
     if (AutoFlag) {
        curs_set(0);
        leaveok(stdscr, TRUE);  /* Attempt to remove cursor */
     }
     }
     if (AutoFlag) {
        curs_set(0);
        leaveok(stdscr, TRUE);  /* Attempt to remove cursor */
     }

-    InitTiles(NTiles);
+    InitTiles();

     DisplayTiles();
     if (AutoFlag) {
        do {
     DisplayTiles();
     if (AutoFlag) {
        do {


@@ -138,14 +168,14 @@ main(int argc, char **argv)
            if (GetMove(&FromCol, &ToCol))
                break;
            if (InvalidMove(FromCol, ToCol)) {
            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)) {
                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);
                         "Well Done !! You did it in %d moves", NMoves);
                refresh();
                sleep(5);


@@ -154,7 +184,7 @@ main(int argc, char **argv)
        }
     }
     endwin();
        }
     }
     endwin();

-    return EXIT_SUCCESS;
+    ExitProgram(EXIT_SUCCESS);

 }
 
 static int
 }
 
 static int


@@ -180,12 +210,12 @@ InvalidMove(int From, int To)
 }
 
 static void
 }
 
 static void

-InitTiles(int NTiles)
+InitTiles(void)

 {
     int Size, SlotNo;
 
     for (Size = NTiles * 2 + 1, SlotNo = 0; Size >= 3; Size -= 2)
 {
     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;
 
     Pegs[0].Count = NTiles;
     Pegs[1].Count = 0;


@@ -199,45 +229,48 @@ DisplayTiles(void)
     char TileBuf[BUFSIZ];
 
     erase();
     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++) {
             "                                                               ");
 
     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++) {
 
     /* 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(AttrArg(COLOR_PAIR(LENTOIND(len)), 0));
+               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)
 {
     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')
     clrtoeol();
     refresh();
     if ((*From = getch()) == 'q')


@@ -251,7 +284,8 @@ GetMove(int *From, int *To)
        return TRUE;
     *To -= ('0' + 1);
     refresh();
        return TRUE;
     *To -= ('0' + 1);
     refresh();

-    napms(500);
+    if (!AutoFlag)
+       napms(500);

 
     move(STATUSLINE, 0);
     clrtoeol();
 
     move(STATUSLINE, 0);
     clrtoeol();


@@ -275,12 +309,12 @@ AutoMove(int From, int To, int Num)
     if (Num == 1) {
        MakeMove(From, To);
        napms(500);
     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
 }
 
 static int


@@ -295,7 +329,7 @@ Solved(int NumTiles)
 }
 
 static void
 }
 
 static void

-Usage()
+Usage(void)

 {
     fprintf(stderr, "Usage: hanoi [<No Of Tiles>] [a]\n");
     fprintf(stderr,
 {
     fprintf(stderr, "Usage: hanoi [<No Of Tiles>] [a]\n");
     fprintf(stderr,