X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gnushogi%2Frawdsp.c;h=b0e40840d8ed9e426d7406ba5433cd138a1dc9db;hb=2e0ba7d65fd8be45d46122e07ca246a762e1edb6;hp=bfbc7d206de24437185b6044f47080098a9eb8f7;hpb=8ae7e7d1b257ef36d8a9fd1cd88807954ef10764;p=gnushogi.git
diff --git a/gnushogi/rawdsp.c b/gnushogi/rawdsp.c
index bfbc7d2..b0e4084 100644
--- a/gnushogi/rawdsp.c
+++ b/gnushogi/rawdsp.c
@@ -4,6 +4,7 @@
* ----------------------------------------------------------------------
* Copyright (c) 1993, 1994, 1995 Matthias Mutz
* Copyright (c) 1999 Michael Vanier and the Free Software Foundation
+ * Copyright (c) 2008, 2013, 2014 Yann Dirson and the Free Software Foundation
*
* GNU SHOGI is based on GNU CHESS
*
@@ -14,8 +15,8 @@
*
* GNU Shogi is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 1, or (at your option) any
- * later version.
+ * Free Software Foundation; either version 3 of the License,
+ * or (at your option) any later version.
*
* GNU Shogi is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -23,17 +24,22 @@
* for more details.
*
* You should have received a copy of the GNU General Public License along
- * with GNU Shogi; see the file COPYING. If not, write to the Free
- * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * with GNU Shogi; see the file COPYING. If not, see
+ * .
* ----------------------------------------------------------------------
*
*/
#include
#include
+#include
#include
#include
#include
+#ifndef WIN32
+#include
+#include
+#endif
#include "gnushogi.h"
#include "rawdsp.h"
@@ -59,14 +65,12 @@ Raw_ClearScreen(void)
}
-/* FIXME: change to ShowPrompt? */
void
-PromptForMove(void)
+Raw_ShowPrompt(void)
{
if (!barebones && !XSHOGI)
{
- /* printf("\nYour move is? "); */
- printf(CP[124]);
+ fputs("\nYour move is? ", stdout);
}
}
@@ -82,7 +86,7 @@ Raw_ShowDepth(char ch)
{
if (!barebones && !XSHOGI)
{
- printf(CP[53], Sdepth, ch); /* Depth = %d%c */
+ printf("Depth= %d%c ", Sdepth, ch);
printf("\n");
}
}
@@ -123,6 +127,48 @@ Raw_ShowMessage(char *s)
void
+Raw_AlwaysShowMessage(const char *format, va_list ap)
+{
+ vprintf(format, ap);
+ printf("\n");
+}
+
+
+void
+Raw_Printf(const char *format, va_list ap)
+{
+ vprintf(format, ap);
+}
+
+
+void
+Raw_doRequestInputString(const char* fmt, char* buffer)
+{
+ scanf(fmt, buffer);
+}
+
+
+int
+Raw_GetString(char* sx)
+{
+ int eof = 0;
+ sx[0] = '\0';
+
+ while(!eof && !sx[0])
+ eof = (fgets(sx, 80, stdin) == NULL);
+ return eof;
+}
+
+
+void
+Raw_ShowNodeCnt(long NodeCnt)
+{
+ printf("Nodes = %ld Nodes/sec = %ld\n",
+ NodeCnt, (((et) ? ((NodeCnt * 100) / et) : 0)));
+}
+
+
+void
Raw_ShowPatternCount(short side, short n)
{
if (flag.post)
@@ -167,7 +213,6 @@ Raw_ShowStage(void)
* End of trivial output routines.
****************************************/
-
void
Raw_Initialize(void)
{
@@ -175,16 +220,21 @@ Raw_Initialize(void)
if (XSHOGI)
{
-#ifdef HAVE_SETLINEBUF
- setlinebuf(stdout);
+#ifdef WIN32
+ /* needed because of inconsistency between MSVC run-time system and gcc includes */
+ setbuf(stdout, NULL);
#else
-# ifdef HAVE_SETVBUF
+#ifdef HAVE_SETVBUF
setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
+#else
+# ifdef HAVE_SETLINEBUF
+ setlinebuf(stdout);
# else
-# error "Need setlinebuf() or setvbuf() to compile gnushogi!"
+# error "Need setvbuf() or setlinebuf() to compile gnushogi!"
# endif
#endif
- printf("GNU Shogi %sp%s\n", version, patchlevel);
+#endif
+ printf("GNU Shogi %s\n", PACKAGE_VERSION);
}
if (hard_time_limit)
@@ -195,7 +245,6 @@ Raw_Initialize(void)
}
-
void
Raw_ExitShogi(void)
{
@@ -204,6 +253,8 @@ Raw_ExitShogi(void)
if (!nolist)
ListGame();
+
+ exit(0);
}
@@ -212,15 +263,14 @@ Raw_Die(int sig)
{
char s[80];
- Raw_ShowMessage(CP[31]); /* Abort? */
+ Raw_ShowMessage("Abort? ");
scanf("%s", s);
- if (strcmp(s, CP[210]) == 0) /* yes */
+ if (strcmp(s, "yes") == 0)
Raw_ExitShogi();
}
-
void
Raw_TerminateSearch(int sig)
{
@@ -235,96 +285,53 @@ Raw_TerminateSearch(int sig)
}
-
void
Raw_help(void)
{
Raw_ClearScreen();
- /* printf("SHOGI command summary\n"); */
- printf(CP[40]);
+ printf("GNU Shogi %s command summary\n", PACKAGE_VERSION);
printf("----------------------------------"
"------------------------------\n");
- /* printf("7g7f move from 7g to 7f quit
- * Exit Shogi\n"); */
- printf(CP[158]);
- /* printf("S6h move silver to 6h beep
- * turn %s\n", (flag.beep) ? "off" : "on"); */
- printf(CP[86], (flag.beep) ? CP[92] : CP[93]);
- /* printf("2d2c+ move from 2d to 2c and promote\n"); */
- printf(CP[128], (flag.material) ? CP[92] : CP[93]);
- /* printf("P*5e drop pawn to 5e easy
- * turn %s\n", (flag.easy) ? "off" : "on"); */
- printf(CP[173], (flag.easy) ? CP[92] : CP[93]);
- /* printf(" hash
- * turn %s\n", (flag.hash) ? "off" : "on"); */
- printf(CP[174], (flag.hash) ? CP[92] : CP[93]);
- /* printf("bd redraw board reverse
- * board display\n"); */
- printf(CP[130]);
- /* printf("list game to shogi.lst book
- * turn %s used %d of %d\n", (Book) ? "off" : "on", bookcount); */
- printf(CP[170], (Book) ? CP[92] : CP[93], bookcount, booksize);
- /* printf("undo undo last ply remove
- * take back a move\n"); */
- printf(CP[200]);
- /* printf("edit edit board force
- * enter game moves\n"); */
- printf(CP[153]);
- /* printf("switch sides with computer both
- * computer match\n"); */
- printf(CP[194]);
- /* printf("black computer plays black white
- * computer plays white\n"); */
- printf(CP[202]);
- /* printf("depth set search depth clock
- * set time control\n"); */
- printf(CP[149]);
- /* printf("post principle variation hint
- * suggest a move\n"); */
- printf(CP[177]);
- /* printf("save game to file get
- * game from file\n"); */
- printf(CP[188]);
+ fputs ("7g7f move from 7g to 7f quit Exit Shogi\n", stdout);
+ printf("S6h move silver to 6h beep turn %s\n", (flag.beep) ? "OFF" : "ON");
+ printf("2d2c+ move to 2c and promote material turn %s\n", (flag.material) ? "OFF" : "ON");
+ printf("P*5e drop pawn to 5e easy turn %s\n", (flag.easy) ? "OFF" : "ON");
+ printf("tsume toggle tsume mode hash turn %s\n", (flag.hash) ? "OFF" : "ON");
+ fputs ("bd redraw board reverse board display\n", stdout);
+ printf("list game to shogi.lst book turn %s used %d of %d\n", (Book) ? "OFF" : "ON", bookcount, booksize);
+ fputs ("undo undo last ply remove take back a move\n", stdout);
+ fputs ("edit edit board force toggle manual move mode\n", stdout);
+ fputs ("switch sides with computer both computer match\n", stdout);
+ fputs ("black computer plays black white computer plays white\n", stdout);
+ fputs ("depth set search depth clock set time control\n", stdout);
+ fputs ("post principle variation hint suggest a move\n", stdout);
+ fputs ("save game to file get game from file\n", stdout);
printf("xsave pos. to xshogi file xget"
" pos. from xshogi file\n");
- /* printf("random randomize play new
- * start new game\n"); */
- printf(CP[181]);
+ fputs("random randomize play new start new game\n", stdout);
printf("--------------------------------"
"--------------------------------\n");
- /* printf("Computer: %-12s Opponent: %s\n", */
- printf(CP[46],
+ printf("Computer: %-12s Opponent: %s\n",
ColorStr[computer], ColorStr[opponent]);
- /* printf("Depth: %-12d Response time: %d sec\n", */
- printf(CP[51],
+ printf("Depth: %-12d Response time: %d sec\n",
MaxSearchDepth, MaxResponseTime/100);
- /* printf("Random: %-12s Easy mode: %s\n", */
- printf(CP[99],
- (dither) ? CP[93] : CP[92], (flag.easy) ? CP[93] : CP[92]);
- /* printf("Beep: %-12s Transposition file: %s\n", */
- printf(CP[36],
- (flag.beep) ? CP[93] : CP[92], (flag.hash) ? CP[93] : CP[92]);
- /* printf("Tsume: %-12s Force: %s\n")*/
- printf(CP[232],
- (flag.tsume) ? CP[93] : CP[92], (flag.force) ? CP[93] : CP[92]);
- /* printf("Time Control %s %d moves %d seconds %d opr %d
- * depth\n", (TCflag) ? "ON" : "OFF", */
- printf(CP[110],
- (TCflag) ? CP[93] : CP[92],
+ printf("Random: %-12s Easy mode: %s\n",
+ (dither) ? "ON" : "OFF", (flag.easy) ? "ON" : "OFF");
+ printf("Beep: %-12s Transposition file: %s\n",
+ (flag.beep) ? "ON" : "OFF", (flag.hash) ? "ON" : "OFF");
+ printf("Tsume: %-12s Force: %s\n",
+ (flag.tsume) ? "ON" : "OFF", (flag.force) ? "ON" : "OFF");
+ printf("Time Control %s %d moves %d sec %d add %d depth\n",
+ (TCflag) ? "ON" : "OFF",
TimeControl.moves[black], TimeControl.clock[black] / 100,
TCadd/100, MaxSearchDepth);
-
- signal(SIGINT, Raw_TerminateSearch);
- signal(SIGQUIT, Raw_TerminateSearch);
}
-
/*
* Set up a board position. Pieces are entered by typing the piece followed
* by the location. For example, Nf3 will place a knight on square f3.
*/
-
void
Raw_EditBoard(void)
{
@@ -335,14 +342,10 @@ Raw_EditBoard(void)
Book = BOOKFAIL;
Raw_ClearScreen();
Raw_UpdateDisplay(0, 0, 1, 0);
- /* printf(". exit to main\n"); */
- printf(CP[29]);
- /* printf("# clear board\n"); */
- printf(CP[28]);
- /* printf("c change sides\n"); */
- printf(CP[136]);
- /* printf("enter piece & location: \n"); */
- printf(CP[155]);
+ fputs(". Exit to main\n", stdout);
+ fputs("# Clear board\n", stdout);
+ fputs("c Change sides\n", stdout);
+ fputs("enter piece & location: \n", stdout);
a = black;
@@ -351,7 +354,7 @@ Raw_EditBoard(void)
scanf("%s", s);
found = 0;
- if (s[0] == CP[28][0]) /*#*/
+ if (s[0] == '#')
{
for (sq = 0; sq < NO_SQUARES; sq++)
{
@@ -362,7 +365,7 @@ Raw_EditBoard(void)
ClearCaptured();
}
- if (s[0] == CP[136][0]) /*c*/
+ if (s[0] == 'c')
a = otherside[a];
if (s[1] == '*')
@@ -382,8 +385,8 @@ Raw_EditBoard(void)
}
else
{
- c = '9' - s[1];
- r = 'i' - s[2];
+ c = COL_NAME(s[1]);
+ r = ROW_NAME(s[2]);
}
if ((c >= 0) && (c < NO_COLS) && (r >= 0) && (r < NO_ROWS))
@@ -410,7 +413,7 @@ Raw_EditBoard(void)
color[sq] = neutral;
}
}
- while (s[0] != CP[29][0]);
+ while (s[0] != '.');
for (sq = 0; sq < NO_SQUARES; sq++)
Mvboard[sq] = ((board[sq] != Stboard[sq]) ? 10 : 0);
@@ -425,16 +428,13 @@ Raw_EditBoard(void)
}
-
-
/*
* Set up a board position.
* Nine lines of nine characters are used to setup the board. 9a-1a is the
* first line. White pieces are represented by uppercase characters.
*/
-
void
-SetupBoard(void)
+Raw_SetupBoard(void)
{
short r, c, sq, i;
char ch;
@@ -479,33 +479,28 @@ SetupBoard(void)
InitializeStats();
Raw_ClearScreen();
Raw_UpdateDisplay(0, 0, 1, 0);
- /* printf("Setup successful\n"); */
- printf(CP[106]);
+ fputs("Setup successful\n", stdout);
}
void
Raw_SearchStartStuff(short side)
{
- signal(SIGINT, Raw_TerminateSearch);
- signal(SIGQUIT, Raw_TerminateSearch);
-
if (flag.post)
{
- printf(CP[123],
+ printf("\nMove# %d Target = %ld Clock: %ld\n",
GameCnt/2 + 1,
ResponseTime, TimeControl.clock[side]);
}
}
-
void
Raw_OutputMove(void)
{
if (flag.illegal)
{
- printf("%s\n", CP[225]);
+ printf("Illegal position.\n");
return;
}
@@ -546,15 +541,11 @@ Raw_OutputMove(void)
t = (l + h) >> 1;
}
- /* printf("Nodes %ld Tree %d Eval %ld
- * Rate %ld RS high %ld low %ld\n", */
- printf(CP[89], GenCnt, NodeCnt, t, EvalNodes,
+ printf("Gen %ld Node %ld Tree %d Eval %ld Rate %ld EC %d/%d RS hi %ld lo %ld \n", GenCnt, NodeCnt, t, EvalNodes,
(et > 100) ? (NodeCnt / (et / 100)) : 0,
EADD, EGET, reminus, replus);
- /* printf("Hin/Hout/Coll/Fin/Fout =
- * %ld/%ld/%ld/%ld/%ld\n", */
- printf(CP[71],
+ printf("Hin/Hout/Tcol/Coll/Fin/Fout = %ld/%ld/%ld/%ld/%ld/%ld\n",
HashAdd, HashCnt, THashCol, HashCol, FHashCnt, FHashAdd);
}
@@ -562,8 +553,7 @@ Raw_OutputMove(void)
if (!XSHOGI)
{
- /* printf("My move is: %s\n", mvstr[0]); */
- printf(CP[83], mvstr[0]);
+ printf("My move is: %5s\n", mvstr[0]);
if (flag.beep)
printf("%c", 7);
@@ -572,8 +562,7 @@ Raw_OutputMove(void)
summary:
if (root->flags & draw)
{
- /* printf("Drawn game!\n"); */
- printf(CP[57]);
+ fputs("Drawn game!\n", stdout);
}
else if (root->score == -(SCORE_LIMIT + 999))
{
@@ -599,6 +588,12 @@ Raw_OutputMove(void)
void
+Raw_UpdateClocks(void)
+{
+}
+
+
+void
Raw_UpdateDisplay(short f, short t, short redraw, short isspec)
{
@@ -611,8 +606,7 @@ Raw_UpdateDisplay(short f, short t, short redraw, short isspec)
c = (short)((TimeControl.clock[black] % 6000) / 100);
l = (short)(TimeControl.clock[white] / 6000);
m = (short)((TimeControl.clock[white] % 6000) / 100);
- /* printf("Black %d:%02d White %d:%02d\n", r, c, l, m); */
- printf(CP[116], r, c, l, m);
+ printf("Black %d:%02d White %d:%02d\n", r, c, l, m);
printf("\n");
for (r = (NO_ROWS - 1); r >= 0; r--)
@@ -658,7 +652,6 @@ Raw_UpdateDisplay(short f, short t, short redraw, short isspec)
}
-
void
Raw_ChangeAlphaWindow(void)
{
@@ -669,7 +662,6 @@ Raw_ChangeAlphaWindow(void)
}
-
void
Raw_ChangeBetaWindow(void)
{
@@ -680,31 +672,29 @@ Raw_ChangeBetaWindow(void)
}
-
void
Raw_GiveHint(void)
{
if (hint)
{
algbr((short) (hint >> 8), (short) (hint & 0xFF), false);
- printf(CP[72], mvstr[0]); /*hint*/
+ printf("Hint: %s\n", mvstr[0]);
}
else
- printf(CP[223]);
+ fputs("I have no idea.\n", stdout);
}
-
void
Raw_SelectLevel(char *sx)
{
char T[NO_SQUARES + 1], *p, *q;
- if ((p = strstr(sx, CP[169])) != NULL)
- p += strlen(CP[169]);
- else if ((p = strstr(sx, CP[217])) != NULL)
- p += strlen(CP[217]);
+ if ((p = strstr(sx, "level")) != NULL)
+ p += strlen("level");
+ else if ((p = strstr(sx, "clock")) != NULL)
+ p += strlen("clock");
strcat(sx, "XX");
q = T;
@@ -717,7 +707,7 @@ Raw_SelectLevel(char *sx)
/* line empty ask for input */
if (!T[0])
{
- printf(CP[61]);
+ fputs("Enter #moves #minutes: ", stdout);
fgets(T, NO_SQUARES + 1, stdin);
strcat(T, "XX");
}
@@ -748,7 +738,7 @@ Raw_SelectLevel(char *sx)
TCseconds = 0;
#ifdef OPERATORTIME
- printf(CP[94]);
+ fputs("Operator time (hundredths) = ", stdout);
scanf("%hd", &OperatorTime);
#endif
@@ -777,8 +767,6 @@ Raw_SelectLevel(char *sx)
}
-
-
void
Raw_ChangeSearchDepth(void)
{
@@ -788,8 +776,6 @@ Raw_ChangeSearchDepth(void)
}
-
-
void
Raw_ChangeHashDepth(void)
{
@@ -800,7 +786,6 @@ Raw_ChangeHashDepth(void)
}
-
void
Raw_SetContempt(void)
{
@@ -809,7 +794,6 @@ Raw_SetContempt(void)
}
-
void
Raw_ChangeXwindow(void)
{
@@ -822,7 +806,6 @@ Raw_ChangeXwindow(void)
* Raw_ShowPostnValue(short sq)
* must have called ExaminePosition() first
*/
-
void
Raw_ShowPostnValue(short sq)
{
@@ -844,7 +827,6 @@ Raw_ShowPostnValue(short sq)
}
-
void
Raw_DoDebug(void)
{
@@ -852,14 +834,14 @@ Raw_DoDebug(void)
char s[40];
ExaminePosition(opponent);
- Raw_ShowMessage(CP[65]);
+ Raw_ShowMessage("Enter piece: ");
scanf("%s", s);
c = neutral;
- if ((s[0] == CP[9][0]) || (s[0] == CP[9][1])) /* w W */
+ if ((s[0] == 'b') || (s[0] == 'B'))
c = black;
- if ((s[0] == CP[9][2]) || (s[0] == CP[9][3])) /* b B */
+ if ((s[0] == 'w') || (s[0] == 'W'))
c = white;
for (p = king; p > no_piece; p--)
@@ -917,13 +899,12 @@ Raw_DoDebug(void)
}
printf("stage = %d\n", stage);
- printf(CP[103], score,
+ printf("S%d m%d ps%d gt%c m%d ps%d gt%c", score,
mtl[computer], pscore[computer], GameType[computer],
mtl[opponent], pscore[opponent], GameType[opponent]);
}
-
void
Raw_DoTable(short table[NO_SQUARES])
{
@@ -943,7 +924,6 @@ Raw_DoTable(short table[NO_SQUARES])
}
-
void
Raw_ShowPostnValues(void)
{
@@ -962,9 +942,32 @@ Raw_ShowPostnValues(void)
}
score = ScorePosition(opponent);
- printf(CP[103], score,
+ printf("S%d m%d ps%d gt%c m%d ps%d gt%c", score,
mtl[computer], pscore[computer], GameType[computer],
mtl[opponent], pscore[opponent], GameType[opponent]);
printf("\nhung black %d hung white %d\n", hung[black], hung[white]);
}
+
+void
+Raw_PollForInput(void)
+{
+#ifdef WIN32
+ DWORD cnt;
+ if (!PeekNamedPipe(GetStdHandle(STD_INPUT_HANDLE), NULL, 0, NULL, &cnt, NULL))
+ cnt = 1;
+#else
+ static struct pollfd pollfds[1] = { /* [0] = */ { /* .fd = */ STDIN_FILENO,
+ /* .events = */ POLLIN } };
+ int cnt = poll(pollfds, sizeof(pollfds)/sizeof(pollfds[0]), 0);
+ if (cnt < 0) {
+ perror("polling standard input");
+ ExitShogi();
+ }
+#endif
+ if (cnt) { /* if anything to read, or error occured */
+ if (!flag.timeout)
+ flag.back = true; /* previous: flag.timeout = true; */
+ flag.bothsides = false;
+ }
+}