X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gnushogi%2Fcursesdsp.c;h=76650a60854798c94abd745d238fb4f68d970324;hb=b8e35b1d447cee3c38bc8177ea8609360a88872d;hp=205b7491f3bc206c51a7b25e98dcd78cab15dabd;hpb=4657fa333b7f33709b6c817211bbd6bd581e7de0;p=gnushogi.git diff --git a/gnushogi/cursesdsp.c b/gnushogi/cursesdsp.c index 205b749..76650a6 100644 --- a/gnushogi/cursesdsp.c +++ b/gnushogi/cursesdsp.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -44,7 +45,6 @@ #include #include "gnushogi.h" -#include "cursesdsp.h" #if HAVE_UNISTD_H #include @@ -62,24 +62,23 @@ #define FLUSH_SCANW fflush(stdout), scanw -int mycnt1, mycnt2; - -#define MARGIN (4) +#define MARGIN (5) #define TAB (58) #define VIR_C(s) ((flag.reverse) ? (NO_COLS - 1 - column(s)) : column(s)) #define VIR_R(s) ((flag.reverse) ? (NO_ROWS - 1 - row(s)) : row(s)) -unsigned short MV[MAXDEPTH]; -int MSCORE; -char *DRAW; +/**************************************** + * forward declarations + ****************************************/ -/* Forward declarations. */ /* FIXME: change this name, puh-leeze! */ - static void UpdateCatched(void); static void DrawPiece(short sq); static void ShowScore(short score); +static void Curses_UpdateDisplay(short f, short t, short redraw, short isspec); +static void Curses_Die(int sig); +static void Curses_ShowSidetoMove(void); /**************************************** * Trivial output functions. @@ -93,7 +92,7 @@ ClearEoln(void) } -void +static void Curses_ClearScreen(void) { clear(); @@ -115,8 +114,7 @@ ClearMessage(void) ClearEoln(); } - -void +static void Curses_ShowCurrentMove(short pnt, short f, short t) { algbr(f, t, false); @@ -125,7 +123,7 @@ Curses_ShowCurrentMove(short pnt, short f, short t) } -void +static void Curses_ShowDepth(char ch) { gotoXY(TAB, 4); @@ -134,7 +132,7 @@ Curses_ShowDepth(char ch) } -void +static void Curses_ShowGameType(void) { if (flag.post) @@ -145,7 +143,7 @@ Curses_ShowGameType(void) } -void +static void ShowHeader(void) { gotoXY(TAB, 2); @@ -153,47 +151,61 @@ ShowHeader(void) } -void +static void Curses_ShowLine(unsigned short *bstline) { } -void -Curses_ShowMessage(char *s) +static void +_vprintw(const char *format, va_list ap) { + static char buffer[60]; + vsnprintf(buffer, sizeof(buffer), format, ap); + printw("%s", buffer); +} + +static void +Curses_ShowMessage(char *format, ...) +{ + va_list ap; + va_start(ap, format); gotoXY(TAB, 6); - printw("%s", s); + _vprintw(format, ap); + va_end(ap); ClearEoln(); } - -void -Curses_AlwaysShowMessage(const char *format, va_list ap) +static void +Curses_AlwaysShowMessage(const char *format, ...) { - static char buffer[60]; - vsnprintf(buffer, sizeof(buffer), format, ap); - Curses_ShowMessage(buffer); + va_list ap; + va_start(ap, format); + gotoXY(TAB, 6); + _vprintw(format, ap); + va_end(ap); + ClearEoln(); } -void -Curses_Printf(const char *format, va_list ap) +static void +Curses_Printf(const char *format, ...) { - static char buffer[60]; - vsnprintf(buffer, sizeof(buffer), format, ap); - printw("%s", buffer); + va_list ap; + va_start(ap, format); + _vprintw(format, ap); + va_end(ap); } -void +static void Curses_doRequestInputString(const char* fmt, char* buffer) { FLUSH_SCANW(fmt, buffer); } -int +static int Curses_GetString(char* sx) { fflush(stdout); @@ -201,7 +213,7 @@ Curses_GetString(char* sx) } -void +static void Curses_ShowNodeCnt(long NodeCnt) { gotoXY(TAB, 22); @@ -212,7 +224,7 @@ Curses_ShowNodeCnt(long NodeCnt) } -void +static void Curses_ShowPatternCount(short side, short n) { if (flag.post) @@ -237,7 +249,7 @@ ShowPlayers(void) } -void +static void Curses_ShowPrompt(void) { Curses_ShowSidetoMove(); @@ -247,7 +259,7 @@ Curses_ShowPrompt(void) } -void +static void Curses_ShowResponseTime(void) { if (flag.post) @@ -261,7 +273,7 @@ Curses_ShowResponseTime(void) } -void +static void Curses_ShowResults(short score, unsigned short *bstline, char ch) { unsigned char d, ply; @@ -305,7 +317,7 @@ ShowScore(short score) } -void +static void Curses_ShowSidetoMove(void) { gotoXY(TAB, 14); @@ -314,7 +326,7 @@ Curses_ShowSidetoMove(void) } -void +static void Curses_ShowStage(void) { gotoXY(TAB, 19); @@ -327,7 +339,7 @@ Curses_ShowStage(void) * End of trivial output routines. ****************************************/ -void +static void Curses_Initialize(void) { signal(SIGINT, Curses_Die); @@ -337,7 +349,7 @@ Curses_Initialize(void) } -void +static void Curses_ExitShogi(void) { if (!nolist) @@ -353,7 +365,7 @@ Curses_ExitShogi(void) } -void +static void Curses_Die(int sig) { char s[80]; @@ -372,7 +384,7 @@ Curses_Die(int sig) } -void +static void Curses_TerminateSearch(int sig) { signal(SIGINT, SIG_IGN); @@ -388,7 +400,7 @@ Curses_TerminateSearch(int sig) } -void +static void Curses_help(void) { Curses_ClearScreen(); @@ -446,8 +458,8 @@ Curses_help(void) } -static const short x0[2] = { 54, 2 }; -static const short y0[2] = { 20, 4 }; +static const short x0[2] = { MARGIN + 5*NO_COLS + 4, 2 }; +static const short y0[2] = { 4 + 2 * (NO_ROWS - 1), 4 }; /* @@ -456,7 +468,7 @@ static const short y0[2] = { 20, 4 }; * P* will put a pawn to the captured pieces. */ -void +static void Curses_EditBoard(void) { short a, c, sq, i, found; @@ -467,11 +479,11 @@ Curses_EditBoard(void) Book = BOOKFAIL; Curses_ClearScreen(); Curses_UpdateDisplay(0, 0, 1, 0); - gotoXY(TAB, 3); + gotoXY(TAB, 11); printw(". Exit to main\n"); - gotoXY(TAB, 4); + gotoXY(TAB, 12); printw("# Clear board\n"); - gotoXY(TAB, 5); + gotoXY(TAB, 13); printw("c Change sides\n"); gotoXY(TAB, 7); printw("Enter piece & location: "); @@ -479,12 +491,13 @@ Curses_EditBoard(void) while(1) { - gotoXY(TAB, 6); + gotoXY(TAB, 4); printw("Editing: %s", ColorStr[a]); - gotoXY(TAB + 24, 7); + gotoXY(TAB + 2, 8); ClearEoln(); FLUSH_SCANW("%s", s); found = 0; + ClearMessage(); if (s[0] == '.') break; @@ -520,24 +533,26 @@ Curses_EditBoard(void) break; } } - + if (!found) + dsp->AlwaysShowMessage("Invalid piece type '%c'", s[0]); continue; } c = COL_NUM(s[1]); r = ROW_NUM(s[2]); - if ((c < 0) || (c >= NO_COLS) || (r < 0) || (r >= NO_ROWS)) + if ((c < 0) || (c >= NO_COLS) || (r < 0) || (r >= NO_ROWS)) { + dsp->AlwaysShowMessage("Out-of-board '%c%c'", s[1], s[2]); continue; + } sq = locn(r, c); - color[sq] = a; - board[sq] = no_piece; for (i = NO_PIECES; i > no_piece; i--) { if ((s[0] == pxx[i]) || (s[0] == qxx[i])) { + color[sq] = a; if (s[3] == '+') board[sq] = promoted[i]; else @@ -548,9 +563,8 @@ Curses_EditBoard(void) } } - - if (found == 0) - color[sq] = neutral; + if (!found) + dsp->AlwaysShowMessage("Invalid piece type '%c'", s[0]); DrawPiece(sq); } @@ -619,7 +633,7 @@ UpdateCatched() } -void +static void Curses_SearchStartStuff(short side) { short i; @@ -635,7 +649,7 @@ Curses_SearchStartStuff(short side) } -void +static void Curses_OutputMove(void) { @@ -690,7 +704,7 @@ Curses_OutputMove(void) t = (l + h) >> 1; } - ShowNodeCnt(NodeCnt); + Curses_ShowNodeCnt(NodeCnt); gotoXY(TAB, 23); printw("Max Tree = %5d", t); ClearEoln(); @@ -700,7 +714,7 @@ Curses_OutputMove(void) } -void +static void Curses_UpdateClocks(void) { short m, s; @@ -724,15 +738,15 @@ Curses_UpdateClocks(void) s = 0; if (player == black) - gotoXY(20, (flag.reverse) ? 2 : 23); + gotoXY(20, (flag.reverse) ? 2 : (5 + 2*NO_ROWS)); else - gotoXY(20, (flag.reverse) ? 23 : 2); + gotoXY(20, (flag.reverse) ? (5 + 2*NO_ROWS) : 2); /* printw("%d:%02d %ld ", m, s, dt); */ printw("%d:%02d ", m, s); if (flag.post) - ShowNodeCnt(NodeCnt); + Curses_ShowNodeCnt(NodeCnt); refresh(); } @@ -779,13 +793,11 @@ DrawPiece(short sq) /* * Curses_ShowPostnValue(): must have called ExaminePosition() first */ -void +static void Curses_ShowPostnValue(short sq) { - short score; - gotoXY(4 + 5 * VIR_C(sq), 5 + 2 * (7 - VIR_R(sq))); /* CHECKME */ - score = ScorePosition(color[sq]); + (void) ScorePosition(color[sq]); if (color[sq] != neutral) #if defined SAVE_SVALUE @@ -804,7 +816,7 @@ Curses_ShowPostnValue(short sq) } -void +static void Curses_ShowPostnValues(void) { short sq, score; @@ -824,7 +836,7 @@ Curses_ShowPostnValues(void) } -void +static void Curses_UpdateDisplay(short f, short t, short redraw, short isspec) { short i, sq, z; @@ -941,7 +953,7 @@ Curses_UpdateDisplay(short f, short t, short redraw, short isspec) } -void +static void Curses_ChangeAlphaWindow(void) { Curses_ShowMessage("WAwindow = "); @@ -951,7 +963,7 @@ Curses_ChangeAlphaWindow(void) } -void +static void Curses_ChangeBetaWindow(void) { Curses_ShowMessage("WBwindow = "); @@ -961,7 +973,7 @@ Curses_ChangeBetaWindow(void) } -void +static void Curses_GiveHint(void) { char s[40]; @@ -980,8 +992,8 @@ Curses_GiveHint(void) } -void -Curses_ChangeSearchDepth(void) +static void +Curses_ChangeSearchDepth(char* sx) { Curses_ShowMessage("depth = "); FLUSH_SCANW("%hd", &MaxSearchDepth); @@ -989,7 +1001,7 @@ Curses_ChangeSearchDepth(void) } -void +static void Curses_ChangeHashDepth(void) { Curses_ShowMessage("hashdepth = "); @@ -999,7 +1011,7 @@ Curses_ChangeHashDepth(void) } -void +static void Curses_SetContempt(void) { Curses_ShowMessage("contempt = "); @@ -1007,7 +1019,7 @@ Curses_SetContempt(void) } -void +static void Curses_ChangeXwindow(void) { Curses_ShowMessage("xwndw= "); @@ -1015,7 +1027,7 @@ Curses_ChangeXwindow(void) } -void +static void Curses_SelectLevel(char *sx) { int item; @@ -1125,7 +1137,7 @@ Curses_SelectLevel(char *sx) } -void +static void Curses_DoDebug(void) { short c, p, sq, tp, tc, tsq, score; @@ -1172,7 +1184,7 @@ Curses_DoDebug(void) } -void +static void Curses_DoTable(short table[NO_SQUARES]) { short sq; @@ -1186,7 +1198,7 @@ Curses_DoTable(short table[NO_SQUARES]) } -void +static void Curses_PollForInput(void) { int i; @@ -1212,8 +1224,53 @@ Curses_PollForInput(void) } -void +static void Curses_SetupBoard(void) { Curses_ShowMessage("'setup' command is not supported in Cursesmode"); } + + +struct display curses_display = +{ + .ChangeAlphaWindow = Curses_ChangeAlphaWindow, + .ChangeBetaWindow = Curses_ChangeBetaWindow, + .ChangeHashDepth = Curses_ChangeHashDepth, + .ChangeSearchDepth = Curses_ChangeSearchDepth, + .ChangeXwindow = Curses_ChangeXwindow, + .ClearScreen = Curses_ClearScreen, + .DoDebug = Curses_DoDebug, + .DoTable = Curses_DoTable, + .EditBoard = Curses_EditBoard, + .ExitShogi = Curses_ExitShogi, + .GiveHint = Curses_GiveHint, + .Initialize = Curses_Initialize, + .ShowNodeCnt = Curses_ShowNodeCnt, + .OutputMove = Curses_OutputMove, + .PollForInput = Curses_PollForInput, + .SetContempt = Curses_SetContempt, + .SearchStartStuff = Curses_SearchStartStuff, + .SelectLevel = Curses_SelectLevel, + .ShowCurrentMove = Curses_ShowCurrentMove, + .ShowDepth = Curses_ShowDepth, + .ShowGameType = Curses_ShowGameType, + .ShowLine = Curses_ShowLine, + .ShowMessage = Curses_ShowMessage, + .AlwaysShowMessage = Curses_AlwaysShowMessage, + .Printf = Curses_Printf, + .doRequestInputString = Curses_doRequestInputString, + .GetString = Curses_GetString, + .SetupBoard = Curses_SetupBoard, + .ShowPatternCount = Curses_ShowPatternCount, + .ShowPostnValue = Curses_ShowPostnValue, + .ShowPostnValues = Curses_ShowPostnValues, + .ShowPrompt = Curses_ShowPrompt, + .ShowResponseTime = Curses_ShowResponseTime, + .ShowResults = Curses_ShowResults, + .ShowSidetoMove = Curses_ShowSidetoMove, + .ShowStage = Curses_ShowStage, + .TerminateSearch = Curses_TerminateSearch, + .UpdateClocks = Curses_UpdateClocks, + .UpdateDisplay = Curses_UpdateDisplay, + .help = Curses_help, +};