X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gnushogi%2Fgnushogi.h;h=14cc51ee2809f64e800030e30f55202149627bc2;hb=mini;hp=60cedaa7460dffeaf54c42ae2b010f49147f0cde;hpb=829c253a7cc2d3e1a9ed643485c1b1a92967b5df;p=gnushogi.git diff --git a/gnushogi/gnushogi.h b/gnushogi/gnushogi.h index 60cedaa..14cc51e 100644 --- a/gnushogi/gnushogi.h +++ b/gnushogi/gnushogi.h @@ -6,6 +6,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 * @@ -43,6 +44,8 @@ #include "debug.h" #include "opts.h" /* Various option-setting #defines. */ +#include + /* * Display options. */ @@ -57,15 +60,13 @@ typedef enum { extern display_t display_type; #define XSHOGI (display_type == DISPLAY_X) -#define NOT_CURSES ((display_type == DISPLAY_X) \ - || (display_type == DISPLAY_RAW)) /* Miscellaneous globals. */ extern short hard_time_limit; /* If you exceed time limit, you lose. */ -extern short barebones; /* Don't print of stats for x interface. */ extern short nolist; /* Don't list game after exit. */ +extern short xboard; /* Use XBoard instead of xShogi protocol */ /* @@ -81,7 +82,6 @@ extern short nolist; /* Don't list game after exit. */ #define small_ushort unsigned char -typedef small_short BYTE; typedef small_ushort UBYTE; typedef short SHORT; typedef unsigned short USHORT; @@ -130,9 +130,13 @@ typedef unsigned long ULONG; #include #include -#include -#include - +#ifdef WIN32 +# include +#else + typedef small_short BYTE; +# include +# include +#endif #if TIME_WITH_SYS_TIME # include @@ -161,15 +165,28 @@ extern void movealgbr(short m, char *s); #define SEEK_SET 0 #define SEEK_END 2 +#ifdef MINISHOGI +#define NO_PIECES 11 +#define MAX_CAPTURED 19 +#define NO_PTYPE_PIECES 11 +#define NO_COLS 5 +#define NO_ROWS 5 +#define NO_CAMP_ROWS 1 +#else #define NO_PIECES 15 #define MAX_CAPTURED 19 #define NO_PTYPE_PIECES 15 #define NO_COLS 9 #define NO_ROWS 9 +#define NO_CAMP_ROWS 3 +#endif #define NO_SQUARES (NO_COLS*NO_ROWS) -#define ROW_NAME(n) ('a' + NO_ROWS - 1 - n) -#define COL_NAME(n) ('1' + NO_COLS - 1 - n) +#define ROW_NAME(n) ( xboard ? '1' + n : ('a' + NO_ROWS - 1 - n) ) +#define COL_NAME(n) ( xboard ? 'a' + n : ('1' + NO_COLS - 1 - n) ) +#define ROW_NUM(c) ( xboard ? c - '1' : ('a' + NO_ROWS - 1 - c) ) +#define COL_NUM(c) ( xboard ? c - 'a' : ('1' + NO_COLS - 1 - c) ) + #if defined HASHFILE || defined CACHE # define PTBLBDSIZE (NO_SQUARES + NO_PIECES) @@ -217,12 +234,13 @@ extern void movealgbr(short m, char *s); /* board properties */ -#define InBlackCamp(sq) ((sq) < 27) -#define InWhiteCamp(sq) ((sq) > 53) +#define InBlackCamp(sq) ((sq) < (NO_COLS * NO_CAMP_ROWS)) +#define InWhiteCamp(sq) ((sq) >= (NO_COLS * (NO_ROWS - NO_CAMP_ROWS))) #define InPromotionZone(side, sq) \ (((side) == black) ? InWhiteCamp(sq) : InBlackCamp(sq)) /* constants */ +/* FIXME ? */ #define OPENING_HINT 0x141d /* P7g-7f (20->29) */ /* truth values */ @@ -243,27 +261,61 @@ extern void movealgbr(short m, char *s); enum { no_piece = 0, pawn, +#ifndef MINISHOGI lance, knight, +#endif + /* start of pieces that can be dropped at any square */ silver, gold, bishop, rook, ppawn, +#ifndef MINISHOGI plance, pknight, +#endif psilver, pbishop, prook, king }; +/* piece mask defines */ +enum { + T_PAWN = 1<1 hint */ #define MAXMOVES 300 /* max number of half moves in a game */ -#define CPSIZE 235 /* size of lang file max */ +#define CPSIZE 241 /* size of lang file max */ #if defined SMALL_MEMORY # if defined SAVE_SSCORE @@ -612,6 +669,7 @@ struct flags short bothsides; /* computer plays both sides */ short hash; /* enable/disable transposition table */ short force; /* enter moves */ + short analyze; /* search during move entry */ short easy; /* disable thinking on opponents time */ short beep; /* enable/disable beep */ short timeout; /* time to make a move */ @@ -649,8 +707,6 @@ extern long znodes; extern char ColorStr[2][10]; extern char mvstr[4][6]; -extern unsigned short MV[MAXDEPTH]; -extern int MSCORE; extern int mycnt1, mycnt2; extern short ahead; extern struct leaf rootnode; @@ -660,6 +716,7 @@ extern char savefile[], listfile[]; extern short TrPnt[]; extern small_short board[], color[]; extern const small_short sweep[NO_PIECES]; +extern const int typeMask[NO_PIECES]; extern small_short PieceList[2][NO_SQUARES], PawnCnt[2][NO_COLS]; extern small_short Captured[2][NO_PIECES]; @@ -752,7 +809,11 @@ typedef unsigned char next_array[NO_SQUARES][NO_SQUARES]; typedef small_short distdata_array[NO_SQUARES][NO_SQUARES]; extern const small_short inunmap[NO_SQUARES]; +#ifndef MINISHOGI extern const small_short nunmap[(NO_COLS + 2)*(NO_ROWS + 4)]; +#else +extern const small_short nunmap[(NO_COLS + 2)*(NO_ROWS + 2)]; +#endif #if defined SAVE_NEXTPOS extern const small_short direc[NO_PTYPE_PIECES][8]; @@ -877,10 +938,9 @@ extern void Unlock_data(void); /* init.c */ extern void Initialize_dist(void); /* init.c */ extern void Initialize_eval(void); /* eval.c */ extern void NewGame(void); -extern int parse(FILE * fd, unsigned short *mv, - short side, char *opening); extern void GetOpenings(void); -extern int OpeningBook(unsigned short *hint, short side); +extern int OpeningBook(unsigned short *hint); +extern int AllocateTT(int size); /* init-common.c */ typedef enum { @@ -927,7 +987,6 @@ PutInTTable(short side, short score, short depth, short ply, - short alpha, short beta, unsigned short mv); @@ -1012,7 +1071,7 @@ extern void UpdateWeights(short side); extern int InitMain(void); extern void ExitMain(void); extern void Initialize(void); -extern void InputCommand(char *command); +extern int InputCommand(char *command, int root); extern void ExitShogi(void); extern void ClearScreen(void); extern void SetTimeControl(void); @@ -1047,7 +1106,7 @@ extern void algbr(short f, short t, short flag); extern void OutputMove(void); extern void ShowCurrentMove(short pnt, short f, short t); extern void ListGame(void); -extern void ShowMessage(char *s); +extern void ShowMessage(char *s, ...); extern void ClearScreen(void); extern void DoDebug(void); extern void DoTable(short table[NO_SQUARES]); @@ -1086,7 +1145,57 @@ typedef enum extern int VerifyMove(char *s, VerifyMove_mode iop, unsigned short *mv); extern unsigned short TTage; +extern short movesLeft, currentMove; + +/* display driver framework */ + +struct display +{ + void (*ChangeAlphaWindow)(void); + void (*ChangeBetaWindow)(void); + void (*ChangeHashDepth)(void); + void (*ChangeSearchDepth)(char *sx); + void (*ChangeXwindow)(void); + void (*ClearScreen)(void); + void (*DoDebug)(void); + void (*DoTable)(short table[NO_SQUARES]); + void (*EditBoard)(void); + void (*ExitShogi)(void); + void (*GiveHint)(void); + void (*Initialize)(void); + void (*ShowNodeCnt)(long NodeCnt); + void (*OutputMove)(void); + void (*PollForInput)(void); + void (*SetContempt)(void); + void (*SearchStartStuff)(short side); + void (*SelectLevel)(char *sx); + void (*ShowCurrentMove)(short pnt, short f, short t); + void (*ShowDepth)(char ch); + void (*ShowGameType)(void); + void (*ShowLine)(unsigned short *bstline); + void (*ShowMessage)(char *s, ...); + void (*AlwaysShowMessage)(const char *format, ...); + void (*Printf)(const char *format, ...); + void (*doRequestInputString)(const char* fmt, char* buffer); + int (*GetString)(char* sx); + void (*SetupBoard)(void); + void (*ShowPatternCount)(short side, short n); + void (*ShowPostnValue)(short sq); + void (*ShowPostnValues)(void); + void (*ShowPrompt)(void); + void (*ShowResponseTime)(void); + void (*ShowResults)(short score, unsigned short *bstline, char ch); + void (*ShowSidetoMove)(void); + void (*ShowStage)(void); + void (*TerminateSearch)(int sig); + void (*UpdateClocks)(void); + void (*UpdateDisplay)(short f, short t, short redraw, short isspec); + void (*help)(void); +}; + +extern struct display *dsp; -#include "dspwrappers.h" /* Display functions. */ +extern struct display raw_display; +extern struct display curses_display; #endif /* _GNUSHOGI_H_ */