X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gnushogi%2Frawdsp.c;h=e71877d4bbb903ee16e38ed234dfdc234c09faa7;hb=d23b84fee73518dfb6b281d1eaedbe4fc4aa34b2;hp=27e558ca70d0ddb23eb8f4368da9551b249e7e05;hpb=2bc8552c79240896ed28926580c9d8aebd5693fe;p=gnushogi.git diff --git a/gnushogi/rawdsp.c b/gnushogi/rawdsp.c index 27e558c..e71877d 100644 --- a/gnushogi/rawdsp.c +++ b/gnushogi/rawdsp.c @@ -31,9 +31,12 @@ #include #include +#include #include #include #include +#include +#include #include "gnushogi.h" #include "rawdsp.h" @@ -59,9 +62,8 @@ Raw_ClearScreen(void) } -/* FIXME: change to ShowPrompt? */ void -PromptForMove(void) +Raw_ShowPrompt(void) { if (!barebones && !XSHOGI) { @@ -123,6 +125,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(CP[91], + NodeCnt, (((et) ? ((NodeCnt * 100) / et) : 0))); +} + + +void Raw_ShowPatternCount(short side, short n) { if (flag.post) @@ -167,7 +211,6 @@ Raw_ShowStage(void) * End of trivial output routines. ****************************************/ - void Raw_Initialize(void) { @@ -195,7 +238,6 @@ Raw_Initialize(void) } - void Raw_ExitShogi(void) { @@ -222,7 +264,6 @@ Raw_Die(int sig) } - void Raw_TerminateSearch(int sig) { @@ -237,7 +278,6 @@ Raw_TerminateSearch(int sig) } - void Raw_help(void) { @@ -318,12 +358,10 @@ Raw_help(void) } - /* * 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) { @@ -424,16 +462,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; @@ -495,7 +530,6 @@ Raw_SearchStartStuff(short side) } - void Raw_OutputMove(void) { @@ -595,6 +629,12 @@ Raw_OutputMove(void) void +Raw_UpdateClocks(void) +{ +} + + +void Raw_UpdateDisplay(short f, short t, short redraw, short isspec) { @@ -654,7 +694,6 @@ Raw_UpdateDisplay(short f, short t, short redraw, short isspec) } - void Raw_ChangeAlphaWindow(void) { @@ -665,7 +704,6 @@ Raw_ChangeAlphaWindow(void) } - void Raw_ChangeBetaWindow(void) { @@ -676,7 +714,6 @@ Raw_ChangeBetaWindow(void) } - void Raw_GiveHint(void) { @@ -690,7 +727,6 @@ Raw_GiveHint(void) } - void Raw_SelectLevel(char *sx) { @@ -773,8 +809,6 @@ Raw_SelectLevel(char *sx) } - - void Raw_ChangeSearchDepth(void) { @@ -784,8 +818,6 @@ Raw_ChangeSearchDepth(void) } - - void Raw_ChangeHashDepth(void) { @@ -796,7 +828,6 @@ Raw_ChangeHashDepth(void) } - void Raw_SetContempt(void) { @@ -805,7 +836,6 @@ Raw_SetContempt(void) } - void Raw_ChangeXwindow(void) { @@ -818,7 +848,6 @@ Raw_ChangeXwindow(void) * Raw_ShowPostnValue(short sq) * must have called ExaminePosition() first */ - void Raw_ShowPostnValue(short sq) { @@ -840,7 +869,6 @@ Raw_ShowPostnValue(short sq) } - void Raw_DoDebug(void) { @@ -919,7 +947,6 @@ Raw_DoDebug(void) } - void Raw_DoTable(short table[NO_SQUARES]) { @@ -939,7 +966,6 @@ Raw_DoTable(short table[NO_SQUARES]) } - void Raw_ShowPostnValues(void) { @@ -963,3 +989,87 @@ Raw_ShowPostnValues(void) mtl[opponent], pscore[opponent], GameType[opponent]); printf("\nhung black %d hung white %d\n", hung[black], hung[white]); } + + +void +Raw_PollForInput(void) +{ + 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(); + } + if (cnt) { /* if anything to read, or error occured */ + if (!flag.timeout) + flag.back = true; /* previous: flag.timeout = true; */ + flag.bothsides = false; + } +} + + +/* + * Determine the time that has passed since the search was started. If the + * elapsed time exceeds the target(ResponseTime + ExtraTime) then set timeout + * to true which will terminate the search. + * iop = COMPUTE_MODE calculate et, bump ETnodes + * iop = COMPUTE_AND_INIT_MODE calculate et, set timeout if time exceeded, + * set reference time + */ +void +Raw_ElapsedTime(ElapsedTime_mode iop) +{ + long current_time; +#ifdef HAVE_GETTIMEOFDAY + struct timeval tv; +#endif + + PollForInput(); + +#ifdef HAVE_GETTIMEOFDAY + gettimeofday(&tv, NULL); + current_time = tv.tv_sec*100 + (tv.tv_usec/10000); +#else + et = ((current_time = time((long *) 0)) - time0) * 100; +#endif + +#ifdef INTERRUPT_TEST + if (iop == INIT_INTERRUPT_MODE) + { + itime0 = current_time; + } + else if (iop == COMPUTE_INTERRUPT_MODE) + { + it = current_time - itime0; + } + else +#endif + { +#ifdef HAVE_GETTIMEOFDAY + et = current_time - time0; +#endif + ETnodes = NodeCnt + znodes; + + if (et < 0) + { +#ifdef INTERRUPT_TEST + printf("elapsed time %ld not positive\n", et); +#endif + et = 0; + } + + if (iop == COMPUTE_AND_INIT_MODE) + { + if ((et > (ResponseTime + ExtraTime)) && (Sdepth > MINDEPTH)) + flag.timeout = true; + + time0 = current_time; + } + +#ifdef QUIETBACKGROUND + if (!background) +#endif + UpdateClocks(); + } +}