X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fhanoi.c;h=7447ae2cca875522b5d91bfa2324c0ad46e01e01;hp=16049155295b391ff1eb81e5e69b1def38dd1ed5;hb=0948e2c7ac34642a1f8a3a85000933bcbb258cff;hpb=92e187a3459ab7ce1613a3684ca6642447c73620 diff --git a/test/hanoi.c b/test/hanoi.c index 16049155..7447ae2c 100644 --- a/test/hanoi.c +++ b/test/hanoi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * 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 * @@ -41,10 +41,11 @@ * * Date: 05.Nov.90 * - * \$Id: hanoi.c,v 1.29 2010/05/01 19:12:26 tom Exp \$ + * \$Id: hanoi.c,v 1.36 2014/08/02 17:24:07 tom Exp \$ */ #include +#include #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,10 +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); @@ -95,7 +101,7 @@ static int InvalidMove(int From, int To); int main(int argc, char **argv) { - int NTiles, FromCol, ToCol; + 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 { @@ -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; @@ -228,7 +231,7 @@ DisplayTiles(void) 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); + MvPrintw(19, 5, "Moves : %d of %.0f", NMoves, pow(2.0, (float) NTiles) - 1); (void) attrset(A_REVERSE); MvAddStr(BASELINE, 8, " "); @@ -246,16 +249,16 @@ DisplayTiles(void) /* Draw tiles */ for (peg = 0; peg < NPEGS; peg++) { for (SlotNo = 0; SlotNo < Pegs[peg].Count; SlotNo++) { - unsigned len = Pegs[peg].Length[SlotNo]; - if (len < sizeof(TileBuf) - 1 && len < (unsigned) PegPos[peg]) { + 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(COLOR_PAIR(LENTOIND(len))); + (void) attrset(AttrArg(COLOR_PAIR(LENTOIND(len)), 0)); else (void) attrset(A_REVERSE); MvAddStr(BASELINE - (SlotNo + 1), - (int) (PegPos[peg] - len / 2), + (PegPos[peg] - (int) len / 2), TileBuf); } } @@ -306,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