From: Arun Persaud Date: Sat, 3 Oct 2009 17:48:41 +0000 (-0700) Subject: Merge branch 'master' into gtk X-Git-Tag: gtk-20091122~29 X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=5120d477cacfa58108ad93a414af083f1fb58c5a;hp=2363bb5476772d84a81dce759ad95b375bd7bfe7;p=xboard.git Merge branch 'master' into gtk Conflicts: Makefile.am backend.c configure.ac xboard.c --- diff --git a/Makefile.am b/Makefile.am index 6332932..b56df1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,13 +6,16 @@ else endif bin_PROGRAMS = xboard + xboard_SOURCES = backend.c backend.h backendz.h \ book.c \ + callback.c\ childio.c childio.h \ common.h \ frontend.h \ gamelist.c \ gettext.h \ + interface.c \ lists.c lists.h \ moves.c moves.h \ parser.l parser.h \ @@ -25,7 +28,7 @@ xboard_SOURCES = backend.c backend.h backendz.h \ xhistory.c xhistory.h \ xoptions.c \ $(ZPY) -xboard_LDADD = -lm @X_PRE_LIBS@ @XAW_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ +xboard_LDADD = -lm @XAW_LIBS@ @GTK_LIBS@ EXTRA_DIST = pixmaps bitmaps shogibitmaps \ xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man \ @@ -33,7 +36,7 @@ EXTRA_DIST = pixmaps bitmaps shogibitmaps \ DISTCLEANFILES = stamp-h -AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ +AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @GTK_CFLAGS@ info_TEXINFOS = xboard.texi xboard_TEXINFOS = copyright.texi diff --git a/backend.c b/backend.c index 304acc2..7d22cd3 100644 --- a/backend.c +++ b/backend.c @@ -125,15 +125,15 @@ extern int gettimeofday(struct timeval *, struct timezone *); # include "zippy.h" #endif #include "backendz.h" -#include "gettext.h" - -#ifdef ENABLE_NLS -# define _(s) gettext (s) -# define N_(s) gettext_noop (s) -#else -# define _(s) (s) -# define N_(s) s -#endif +#include "gettext.h" + +#ifdef ENABLE_NLS +# define _(s) gettext (s) +# define N_(s) gettext_noop (s) +#else +# define _(s) (s) +# define N_(s) s +#endif /* A point in time */ @@ -365,7 +365,7 @@ PosFlags(index) case VariantKriegspiel: flags |= F_KRIEGSPIEL_CAPTURE; break; - case VariantCapaRandom: + case VariantCapaRandom: case VariantFischeRandom: flags |= F_FRC_TYPE_CASTLING; /* [HGM] enable this through flag */ case VariantNoCastle: @@ -381,7 +381,7 @@ PosFlags(index) FILE *gameFileFP, *debugFP; -/* +/* [AS] Note: sometimes, the sscanf() function is used to parse the input into a fixed-size buffer. Because of this, we must be prepared to receive strings as long as the size of the input buffer, which is currently @@ -467,7 +467,7 @@ int nrCastlingRights; // For TwoKings, or to implement castling-unknown status int initialRulePlies, FENrulePlies; char FENepStatus; FILE *serverMoves = NULL; // next two for broadcasting (/serverMoves option) -int loadFlag = 0; +int loadFlag = 0; int shuffleOpenings; int mute; // mute all sounds @@ -523,31 +523,31 @@ ChessSquare XiangqiArray[2][BOARD_SIZE] = { }; ChessSquare CapablancaArray[2][BOARD_SIZE] = { - { WhiteRook, WhiteKnight, WhiteAngel, WhiteBishop, WhiteQueen, + { WhiteRook, WhiteKnight, WhiteAngel, WhiteBishop, WhiteQueen, WhiteKing, WhiteBishop, WhiteMarshall, WhiteKnight, WhiteRook }, - { BlackRook, BlackKnight, BlackAngel, BlackBishop, BlackQueen, + { BlackRook, BlackKnight, BlackAngel, BlackBishop, BlackQueen, BlackKing, BlackBishop, BlackMarshall, BlackKnight, BlackRook } }; ChessSquare GreatArray[2][BOARD_SIZE] = { - { WhiteDragon, WhiteKnight, WhiteAlfil, WhiteGrasshopper, WhiteKing, + { WhiteDragon, WhiteKnight, WhiteAlfil, WhiteGrasshopper, WhiteKing, WhiteSilver, WhiteCardinal, WhiteAlfil, WhiteKnight, WhiteDragon }, - { BlackDragon, BlackKnight, BlackAlfil, BlackGrasshopper, BlackKing, + { BlackDragon, BlackKnight, BlackAlfil, BlackGrasshopper, BlackKing, BlackSilver, BlackCardinal, BlackAlfil, BlackKnight, BlackDragon }, }; ChessSquare JanusArray[2][BOARD_SIZE] = { - { WhiteRook, WhiteAngel, WhiteKnight, WhiteBishop, WhiteKing, + { WhiteRook, WhiteAngel, WhiteKnight, WhiteBishop, WhiteKing, WhiteQueen, WhiteBishop, WhiteKnight, WhiteAngel, WhiteRook }, - { BlackRook, BlackAngel, BlackKnight, BlackBishop, BlackKing, + { BlackRook, BlackAngel, BlackKnight, BlackBishop, BlackKing, BlackQueen, BlackBishop, BlackKnight, BlackAngel, BlackRook } }; #ifdef GOTHIC ChessSquare GothicArray[2][BOARD_SIZE] = { - { WhiteRook, WhiteKnight, WhiteBishop, WhiteQueen, WhiteMarshall, + { WhiteRook, WhiteKnight, WhiteBishop, WhiteQueen, WhiteMarshall, WhiteKing, WhiteAngel, WhiteBishop, WhiteKnight, WhiteRook }, - { BlackRook, BlackKnight, BlackBishop, BlackQueen, BlackMarshall, + { BlackRook, BlackKnight, BlackBishop, BlackQueen, BlackMarshall, BlackKing, BlackAngel, BlackBishop, BlackKnight, BlackRook } }; #else // !GOTHIC @@ -556,9 +556,9 @@ ChessSquare GothicArray[2][BOARD_SIZE] = { #ifdef FALCON ChessSquare FalconArray[2][BOARD_SIZE] = { - { WhiteRook, WhiteKnight, WhiteBishop, WhiteLance, WhiteQueen, + { WhiteRook, WhiteKnight, WhiteBishop, WhiteLance, WhiteQueen, WhiteKing, WhiteLance, WhiteBishop, WhiteKnight, WhiteRook }, - { BlackRook, BlackKnight, BlackBishop, BlackLance, BlackQueen, + { BlackRook, BlackKnight, BlackBishop, BlackLance, BlackQueen, BlackKing, BlackLance, BlackBishop, BlackKnight, BlackRook } }; #else // !FALCON @@ -643,7 +643,7 @@ InitBackEnd1() if (appData.icsActive) { appData.matchMode = FALSE; appData.matchGames = 0; -#if ZIPPY +#if ZIPPY appData.noChessProgram = !appData.zippyPlay; #else appData.zippyPlay = FALSE; @@ -697,7 +697,7 @@ InitBackEnd1() /* [AS] Adjudication threshold */ adjudicateLossThreshold = appData.adjudicateLossThreshold; - + first.which = "first"; second.which = "second"; first.maybeThinking = second.maybeThinking = FALSE; @@ -816,7 +816,7 @@ InitBackEnd1() appData.clockMode = FALSE; first.sendTime = second.sendTime = 0; } - + #if ZIPPY /* Override some settings from environment variables, for backward compatibility. Unfortunately it's not feasible to have the env @@ -826,7 +826,7 @@ InitBackEnd1() ZippyInit(); } #endif - + if (appData.noChessProgram) { programVersion = (char*) malloc(5 + strlen(PACKAGE_STRING)); sprintf(programVersion, "%s", PACKAGE_STRING); @@ -972,7 +972,7 @@ int NextSessionFromString( char ** str, int *moves, long * tc, long *inc) if(result = NextIntegerFromString( str, &temp2)) return -1; *inc = temp2 * 1000; } else *inc = 0; - *moves = 0; *tc = temp * 1000; + *moves = 0; *tc = temp * 1000; return 0; } else if(temp % 60 != 0) return -1; /* moves was given as min:sec */ @@ -1080,30 +1080,30 @@ ParseTimeControl(tc, ti, mps) void InitBackEnd2() { - if (appData.debugMode) { - fprintf(debugFP, "%s\n", programVersion); - } + if (appData.debugMode) { + fprintf(debugFP, "%s\n", programVersion); + } - if (appData.matchGames > 0) { - appData.matchMode = TRUE; - } else if (appData.matchMode) { - appData.matchGames = 1; - } - if(appData.matchMode && appData.sameColorGames > 0) /* [HGM] alternate: overrule matchGames */ - appData.matchGames = appData.sameColorGames; - if(appData.rewindIndex > 1) { /* [HGM] autoinc: rewind implies auto-increment and overrules given index */ - if(appData.loadPositionIndex >= 0) appData.loadPositionIndex = -1; - if(appData.loadGameIndex >= 0) appData.loadGameIndex = -1; - } - Reset(TRUE, FALSE); - if (appData.noChessProgram || first.protocolVersion == 1) { - InitBackEnd3(); - } else { - /* kludge: allow timeout for initial "feature" commands */ - FreezeUI(); - DisplayMessage("", _("Starting chess program")); - ScheduleDelayedEvent(InitBackEnd3, FEATURE_TIMEOUT); - } + if (appData.matchGames > 0) { + appData.matchMode = TRUE; + } else if (appData.matchMode) { + appData.matchGames = 1; + } + if(appData.matchMode && appData.sameColorGames > 0) /* [HGM] alternate: overrule matchGames */ + appData.matchGames = appData.sameColorGames; + if(appData.rewindIndex > 1) { /* [HGM] autoinc: rewind implies auto-increment and overrules given index */ + if(appData.loadPositionIndex >= 0) appData.loadPositionIndex = -1; + if(appData.loadGameIndex >= 0) appData.loadGameIndex = -1; + } + Reset(TRUE, FALSE); + if (appData.noChessProgram || first.protocolVersion == 1) { + InitBackEnd3(); + } else { + /* kludge: allow timeout for initial "feature" commands */ + FreezeUI(); + DisplayMessage("", _("Starting chess program")); + ScheduleDelayedEvent(InitBackEnd3, FEATURE_TIMEOUT); + } } void @@ -1119,15 +1119,15 @@ InitBackEnd3 P((void)) if (appData.icsActive) { #ifdef WIN32 /* [DM] Make a console window if needed [HGM] merged ifs */ - ConsoleCreate(); + ConsoleCreate(); #endif err = establish(); if (err != 0) { if (*appData.icsCommPort != NULLCHAR) { - sprintf(buf, _("Could not open comm port %s"), + sprintf(buf, _("Could not open comm port %s"), appData.icsCommPort); } else { - snprintf(buf, sizeof(buf), _("Could not connect to host %s, port %s"), + snprintf(buf, sizeof(buf), _("Could not connect to host %s, port %s"), appData.icsHost, appData.icsPort); } DisplayFatalError(buf, err, 1); @@ -1150,7 +1150,7 @@ InitBackEnd3 P((void)) cmailISR = AddInputSource(cmailPR, FALSE, CmailSigHandlerCallBack, &cmailISR); } - + ThawUI(); DisplayMessage("", ""); if (StrCaseCmp(appData.initialMode, "") == 0) { @@ -1158,7 +1158,7 @@ InitBackEnd3 P((void)) } else if (StrCaseCmp(appData.initialMode, "TwoMachines") == 0) { initialMode = TwoMachinesPlay; } else if (StrCaseCmp(appData.initialMode, "AnalyzeFile") == 0) { - initialMode = AnalyzeFile; + initialMode = AnalyzeFile; } else if (StrCaseCmp(appData.initialMode, "Analysis") == 0) { initialMode = AnalyzeMode; } else if (StrCaseCmp(appData.initialMode, "MachineWhite") == 0) { @@ -1334,7 +1334,7 @@ establish() appData.icsHost, appData.icsPort); } else { snprintf(buf, sizeof(buf), "%s %s -l %s %s %s %s", - appData.remoteShell, appData.gateway, + appData.remoteShell, appData.gateway, appData.remoteUser, appData.telnetProgram, appData.icsHost, appData.icsPort); } @@ -1504,7 +1504,7 @@ SendToICSDelayed(s,msdelay) /* Remove all highlighting escape sequences in s - Also deletes any suffix starting with '(' + Also deletes any suffix starting with '(' */ char * StripHighlightAndTitle(s) @@ -1590,7 +1590,7 @@ StringToVariant(e) if (!found) { if ((StrCaseStr(e, "fischer") && StrCaseStr(e, "random")) - || StrCaseStr(e, "wild/fr") + || StrCaseStr(e, "wild/fr") || StrCaseStr(e, "frc") || StrCaseStr(e, "960")) { v = VariantFischeRandom; } else if ((i = 4, p = StrCaseStr(e, "wild")) || @@ -1668,7 +1668,7 @@ StringToVariant(e) v = VariantShatranj; break; - /* Temporary names for future ICC types. The name *will* change in + /* Temporary names for future ICC types. The name *will* change in the next xboard/WinBoard release after ICC defines it. */ case 29: v = Variant29; @@ -1775,7 +1775,7 @@ looking_at(buf, index, pattern) char *bufp = &buf[*index], *patternp = pattern; int star_count = 0; char *matchp = star_match[0]; - + for (;;) { if (*patternp == NULLCHAR) { *index = leftover_start = bufp - buf; @@ -2007,7 +2007,7 @@ VariantSwitch(Board board, VariantClass newVariant) /* shift position to new playing area, if needed */ if(newHoldingsWidth > gameInfo.holdingsWidth) { - for(i=0; i=BOARD_LEFT; j--) board[i][j+newHoldingsWidth-gameInfo.holdingsWidth] = board[i][j]; @@ -2078,7 +2078,7 @@ read_from_ics(isr, closure, data, count, error) #define STARTED_CHATTER 5 #define STARTED_COMMENT 6 #define STARTED_MOVES_NOHIDE 7 - + static int started = STARTED_NONE; static char parse[20000]; static int parse_pos = 0; @@ -2131,7 +2131,7 @@ read_from_ics(isr, closure, data, count, error) buf[buf_len] = NULLCHAR; next_out = leftover_len; leftover_start = 0; - + i = 0; while (i < buf_len) { /* Deal with part of the TELNET option negotiation @@ -2243,12 +2243,12 @@ read_from_ics(isr, closure, data, count, error) next_out = i; continue; } - + /* OK, this at least will *usually* work */ if (!loggedOn && looking_at(buf, &i, "ics%")) { loggedOn = TRUE; } - + if (loggedOn && !intfSet) { if (ics_type == ICS_ICC) { sprintf(str, @@ -2390,11 +2390,11 @@ read_from_ics(isr, closure, data, count, error) oldi = i; // [HGM] kibitz: try to recognize opponent engine-score kibitzes, to divert them to engine-output window - if (appData.autoKibitz && started == STARTED_NONE && + if (appData.autoKibitz && started == STARTED_NONE && !appData.icsEngineAnalyze && // [HGM] [DM] ICS analyze (gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack || gameMode == IcsObserving)) { if(looking_at(buf, &i, "* kibitzes: ") && - (StrStr(star_match[0], gameInfo.white) == star_match[0] || + (StrStr(star_match[0], gameInfo.white) == star_match[0] || StrStr(star_match[0], gameInfo.black) == star_match[0] )) { // kibitz of self or opponent suppressKibitz = TRUE; if((StrStr(star_match[0], gameInfo.white) == star_match[0] @@ -2408,7 +2408,7 @@ read_from_ics(isr, closure, data, count, error) savingComment = TRUE; suppressKibitz = gameMode != IcsObserving ? 2 : (StrStr(star_match[0], gameInfo.white) == NULL) + 1; - } + } continue; } else if(looking_at(buf, &i, "kibitzed to")) { // suppress the acknowledgements of our own autoKibitz @@ -2664,14 +2664,14 @@ read_from_ics(isr, closure, data, count, error) SendToICS("refresh\n"); continue; } - + if (!have_sent_ICS_logon && looking_at(buf, &i, "login:")) { ICSInitScript(); have_sent_ICS_logon = 1; continue; } - - if (ics_getting_history != H_GETTING_MOVES /*smpos kludge*/ && + + if (ics_getting_history != H_GETTING_MOVES /*smpos kludge*/ && (looking_at(buf, &i, "\n<12> ") || looking_at(buf, &i, "<12> "))) { loggedOn = TRUE; @@ -2754,7 +2754,7 @@ read_from_ics(isr, closure, data, count, error) gameInfo.whiteRating = string_to_rating(star_match[1]); gameInfo.blackRating = string_to_rating(star_match[3]); if (appData.debugMode) - fprintf(debugFP, _("Ratings from header: W %d, B %d\n"), + fprintf(debugFP, _("Ratings from header: W %d, B %d\n"), gameInfo.whiteRating, gameInfo.blackRating); } continue; @@ -2808,8 +2808,8 @@ read_from_ics(isr, closure, data, count, error) break; } continue; - } - + } + if (looking_at(buf, &i, "% ") || ((started == STARTED_MOVES || started == STARTED_MOVES_NOHIDE) && looking_at(buf, &i, "}*"))) { char *bookHit = NULL; // [HGM] book @@ -2827,7 +2827,7 @@ read_from_ics(isr, closure, data, count, error) if (WhiteOnMove(forwardMostMove)) { if (first.sendTime) { if (first.useColors) { - SendToProgram("black\n", &first); + SendToProgram("black\n", &first); } SendTimeRemaining(&first, TRUE); } @@ -2887,7 +2887,7 @@ read_from_ics(isr, closure, data, count, error) firstMove = TRUE; } } - } + } } #endif if (gameMode == IcsObserving && ics_gamenum == -1) { @@ -2930,7 +2930,7 @@ read_from_ics(isr, closure, data, count, error) if(bookHit) { // [HGM] book: simulate book reply static char bookMove[MSG_SIZ]; // a bit generous? - programStats.nodes = programStats.depth = programStats.time = + programStats.nodes = programStats.depth = programStats.time = programStats.score = programStats.got_only_move = 0; sprintf(programStats.movelist, "%s (xbook)", bookHit); @@ -2940,14 +2940,14 @@ read_from_ics(isr, closure, data, count, error) } continue; } - + if ((started == STARTED_MOVES || started == STARTED_BOARD || started == STARTED_HOLDINGS || started == STARTED_MOVES_NOHIDE) && i >= leftover_len) { /* Accumulate characters in move list or board */ parse[parse_pos++] = buf[i]; } - + /* Start of game messages. Mostly we detect start of game when the first board image arrives. On some versions of the ICS, though, we need to do a "refresh" after starting @@ -2980,7 +2980,7 @@ read_from_ics(isr, closure, data, count, error) player2Rating = string_to_rating(star_match[3]); if (appData.debugMode) - fprintf(debugFP, + fprintf(debugFP, "Ratings from 'Game notification:' %s %d, %s %d\n", player1Name, player1Rating, player2Name, player2Rating); @@ -3010,8 +3010,8 @@ read_from_ics(isr, closure, data, count, error) SendToICS("refresh\n"); } continue; - } - + } + /* Error messages */ // if (ics_user_moved) { if (1) { // [HGM] old way ignored error after move type in; ics_user_moved is not set then! @@ -3074,7 +3074,7 @@ read_from_ics(isr, closure, data, count, error) 2 empty, white, or black (IGNORED) 3 player 2 name (not necessarily black) 4 player 2 rating - + The names/ratings are sorted out when the game actually starts (below). */ @@ -3084,14 +3084,14 @@ read_from_ics(isr, closure, data, count, error) player2Rating = string_to_rating(star_match[4]); if (appData.debugMode) - fprintf(debugFP, + fprintf(debugFP, "Ratings from 'Creating:' %s %d, %s %d\n", player1Name, player1Rating, player2Name, player2Rating); continue; } - + /* Improved generic start/end-of-game messages */ if ((tkind=0, looking_at(buf, &i, "{Game * (* vs. *) *}*")) || (tkind=1, looking_at(buf, &i, "{Game * (*(*) vs. *(*)) *}*"))){ @@ -3246,8 +3246,8 @@ read_from_ics(isr, closure, data, count, error) ClearPremoveHighlights(); if (appData.debugMode) fprintf(debugFP, "Sending premove:\n"); - UserMoveEvent(premoveFromX, premoveFromY, - premoveToX, premoveToY, + UserMoveEvent(premoveFromX, premoveFromY, + premoveToX, premoveToY, premovePromoChar); } } @@ -3325,18 +3325,18 @@ read_from_ics(isr, closure, data, count, error) i++; /* skip unparsed character and loop back */ } - + if (started != STARTED_MOVES && started != STARTED_BOARD && !suppressKibitz && // [HGM] kibitz suppress printing in ICS interaction window started != STARTED_HOLDINGS && i > next_out) { SendToPlayer(&buf[next_out], i - next_out); next_out = i; } suppressKibitz = FALSE; // [HGM] kibitz: has done its duty in if-statement above - + leftover_len = buf_len - leftover_start; /* if buffer ends with something we couldn't parse, reparse it after appending the next read */ - + } else if (count == 0) { RemoveInputSource(isr); DisplayFatalError(_("Connection closed by ICS"), 0, 0); @@ -3347,13 +3347,13 @@ read_from_ics(isr, closure, data, count, error) /* Board style 12 looks like this: - + <12> r-b---k- pp----pp ---bP--- ---p---- q------- ------P- P--Q--BP -----R-K W -1 0 0 0 0 0 0 paf MaxII 0 2 12 21 25 234 174 24 Q/d7-a4 (0:06) Qxa4 0 0 - + * The "<12> " is stripped before it gets to this routine. The two * trailing 0's (flip state and clock ticking) are later addition, and * some chess servers may not have them, or may have only the first. - * Additional trailing fields may be added in the future. + * Additional trailing fields may be added in the future. */ #define PATTERN "%c%d%d%d%d%d%d%d%s%s%d%d%d%d%d%d%d%d%s%s%s%d%d" @@ -3369,7 +3369,7 @@ read_from_ics(isr, closure, data, count, error) void ParseBoard12(string) char *string; -{ +{ GameMode newGameMode; int gamenum, newGame, newMove, relation, basetime, increment, ics_flip = 0, i; int j, k, n, moveNum, white_stren, black_stren, white_time, black_time, takeback; @@ -3387,7 +3387,7 @@ ParseBoard12(string) char *bookHit = NULL; // [HGM] book fromX = fromY = toX = toY = -1; - + newGame = FALSE; if (appData.debugMode) @@ -3427,7 +3427,7 @@ ParseBoard12(string) 0, 1); return; } - + switch (relation) { case RELATION_OBSERVING_PLAYED: case RELATION_OBSERVING_STATIC: @@ -3449,14 +3449,14 @@ ParseBoard12(string) case RELATION_ISOLATED_BOARD: default: /* Just display this board. If user was doing something else, - we will forget about it until the next board comes. */ + we will forget about it until the next board comes. */ newGameMode = IcsIdle; break; case RELATION_STARTING_POSITION: newGameMode = gameMode; break; } - + /* Modify behavior for initial board display on move listing of wild games. */ @@ -3489,12 +3489,12 @@ ParseBoard12(string) ics_getting_history = H_FALSE; return; } - + /* Take action if this is the first board of a new game, or of a different game than is currently being displayed. */ if (gamenum != ics_gamenum || newGameMode != gameMode || relation == RELATION_ISOLATED_BOARD) { - + /* Forget the old game and get the history (if any) of the new one */ if (gameMode != BeginningOfGame) { Reset(FALSE, TRUE); @@ -3511,14 +3511,14 @@ ParseBoard12(string) sprintf(str, "%smoves %d\n", ics_prefix, gamenum); SendToICS(str); } - + /* Initially flip the board to have black on the bottom if playing black or if the ICS flip flag is set, but let the user change it with the Flip View button. */ - flipView = appData.autoFlipView ? + flipView = appData.autoFlipView ? (newGameMode == IcsPlayingBlack) || ics_flip : appData.flipView; - + /* Done with values from previous mode; copy in new ones */ gameMode = newGameMode; ModeHighlight(); @@ -3549,7 +3549,7 @@ ParseBoard12(string) } gameInfo.outOfBook = NULL; - + /* Do we have the ratings? */ if (strcmp(player1Name, white) == 0 && strcmp(player2Name, black) == 0) { @@ -3575,7 +3575,7 @@ ParseBoard12(string) SendToICS("set shout 0\n"); } } - + /* Deal with midgame name changes */ if (!newGame) { if (!gameInfo.white || strcmp(gameInfo.white, white) != 0) { @@ -3587,7 +3587,7 @@ ParseBoard12(string) gameInfo.black = StrSave(black); } } - + /* Throw away game result if anything actually changes in examine mode */ if (gameMode == IcsExamining && !newGame) { gameInfo.result = GameUnfinished; @@ -3596,7 +3596,7 @@ ParseBoard12(string) gameInfo.resultDetails = NULL; } } - + /* In pausing && IcsExamining mode, we ignore boards coming in if they are in a different variation than we are. */ if (pauseExamInvalid) return; @@ -3607,7 +3607,7 @@ ParseBoard12(string) return; } } - + if (appData.debugMode) { fprintf(debugFP, "load %dx%d board\n", files, ranks); } @@ -3676,14 +3676,14 @@ ParseBoard12(string) /* [HGM] e.p. rights. Assume that ICS sends file number here? */ epStatus[moveNum] = double_push == -1 ? EP_NONE : double_push + BOARD_LEFT; - + if (ics_getting_history == H_GOT_REQ_HEADER || ics_getting_history == H_GOT_UNREQ_HEADER) { /* This was an initial position from a move list, not the current position */ return; } - + /* Update currentMove and known move number limits */ newMove = newGame || moveNum > forwardMostMove; @@ -3712,7 +3712,7 @@ ParseBoard12(string) if (!pausing || currentMove > forwardMostMove) currentMove = forwardMostMove; } else { - /* New part of history that is not contiguous with old part */ + /* New part of history that is not contiguous with old part */ if (pausing && gameMode == IcsExamining) { pauseExamInvalid = TRUE; forwardMostMove = pauseExamForwardMostMove; @@ -3725,7 +3725,7 @@ ParseBoard12(string) SendToICS(str); } } - + /* Update the clocks */ if (strchr(elapsed_time, '.')) { /* Time is in ms */ @@ -3736,7 +3736,7 @@ ParseBoard12(string) timeRemaining[0][moveNum] = whiteTimeRemaining = white_time * 1000; timeRemaining[1][moveNum] = blackTimeRemaining = black_time * 1000; } - + #if ZIPPY if (appData.zippyPlay && newGame && @@ -3744,7 +3744,7 @@ ParseBoard12(string) gameMode != IcsExamining) ZippyFirstBoard(moveNum, basetime, increment); #endif - + /* Put the move on the move list, first converting to canonical algebraic form. */ if (moveNum > 0) { @@ -3775,18 +3775,18 @@ ParseBoard12(string) startedFromSetupPosition = TRUE; fromX = fromY = toX = toY = -1; } else { - // [HGM] long SAN: if legality-testing is off, disambiguation might not work or give wrong move. + // [HGM] long SAN: if legality-testing is off, disambiguation might not work or give wrong move. // So we parse the long-algebraic move string in stead of the SAN move int valid; char buf[MSG_SIZ], *prom; // str looks something like "Q/a1-a2"; kill the slash - if(str[1] == '/') + if(str[1] == '/') sprintf(buf, "%c%s", str[0], str+2); else strcpy(buf, str); // might be castling - if((prom = strstr(move_str, "=")) && !strstr(buf, "=")) + if((prom = strstr(move_str, "=")) && !strstr(buf, "=")) strcat(buf, prom); // long move lacks promo specification! if(!appData.testLegality && move_str[1] != '@') { // drops never ambiguous (parser chokes on long form!) - if(appData.debugMode) + if(appData.debugMode) fprintf(debugFP, "replaced ICS move '%s' by '%s'\n", move_str, buf); strcpy(move_str, buf); } @@ -3846,7 +3846,7 @@ ParseBoard12(string) #if ZIPPY /* Send move to chess program (BEFORE animating it). */ - if (appData.zippyPlay && !newGame && newMove && + if (appData.zippyPlay && !newGame && newMove && (!appData.getMoveList || backwardMostMove == 0) && first.initDone) { if ((gameMode == IcsPlayingWhite && WhiteOnMove(moveNum)) || @@ -3895,7 +3895,7 @@ ParseBoard12(string) SetHighlights(fromX, fromY, toX, toY); } } - + /* Start the clocks */ whiteFlag = blackFlag = FALSE; appData.clockMode = !(basetime == 0 && increment == 0); @@ -3912,26 +3912,26 @@ ParseBoard12(string) DisplayBothClocks(); else StartClocks(); - + /* Display opponents and material strengths */ if (gameInfo.variant != VariantBughouse && gameInfo.variant != VariantCrazyhouse && !appData.noGUI) { if (tinyLayout || smallLayout) { if(gameInfo.variant == VariantNormal) - sprintf(str, "%s(%d) %s(%d) {%d %d}", + sprintf(str, "%s(%d) %s(%d) {%d %d}", gameInfo.white, white_stren, gameInfo.black, black_stren, basetime, increment); else - sprintf(str, "%s(%d) %s(%d) {%d %d w%d}", + sprintf(str, "%s(%d) %s(%d) {%d %d w%d}", gameInfo.white, white_stren, gameInfo.black, black_stren, basetime, increment, (int) gameInfo.variant); } else { if(gameInfo.variant == VariantNormal) - sprintf(str, "%s (%d) vs. %s (%d) {%d %d}", + sprintf(str, "%s (%d) vs. %s (%d) {%d %d}", gameInfo.white, white_stren, gameInfo.black, black_stren, basetime, increment); else - sprintf(str, "%s (%d) vs. %s (%d) {%d %d %s}", + sprintf(str, "%s (%d) vs. %s (%d) {%d %d %s}", gameInfo.white, white_stren, gameInfo.black, black_stren, basetime, increment, VariantName(gameInfo.variant)); } @@ -3941,12 +3941,11 @@ ParseBoard12(string) } } - + /* Display the board */ if (!pausing && !appData.noGUI) { - if (appData.premove) - if (!gotPremove || + if (!gotPremove || ((gameMode == IcsPlayingWhite) && (WhiteOnMove(currentMove))) || ((gameMode == IcsPlayingBlack) && (!WhiteOnMove(currentMove)))) ClearPremoveHighlights(); @@ -3965,7 +3964,7 @@ ParseBoard12(string) if(bookHit) { // [HGM] book: simulate book reply static char bookMove[MSG_SIZ]; // a bit generous? - programStats.nodes = programStats.depth = programStats.time = + programStats.nodes = programStats.depth = programStats.time = programStats.score = programStats.got_only_move = 0; sprintf(programStats.movelist, "%s (xbook)", bookHit); @@ -4033,17 +4032,17 @@ SendMoveToProgram(moveNum, cps) AlphaRank(moveList[moveNum], 4); // and back } else /* Added by Tord: Send castle moves in "O-O" in FRC games if required by - * the engine. It would be nice to have a better way to identify castle + * the engine. It would be nice to have a better way to identify castle * moves here. */ if((gameInfo.variant == VariantFischeRandom || gameInfo.variant == VariantCapaRandom) && cps->useOOCastle) { - int fromX = moveList[moveNum][0] - AAA; + int fromX = moveList[moveNum][0] - AAA; int fromY = moveList[moveNum][1] - ONE; - int toX = moveList[moveNum][2] - AAA; + int toX = moveList[moveNum][2] - AAA; int toY = moveList[moveNum][3] - ONE; - if((boards[moveNum][fromY][fromX] == WhiteKing + if((boards[moveNum][fromY][fromX] == WhiteKing && boards[moveNum][toY][toX] == WhiteRook) - || (boards[moveNum][fromY][fromX] == BlackKing + || (boards[moveNum][fromY][fromX] == BlackKing && boards[moveNum][toY][toX] == BlackRook)) { if(toX > fromX) SendToProgram("O-O\n", cps); else SendToProgram("O-O-O\n", cps); @@ -4193,7 +4192,7 @@ AlphaRank(char *move, int n) fprintf(debugFP, "alphaRank(%s,%d)\n", move, n); } - if(move[1]=='*' && + if(move[1]=='*' && move[2]>='0' && move[2]<='9' && move[3]>='a' && move[3]<='x' ) { move[1] = '@'; @@ -4241,7 +4240,7 @@ ParseOneMove(move, moveNum, moveType, fromX, fromY, toX, toY, promoChar) ChessMove *moveType; int *fromX, *fromY, *toX, *toY; char *promoChar; -{ +{ if (appData.debugMode) { fprintf(debugFP, "move to parse: %s\n", move); } @@ -4364,7 +4363,7 @@ int put(Board board, int pieceType, int rank, int n, int shade) board[rank][i] = (ChessSquare) pieceType; squaresLeft[((i-BOARD_LEFT)&1) + 1]--; squaresLeft[ANY]--; - piecesLeft[pieceType]--; + piecesLeft[pieceType]--; return i; } } @@ -4492,7 +4491,7 @@ int SetCharTable( char *table, const char * map ) { int result = FALSE; int NrPieces; - if( map != NULL && (NrPieces=strlen(map)) <= (int) EmptySquare + if( map != NULL && (NrPieces=strlen(map)) <= (int) EmptySquare && NrPieces >= 12 && !(NrPieces&1)) { int i; /* [HGM] Accept even length from 12 to 34 */ @@ -4512,30 +4511,30 @@ int SetCharTable( char *table, const char * map ) void Prelude(Board board) { // [HGM] superchess: random selection of exo-pieces - int i, j, k; ChessSquare p; + int i, j, k; ChessSquare p; static ChessSquare exoPieces[4] = { WhiteAngel, WhiteMarshall, WhiteSilver, WhiteLance }; GetPositionNumber(); // use FRC position number if(appData.pieceToCharTable != NULL) { // select pieces to participate from given char table SetCharTable(pieceToChar, appData.pieceToCharTable); - for(i=(int)WhiteQueen+1, j=0; i<(int)WhiteKing && j<4; i++) + for(i=(int)WhiteQueen+1, j=0; i<(int)WhiteKing && j<4; i++) if(PieceToChar((ChessSquare)i) != '.') exoPieces[j++] = (ChessSquare) i; } - j = seed%4; seed /= 4; + j = seed%4; seed /= 4; p = board[0][BOARD_LEFT+j]; board[0][BOARD_LEFT+j] = EmptySquare; k = PieceToNumber(p); board[k][BOARD_WIDTH-1] = p; board[k][BOARD_WIDTH-2]++; board[BOARD_HEIGHT-1-k][0] = WHITE_TO_BLACK p; board[BOARD_HEIGHT-1-k][1]++; - j = seed%3 + (seed%3 >= j); seed /= 3; + j = seed%3 + (seed%3 >= j); seed /= 3; p = board[0][BOARD_LEFT+j]; board[0][BOARD_LEFT+j] = EmptySquare; k = PieceToNumber(p); board[k][BOARD_WIDTH-1] = p; board[k][BOARD_WIDTH-2]++; board[BOARD_HEIGHT-1-k][0] = WHITE_TO_BLACK p; board[BOARD_HEIGHT-1-k][1]++; - j = seed%3; seed /= 3; + j = seed%3; seed /= 3; p = board[0][BOARD_LEFT+j+5]; board[0][BOARD_LEFT+j+5] = EmptySquare; k = PieceToNumber(p); board[k][BOARD_WIDTH-1] = p; board[k][BOARD_WIDTH-2]++; board[BOARD_HEIGHT-1-k][0] = WHITE_TO_BLACK p; board[BOARD_HEIGHT-1-k][1]++; - j = seed%2 + (seed%2 >= j); seed /= 2; + j = seed%2 + (seed%2 >= j); seed /= 2; p = board[0][BOARD_LEFT+j+5]; board[0][BOARD_LEFT+j+5] = EmptySquare; k = PieceToNumber(p); board[k][BOARD_WIDTH-1] = p; board[k][BOARD_WIDTH-2]++; board[BOARD_HEIGHT-1-k][0] = WHITE_TO_BLACK p; board[BOARD_HEIGHT-1-k][1]++; @@ -4573,7 +4572,7 @@ InitPosition(redraw) castlingRank[3] = castlingRank[4] = castlingRank[5] = BOARD_HEIGHT-1; } - + /* [HGM] logic here is completely changed. In stead of full positions */ /* the initialized data only consist of the two backranks. The switch */ /* selects which one we will use, which is than copied to the Board */ @@ -4587,7 +4586,7 @@ InitPosition(redraw) gameInfo.holdingsSize = 0; nrCastlingRights = -1; /* [HGM] Kludge to indicate default should be used */ for(i=0; i=BOARD_RGHT-2) { initialPosition[2][j] = WhiteCannon; @@ -4756,7 +4755,7 @@ InitPosition(redraw) /* This sets default castling rights from none to normal corners */ /* Variants with other castling rights must set them themselves above */ nrCastlingRights = 6; - + castlingRights[0][0] = initialRights[0] = BOARD_RGHT-1; castlingRights[0][1] = initialRights[1] = BOARD_LEFT; castlingRights[0][2] = initialRights[2] = BOARD_WIDTH>>1; @@ -4781,7 +4780,7 @@ InitPosition(redraw) SetupFRC( initialPosition, appData.defaultFrcPosition ); } startedFromSetupPosition = TRUE; - } else + } else #else if (appData.debugMode) { fprintf(debugFP, "shuffleOpenings = %d\n", shuffleOpenings); @@ -4800,7 +4799,6 @@ InitPosition(redraw) } CopyBoard(boards[0], initialPosition); - if(oldx != gameInfo.boardWidth || oldy != gameInfo.boardHeight || oldh != gameInfo.holdingsWidth @@ -4813,10 +4811,13 @@ InitPosition(redraw) gameInfo.variant == VariantFalcon #endif ) + { InitDrawingSizes(-2 ,0); + } if (redraw) DrawPosition(TRUE, boards[currentMove]); + } void @@ -4825,7 +4826,7 @@ SendBoard(cps, moveNum) int moveNum; { char message[MSG_SIZ]; - + if (cps->useSetboard) { char* fen = PositionToFEN(moveNum, cps->fenOverride); sprintf(message, "setboard %s\n", fen); @@ -4846,7 +4847,7 @@ SendBoard(cps, moveNum) bp = &boards[moveNum][i][BOARD_LEFT]; for (j = BOARD_LEFT; j < BOARD_RGHT; j++, bp++) { if ((int) *bp < (int) BlackPawn) { - sprintf(message, "%c%c%c\n", PieceToChar(*bp), + sprintf(message, "%c%c%c\n", PieceToChar(*bp), AAA + j, ONE + i); if(message[0] == '+' || message[0] == '~') { sprintf(message, "%c%c%c+\n", @@ -4861,7 +4862,7 @@ SendBoard(cps, moveNum) } } } - + SendToProgram("c\n", cps); for (i = BOARD_HEIGHT - 1; i >= 0; i--) { bp = &boards[moveNum][i][BOARD_LEFT]; @@ -4883,7 +4884,7 @@ SendBoard(cps, moveNum) } } } - + SendToProgram(".\n", cps); } setboardSpoiledMachineBlack = 0; /* [HGM] assume WB 4.2.7 already solves this after sending setboard */ @@ -4993,11 +4994,11 @@ OKToStartUserMove(x, y) if (!white_piece && WhiteOnMove(currentMove)) { DisplayMoveError(_("It is White's turn")); return FALSE; - } + } if (white_piece && !WhiteOnMove(currentMove)) { DisplayMoveError(_("It is Black's turn")); return FALSE; - } + } if (cmailMsgLoaded && (currentMove < cmailOldMove)) { /* Editing correspondence game history */ /* Could disallow this or prompt for confirmation */ @@ -5020,16 +5021,16 @@ OKToStartUserMove(x, y) } } break; - + case Training: if (!white_piece && WhiteOnMove(currentMove)) { DisplayMoveError(_("It is White's turn")); return FALSE; - } + } if (white_piece && !WhiteOnMove(currentMove)) { DisplayMoveError(_("It is Black's turn")); return FALSE; - } + } break; default: @@ -5076,10 +5077,10 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar) (WhitePawn <= pdown && pdown < BlackPawn && WhitePawn <= pup && pup < BlackPawn || BlackPawn <= pdown && pdown < EmptySquare && - BlackPawn <= pup && pup < EmptySquare + BlackPawn <= pup && pup < EmptySquare ) && !((gameInfo.variant == VariantFischeRandom || gameInfo.variant == VariantCapaRandom) && (pup == WhiteRook && pdown == WhiteKing && fromY == 0 && toY == 0|| - pup == BlackRook && pdown == BlackKing && fromY == BOARD_HEIGHT-1 && toY == BOARD_HEIGHT-1 ) + pup == BlackRook && pdown == BlackKing && fromY == BOARD_HEIGHT-1 && toY == BOARD_HEIGHT-1 ) ) ) return ImpossibleMove; @@ -5154,7 +5155,7 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar) premoveFromY = fromY; premovePromoChar = promoChar; gotPremove = 1; - if (appData.debugMode) + if (appData.debugMode) fprintf(debugFP, "Got premove: fromX %d," "fromY %d, toX %d, toY %d\n", fromX, fromY, toX, toY); @@ -5181,7 +5182,7 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar) premoveFromY = fromY; premovePromoChar = promoChar; gotPremove = 1; - if (appData.debugMode) + if (appData.debugMode) fprintf(debugFP, "Got premove: fromX %d," "fromY %d, toX %d, toY %d\n", fromX, fromY, toX, toY); @@ -5214,7 +5215,7 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar) } /* [HGM] If move started in holdings, it means a drop */ - if( fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) { + if( fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) { if( pup != EmptySquare ) return ImpossibleMove; if(appData.testLegality) { /* it would be more logical if LegalityTest() also figured out @@ -5229,7 +5230,7 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar) } userOfferedDraw = FALSE; - + /* [HGM] always test for legality, to get promotion info */ moveType = LegalityTest(boards[currentMove], PosFlags(currentMove), epStatus[currentMove], castlingRights[currentMove], @@ -5242,7 +5243,7 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar) return ImpossibleMove; } } -if(appData.debugMode) fprintf(debugFP, "moveType 3 = %d, promochar = %x\n", moveType, promoChar); + if(appData.debugMode) fprintf(debugFP, "moveType 3 = %d, promochar = %x\n", moveType, promoChar); return moveType; /* [HGM] in stead of calling FinishMove directly, this function is made into one that returns an OK move type if FinishMove @@ -5260,43 +5261,63 @@ FinishMove(moveType, fromX, fromY, toX, toY, promoChar) int fromX, fromY, toX, toY; /*char*/int promoChar; { - char *bookHit = 0; -if(appData.debugMode) fprintf(debugFP, "moveType 5 = %d, promochar = %x\n", moveType, promoChar); - if((gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) && promoChar != NULLCHAR) { - // [HGM] superchess: suppress promotions to non-available piece - int k = PieceToNumber(CharToPiece(ToUpper(promoChar))); - if(WhiteOnMove(currentMove)) { - if(!boards[currentMove][k][BOARD_WIDTH-2]) return 0; - } else { - if(!boards[currentMove][BOARD_HEIGHT-1-k][1]) return 0; + char *bookHit = 0; + + if(appData.debugMode) + fprintf(debugFP, "moveType 5 = %d, promochar = %x\n", moveType, promoChar); + + if((gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) && promoChar != NULLCHAR) + { + // [HGM] superchess: suppress promotions to non-available piece + int k = PieceToNumber(CharToPiece(ToUpper(promoChar))); + if(WhiteOnMove(currentMove)) + { + if(!boards[currentMove][k][BOARD_WIDTH-2]) + return 0; + } + else + { + if(!boards[currentMove][BOARD_HEIGHT-1-k][1]) + return 0; } } + + /* [HGM] kludge to avoid having to know the exact promotion + move type in caller when we know the move is a legal promotion */ + if(moveType == NormalMove && promoChar) + moveType = PromoCharToMoveType(WhiteOnMove(currentMove), promoChar); - /* [HGM] kludge to avoid having to know the exact promotion - move type in caller when we know the move is a legal promotion */ - if(moveType == NormalMove && promoChar) - moveType = PromoCharToMoveType(WhiteOnMove(currentMove), promoChar); -if(appData.debugMode) fprintf(debugFP, "moveType 1 = %d, promochar = %x\n", moveType, promoChar); - /* [HGM] convert drag-and-drop piece drops to standard form */ - if( fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) { - moveType = WhiteOnMove(currentMove) ? WhiteDrop : BlackDrop; - if(appData.debugMode) fprintf(debugFP, "Drop move %d, curr=%d, x=%d,y=%d, p=%d\n", + if(appData.debugMode) + fprintf(debugFP, "moveType 1 = %d, promochar = %x\n", moveType, promoChar); + + /* [HGM] convert drag-and-drop piece drops to standard form */ + if( fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) + { + moveType = WhiteOnMove(currentMove) ? WhiteDrop : BlackDrop; + if(appData.debugMode) + fprintf(debugFP, "Drop move %d, curr=%d, x=%d,y=%d, p=%d\n", moveType, currentMove, fromX, fromY, boards[currentMove][fromY][fromX]); -// fromX = boards[currentMove][fromY][fromX]; - // holdings might not be sent yet in ICS play; we have to figure out which piece belongs here - if(fromX == 0) fromY = BOARD_HEIGHT-1 - fromY; // black holdings upside-down - fromX = fromX ? WhitePawn : BlackPawn; // first piece type in selected holdings - while(PieceToChar(fromX) == '.' || PieceToNumber(fromX) != fromY && fromX != (int) EmptySquare) fromX++; - fromY = DROP_RANK; - } - - /* [HGM] The following if has been moved here from - UserMoveEvent(). Because it seemed to belon here (why not allow - piece drops in training games?), and because it can only be - performed after it is known to what we promote. */ - if (gameMode == Training) { + // fromX = boards[currentMove][fromY][fromX]; + // holdings might not be sent yet in ICS play; we have to figure out which piece belongs here + if(fromX == 0) + fromY = BOARD_HEIGHT-1 - fromY; // black holdings upside-down + + fromX = fromX ? WhitePawn : BlackPawn; // first piece type in selected holdings + + while(PieceToChar(fromX) == '.' || PieceToNumber(fromX) != fromY && fromX != (int) EmptySquare) + fromX++; + + fromY = DROP_RANK; + } + + /* [HGM] The following if has been moved here from + UserMoveEvent(). Because it seemed to belon here (why not allow + piece drops in training games?), and because it can only be + performed after it is known to what we promote. */ + if (gameMode == Training) + { /* compare the move played on the board to the next move in the - * game. If they match, display the move and the opponent's response. + * game. If they match, display the move and the opponent's response. * If they don't match, display an error message. */ int saveAnimate; @@ -5304,36 +5325,41 @@ if(appData.debugMode) fprintf(debugFP, "moveType 1 = %d, promochar = %x\n", move CopyBoard(testBoard, boards[currentMove]); ApplyMove(fromX, fromY, toX, toY, promoChar, testBoard, testRights, &testStatus); - if (CompareBoards(testBoard, boards[currentMove+1])) { - ForwardInner(currentMove+1); + if (CompareBoards(testBoard, boards[currentMove+1])) + { + ForwardInner(currentMove+1); - /* Autoplay the opponent's response. - * if appData.animate was TRUE when Training mode was entered, - * the response will be animated. - */ - saveAnimate = appData.animate; - appData.animate = animateTraining; - ForwardInner(currentMove+1); - appData.animate = saveAnimate; - - /* check for the end of the game */ - if (currentMove >= forwardMostMove) { - gameMode = PlayFromGameFile; - ModeHighlight(); - SetTrainingModeOff(); - DisplayInformation(_("End of game")); + /* Autoplay the opponent's response. + * if appData.animate was TRUE when Training mode was entered, + * the response will be animated. + */ + saveAnimate = appData.animate; + appData.animate = animateTraining; + ForwardInner(currentMove+1); + appData.animate = saveAnimate; + + /* check for the end of the game */ + if (currentMove >= forwardMostMove) + { + gameMode = PlayFromGameFile; + ModeHighlight(); + SetTrainingModeOff(); + DisplayInformation(_("End of game")); + } + } + else + { + DisplayError(_("Incorrect move"), 0); } - } else { - DisplayError(_("Incorrect move"), 0); - } return 1; } /* Ok, now we know that the move is good, so we can kill the previous line in Analysis Mode */ - if (gameMode == AnalyzeMode && currentMove < forwardMostMove) { - forwardMostMove = currentMove; - } + if (gameMode == AnalyzeMode && currentMove < forwardMostMove) + { + forwardMostMove = currentMove; + } /* If we need the chess program but it's dead, restart it */ ResurrectChessProgram(); @@ -5346,93 +5372,115 @@ if(appData.debugMode) fprintf(debugFP, "moveType 1 = %d, promochar = %x\n", move MakeMove(fromX, fromY, toX, toY, promoChar); /*updates forwardMostMove*/ - if (gameMode == BeginningOfGame) { - if (appData.noChessProgram) { - gameMode = EditGame; - SetGameInfo(); - } else { - char buf[MSG_SIZ]; - gameMode = MachinePlaysBlack; - StartClocks(); - SetGameInfo(); - sprintf(buf, "%s vs. %s", gameInfo.white, gameInfo.black); - DisplayTitle(buf); - if (first.sendName) { - sprintf(buf, "name %s\n", gameInfo.white); - SendToProgram(buf, &first); - } - StartClocks(); + if (gameMode == BeginningOfGame) + { + if (appData.noChessProgram) + { + gameMode = EditGame; + SetGameInfo(); + } + else + { + char buf[MSG_SIZ]; + gameMode = MachinePlaysBlack; + StartClocks(); + SetGameInfo(); + sprintf(buf, "%s vs. %s", gameInfo.white, gameInfo.black); + DisplayTitle(buf); + if (first.sendName) + { + sprintf(buf, "name %s\n", gameInfo.white); + SendToProgram(buf, &first); + } + StartClocks(); + } + ModeHighlight(); } - ModeHighlight(); - } -if(appData.debugMode) fprintf(debugFP, "moveType 2 = %d, promochar = %x\n", moveType, promoChar); + if(appData.debugMode) fprintf(debugFP, "moveType 2 = %d, promochar = %x\n", moveType, promoChar); + /* Relay move to ICS or chess engine */ - if (appData.icsActive) { - if (gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack || - gameMode == IcsExamining) { - SendMoveToICS(moveType, fromX, fromY, toX, toY); - ics_user_moved = 1; + if (appData.icsActive) + { + if (gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack || + gameMode == IcsExamining) + { + SendMoveToICS(moveType, fromX, fromY, toX, toY); + ics_user_moved = 1; + } } - } else { - if (first.sendTime && (gameMode == BeginningOfGame || - gameMode == MachinePlaysWhite || - gameMode == MachinePlaysBlack)) { - SendTimeRemaining(&first, gameMode != MachinePlaysBlack); - } - if (gameMode != EditGame && gameMode != PlayFromGameFile) { - // [HGM] book: if program might be playing, let it use book - bookHit = SendMoveToBookUser(forwardMostMove-1, &first, FALSE); - first.maybeThinking = TRUE; - } else SendMoveToProgram(forwardMostMove-1, &first); - if (currentMove == cmailOldMove + 1) { - cmailMoveType[lastLoadGameNumber - 1] = CMAIL_MOVE; + else + { + if (first.sendTime && (gameMode == BeginningOfGame || + gameMode == MachinePlaysWhite || + gameMode == MachinePlaysBlack)) + { + SendTimeRemaining(&first, gameMode != MachinePlaysBlack); + } + if (gameMode != EditGame && gameMode != PlayFromGameFile) + { + // [HGM] book: if program might be playing, let it use book + bookHit = SendMoveToBookUser(forwardMostMove-1, &first, FALSE); + first.maybeThinking = TRUE; + } + else + SendMoveToProgram(forwardMostMove-1, &first); + if (currentMove == cmailOldMove + 1) + { + cmailMoveType[lastLoadGameNumber - 1] = CMAIL_MOVE; + } } - } ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/ - switch (gameMode) { - case EditGame: - switch (MateTest(boards[currentMove], PosFlags(currentMove), - EP_UNKNOWN, castlingRights[currentMove]) ) { - case MT_NONE: - case MT_CHECK: + switch (gameMode) + { + case EditGame: + switch (MateTest(boards[currentMove], PosFlags(currentMove), + EP_UNKNOWN, castlingRights[currentMove]) ) + { + case MT_NONE: + case MT_CHECK: + break; + case MT_CHECKMATE: + case MT_STAINMATE: + if (WhiteOnMove(currentMove)) + { + GameEnds(BlackWins, "Black mates", GE_PLAYER); + } + else + { + GameEnds(WhiteWins, "White mates", GE_PLAYER); + } + break; + case MT_STALEMATE: + GameEnds(GameIsDrawn, "Stalemate", GE_PLAYER); + break; + } break; - case MT_CHECKMATE: - case MT_STAINMATE: - if (WhiteOnMove(currentMove)) { - GameEnds(BlackWins, "Black mates", GE_PLAYER); - } else { - GameEnds(WhiteWins, "White mates", GE_PLAYER); - } + + case MachinePlaysBlack: + case MachinePlaysWhite: + /* disable certain menu options while machine is thinking */ + SetMachineThinkingEnables(); break; - case MT_STALEMATE: - GameEnds(GameIsDrawn, "Stalemate", GE_PLAYER); + + default: break; } - break; - - case MachinePlaysBlack: - case MachinePlaysWhite: - /* disable certain menu options while machine is thinking */ - SetMachineThinkingEnables(); - break; - - default: - break; - } - if(bookHit) { // [HGM] book: simulate book reply - static char bookMove[MSG_SIZ]; // a bit generous? + if(bookHit) + { // [HGM] book: simulate book reply + static char bookMove[MSG_SIZ]; // a bit generous? - programStats.nodes = programStats.depth = programStats.time = + programStats.nodes = programStats.depth = programStats.time = programStats.score = programStats.got_only_move = 0; - sprintf(programStats.movelist, "%s (xbook)", bookHit); + sprintf(programStats.movelist, "%s (xbook)", bookHit); + + strcpy(bookMove, "move "); + strcat(bookMove, bookHit); + HandleMachineMove(bookMove, &first); + } - strcpy(bookMove, "move "); - strcat(bookMove, bookHit); - HandleMachineMove(bookMove, &first); - } return 1; } @@ -5448,7 +5496,7 @@ UserMoveEvent(fromX, fromY, toX, toY, promoChar) slip a promotion popup in between. But that it always needs two calls, to the first part, (now called UserMoveTest() ), and to FinishMove if the first part succeeded. Calls that do not need - to do anything in between, can call this routine the old way. + to do anything in between, can call this routine the old way. */ ChessMove moveType = UserMoveTest(fromX, fromY, toX, toY, promoChar); if(appData.debugMode) fprintf(debugFP, "moveType 4 = %d, promochar = %x\n", moveType, promoChar); @@ -5510,7 +5558,7 @@ char *SendMoveToBookUser(int moveNr, ChessProgramState *cps, int initial) cps->bookSuspend = FALSE; // after a 'go' we are never suspended } else { // 'go' might be sent based on 'firstMove' after this routine returns if(cps->bookSuspend && !firstMove) // 'go' needed, and it will not be done after we return - SendToProgram("go\n", cps); + SendToProgram("go\n", cps); cps->bookSuspend = FALSE; // anyhow, we will not be suspended after a miss } return bookHit; // notify caller of hit, so it can take action to send move to opponent @@ -5577,7 +5625,7 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h * Look for machine move. */ if ((sscanf(message, "%s %s %s", buf1, buf2, machineMove) == 3 && strcmp(buf2, "...") == 0) || - (sscanf(message, "%s %s", buf1, machineMove) == 2 && strcmp(buf1, "move") == 0)) + (sscanf(message, "%s %s", buf1, machineMove) == 2 && strcmp(buf1, "move") == 0)) { /* This method is only useful on engines that support ping */ if (cps->lastPing != cps->lastPong) { @@ -5768,8 +5816,8 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. if( count >= adjudicateLossPlies ) { ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/ - GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, - "Xboard adjudication", + GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, + "Xboard adjudication", GE_XBOARD ); return; @@ -5821,7 +5869,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. NrWQ++; break; case BlackQueen: NrBQ++; break; - case EmptySquare: + case EmptySquare: break; case BlackPawn: m = 7-i; @@ -5830,7 +5878,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. } NrPieces += (p != EmptySquare); NrW += ((int)p < (int)BlackPawn); - if(gameInfo.variant == VariantXiangqi && + if(gameInfo.variant == VariantXiangqi && (p == WhiteFerz || p == WhiteAlfil || p == BlackFerz || p == BlackAlfil)) { NrPieces--; // [HGM] XQ: do not count purely defensive pieces NrW -= ((int)p < (int)BlackPawn); @@ -5844,7 +5892,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. if(appData.checkMates) { SendMoveToProgram(forwardMostMove-1, cps->other); // make sure opponent gets move ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/ - GameEnds( WhiteOnMove(forwardMostMove) ? BlackWins : WhiteWins, + GameEnds( WhiteOnMove(forwardMostMove) ? BlackWins : WhiteWins, "Xboard adjudication: King destroyed", GE_XBOARD ); return; } @@ -5857,7 +5905,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. if(appData.checkMates) { SendMoveToProgram(forwardMostMove-1, cps->other); // make sure opponent gets to see move ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/ - GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, + GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, "Xboard adjudication: Bare king", GE_XBOARD ); return; } @@ -5869,7 +5917,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. /* but only adjudicate if adjudication enabled */ SendMoveToProgram(forwardMostMove-1, cps->other); // make sure opponent gets move ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/ - GameEnds( NrW > 1 ? WhiteWins : NrPieces - NrW > 1 ? BlackWins : GameIsDrawn, + GameEnds( NrW > 1 ? WhiteWins : NrPieces - NrW > 1 ? BlackWins : GameIsDrawn, "Xboard adjudication: Bare king", GE_XBOARD ); return; } @@ -5935,7 +5983,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. } /* Next absolutely insufficient mating material. */ - if( NrPieces == 2 || gameInfo.variant != VariantXiangqi && + if( NrPieces == 2 || gameInfo.variant != VariantXiangqi && gameInfo.variant != VariantShatranj && // [HGM] baring will remain possible (NrPieces == 3 && NrWN+NrBN+NrWB+NrBB == 1 || NrPieces == NrBB+NrWB+2 && bishopsColor != 3)) // [HGM] all Bishops (Ferz!) same color @@ -5955,7 +6003,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. } /* Then some trivial draws (only adjudicate, cannot be claimed) */ - if(NrPieces == 4 && + if(NrPieces == 4 && ( NrWR == 1 && NrBR == 1 /* KRKR */ || NrWQ==1 && NrBQ==1 /* KQKQ */ || NrWN==2 || NrBN==2 /* KNNK */ @@ -6012,7 +6060,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. } if( castlingRights[forwardMostMove][5] != castlingRights[k][5] && (castlingRights[k][3] >= 0 || castlingRights[k][4] >= 0) ) - rights++; + rights++; if( castlingRights[forwardMostMove][5] >= 0 ) { if( castlingRights[forwardMostMove][3] != castlingRights[k][3] || castlingRights[forwardMostMove][4] != castlingRights[k][4] ) @@ -6034,21 +6082,21 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. SendToProgram("force\n", cps->other); // suppress reply SendMoveToProgram(forwardMostMove-1, cps->other); /* make sure opponent gets to see move */ ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/ - if(gameInfo.variant == VariantXiangqi && appData.testLegality) { + if(gameInfo.variant == VariantXiangqi && appData.testLegality) { // [HGM] xiangqi: check for forbidden perpetuals int m, ourPerpetual = 1, hisPerpetual = 1; for(m=forwardMostMove; m>k; m-=2) { - if(MateTest(boards[m], PosFlags(m), + if(MateTest(boards[m], PosFlags(m), EP_NONE, castlingRights[m]) != MT_CHECK) ourPerpetual = 0; // the current mover did not always check - if(MateTest(boards[m-1], PosFlags(m-1), + if(MateTest(boards[m-1], PosFlags(m-1), EP_NONE, castlingRights[m-1]) != MT_CHECK) hisPerpetual = 0; // the opponent did not always check } if(appData.debugMode) fprintf(debugFP, "XQ perpetual test, our=%d, his=%d\n", ourPerpetual, hisPerpetual); if(ourPerpetual && !hisPerpetual) { // we are actively checking him: forfeit - GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, + GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, "Xboard adjudication: perpetual checking", GE_XBOARD ); return; } @@ -6059,7 +6107,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. hisPerpetual = PerpetualChase(k, forwardMostMove); ourPerpetual = PerpetualChase(k+1, forwardMostMove); if(ourPerpetual && !hisPerpetual) { // we are actively chasing him: forfeit - GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, + GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, "Xboard adjudication: perpetual chasing", GE_XBOARD ); return; } @@ -6084,7 +6132,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. /* if we hit starting position, add initial plies */ if( count == backwardMostMove ) count -= initialRulePlies; - count = forwardMostMove - count; + count = forwardMostMove - count; if( count >= 100) epStatus[forwardMostMove] = EP_RULE_DRAW; /* this is used to judge if draw claims are legal */ @@ -6153,12 +6201,12 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. } ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/ - + if (!pausing && appData.ringBellAfterMoves) { RingBell(); } - /* + /* * Reenable menu items that were disabled while * machine was thinking */ @@ -6175,7 +6223,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. strcat(bookMove, bookHit); message = bookMove; cps = cps->other; - programStats.nodes = programStats.depth = programStats.time = + programStats.nodes = programStats.depth = programStats.time = programStats.score = programStats.got_only_move = 0; sprintf(programStats.movelist, "%s (xbook)", bookHit); @@ -6224,7 +6272,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. for( i=0; ipr); return; } - /* Commands from the engine directly to ICS. We don't allow these to be - * sent until we are logged on. Crafty kibitzes have been known to + /* Commands from the engine directly to ICS. We don't allow these to be + * sent until we are logged on. Crafty kibitzes have been known to * interfere with the login process. */ if (loggedOn) { @@ -6318,7 +6366,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. */ if (strncmp(message + 1, "llegal move", 11) == 0 || strncmp(message, "Error", 5) == 0) { - if (StrStr(message, "name") || + if (StrStr(message, "name") || StrStr(message, "rating") || StrStr(message, "?") || StrStr(message, "result") || StrStr(message, "board") || StrStr(message, "bk") || StrStr(message, "computer") || @@ -6384,7 +6432,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. message in analyze mored would be ignored. */ if (cps == &first && programStats.ok_to_send == 0) { /* Bogus message from Crafty responding to "." This filtering - can miss some of the bad messages, but fortunately the bug + can miss some of the bad messages, but fortunately the bug is fixed in current Crafty versions, so it doesn't matter. */ return; } @@ -6418,7 +6466,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. Don't use it. */ cps->sendTime = 0; } - + /* * If chess program startup fails, exit with an error message. * Attempts to recover here are futile. @@ -6437,8 +6485,8 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. DisplayFatalError(buf1, 0, 1); return; } - - /* + + /* * Look for hint output */ if (sscanf(message, "Hint: %s", buf1) == 1) { @@ -6512,7 +6560,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. r = p + 1; } } - + GameEnds(GameIsDrawn, r, GE_ENGINE1 + (cps != &first)); return; @@ -6644,7 +6692,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. } } - + /* * Look for thinking output */ @@ -6694,7 +6742,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. } /* [AS] Negate score if machine is playing black and reporting absolute scores */ - if( cps->scoreIsAbsolute && + if( cps->scoreIsAbsolute && ((gameMode == MachinePlaysBlack) || (gameMode == TwoMachinesPlay && cps->twoMachinesColor[0] == 'b')) ) { curscore = -curscore; @@ -6712,7 +6760,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. if(cps->nps == 0) ticklen = 10*time; // use engine reported time else ticklen = (1000. * u64ToDouble(nodes)) / cps->nps; // convert node count to time - if(WhiteOnMove(forwardMostMove)) + if(WhiteOnMove(forwardMostMove)) whiteTimeRemaining = timeRemaining[0][forwardMostMove] - ticklen; else blackTimeRemaining = timeRemaining[1][forwardMostMove] - ticklen; } @@ -6745,12 +6793,12 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. SendProgramStatsToFrontend( cps, &programStats ); - /* + /* [AS] Protect the thinkOutput buffer from overflow... this is only useful if buf1 hasn't overflowed first! */ sprintf(thinkOutput, "[%d]%c%+.2f %s%s", - plylev, + plylev, (gameMode == TwoMachinesPlay ? ToUpper(cps->twoMachinesColor[0]) : ' '), ((double) curscore) / 100.0, @@ -6797,8 +6845,8 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. programStats.line_is_book = 1; SendProgramStatsToFrontend( cps, &programStats ); - - if (currentMove == forwardMostMove || gameMode==AnalyzeMode || + + if (currentMove == forwardMostMove || gameMode==AnalyzeMode || gameMode == AnalyzeFile || appData.icsEngineAnalyze) { DisplayMove(currentMove - 1); DisplayAnalysis(); @@ -6871,7 +6919,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. buf1[0] = NULLCHAR; if (sscanf(message, "%d%c %d %d " u64Display " %[^\n]\n", - &plylev, &plyext, &curscore, &time, &nodes, buf1) >= 5) + &plylev, &plyext, &curscore, &time, &nodes, buf1) >= 5) { ChessProgramStats cpstats; @@ -6909,7 +6957,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats. /* Parse a game score from the character string "game", and record it as the history of the current game. The game - score is NOT assumed to start from the standard position. + score is NOT assumed to start from the standard position. The display is not updated in any way. */ void @@ -7085,7 +7133,7 @@ ParseGameHistory(game) strcpy(moveList[boardIndex], currentMoveString); strcat(moveList[boardIndex], "\n"); boardIndex++; - ApplyMove(fromX, fromY, toX, toY, promoChar, boards[boardIndex], + ApplyMove(fromX, fromY, toX, toY, promoChar, boards[boardIndex], castlingRights[boardIndex], &epStatus[boardIndex]); switch (MateTest(boards[boardIndex], PosFlags(boardIndex), EP_UNKNOWN, castlingRights[boardIndex]) ) { @@ -7125,8 +7173,8 @@ ApplyMove(fromX, fromY, toX, toY, promoChar, board, castling, ep) oldEP = *ep; *ep = EP_NONE; - if( board[toY][toX] != EmptySquare ) - *ep = EP_CAPTURE; + if( board[toY][toX] != EmptySquare ) + *ep = EP_CAPTURE; if( board[fromY][fromX] == WhitePawn ) { if(fromY != toY) // [HGM] Xiangqi sideway Pawn moves should not count as 50-move breakers @@ -7136,26 +7184,26 @@ ApplyMove(fromX, fromY, toX, toY, promoChar, board, castling, ep) gameInfo.variant != VariantBerolina || toX < fromX) *ep = toX | berolina; if(toX fromX) + gameInfo.variant != VariantBerolina || toX > fromX) *ep = toX; } - } else + } else if( board[fromY][fromX] == BlackPawn ) { if(fromY != toY) // [HGM] Xiangqi sideway Pawn moves should not count as 50-move breakers - *ep = EP_PAWN_MOVE; + *ep = EP_PAWN_MOVE; if( toY-fromY== -2) { if(toX>BOARD_LEFT && board[toY][toX-1] == WhitePawn && gameInfo.variant != VariantBerolina || toX < fromX) *ep = toX | berolina; if(toX fromX) + gameInfo.variant != VariantBerolina || toX > fromX) *ep = toX; } } for(i=0; i 0 && gameInfo.variant != VariantBughouse ) { /* [HGM] holdings: Add to holdings, if holdings exist */ - if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) { + if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) { // [HGM] superchess: suppress flipping color of captured pieces by reverse pre-flip captured = (int) captured >= (int) BlackPawn ? BLACK_TO_WHITE captured : WHITE_TO_BLACK captured; } @@ -7395,8 +7443,8 @@ ApplyMove(fromX, fromY, toX, toY, promoChar, board, castling, ep) board[toY][toX] = (ChessSquare) (PROMOTED piece); } - if((gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) - && promoChar != NULLCHAR && gameInfo.holdingsSize) { + if((gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) + && promoChar != NULLCHAR && gameInfo.holdingsSize) { // [HGM] superchess: take promotion piece out of holdings int k = PieceToNumber(CharToPiece(ToUpper(promoChar))); if((int)piece < (int)BlackPawn) { // determine stm from piece color @@ -7425,10 +7473,10 @@ MakeMove(fromX, fromY, toX, toY, promoChar) if(gameInfo.variant == VariantKnightmate) king += (int) WhiteUnicorn - (int) WhiteKing; if(forwardMostMove == 0) { - if(blackPlaysFirst) + if(blackPlaysFirst) fprintf(serverMoves, "%s;", second.tidy); fprintf(serverMoves, "%s;", first.tidy); - if(!blackPlaysFirst) + if(!blackPlaysFirst) fprintf(serverMoves, "%s;", second.tidy); } else fprintf(serverMoves, loadFlag|lastLoadFlag ? ":" : ";"); lastLoadFlag = loadFlag; @@ -7474,7 +7522,7 @@ MakeMove(fromX, fromY, toX, toY, promoChar) } CopyBoard(boards[forwardMostMove+1], boards[forwardMostMove]); {int i; for(i=0; ivariants, b) == NULL) { + if(StrStr(cps->variants, b) == NULL) { // specific sized variant not known, check if general sizing allowed if (cps->protocolVersion != 1) { // for protocol 1 we cannot check and hope for the best if(StrStr(cps->variants, "boardsize") == NULL) { @@ -7666,7 +7723,7 @@ InitChessProgram(cps, setup) timeIncrement, appData.searchDepth, searchTime); } - if (appData.showThinking + if (appData.showThinking // [HGM] thinking: four options require thinking output to be sent || !appData.hideThinkingFromHuman || appData.adjudicateLossThreshold != 0 || EngineOutputIsUp() ) { @@ -7685,7 +7742,7 @@ InitChessProgram(cps, setup) SendToProgram(buf, cps); } cps->initDone = TRUE; -} +} void @@ -7712,7 +7769,7 @@ StartChessProgram(cps) } err = StartChildProcess(buf, "", &cps->pr); } - + if (err != 0) { sprintf(buf, _("Startup failure on '%s'"), cps->program); DisplayFatalError(buf, err, 1); @@ -7720,7 +7777,7 @@ StartChessProgram(cps) cps->isr = NULL; return; } - + cps->isr = AddInputSource(cps->pr, TRUE, ReceiveFromProgram, cps); if (cps->protocolVersion > 1) { sprintf(buf, "xboard\nprotover %d\n", cps->protocolVersion); @@ -7760,7 +7817,7 @@ NextMatchGame P((void)) if(index < 0) { // [HGM] autoinc lastIndex = index = (index == -2 && first.twoMachinesColor[0] == 'b') ? lastIndex : lastIndex+1; if(appData.rewindIndex > 0 && index > appData.rewindIndex) lastIndex = index = 1; - } + } LoadGameFromFile(appData.loadGameFile, index, appData.loadGameFile, FALSE); @@ -7769,7 +7826,7 @@ NextMatchGame P((void)) if(index < 0) { // [HGM] autoinc lastIndex = index = (index == -2 && first.twoMachinesColor[0] == 'b') ? lastIndex : lastIndex+1; if(appData.rewindIndex > 0 && index > appData.rewindIndex) lastIndex = index = 1; - } + } LoadPositionFromFile(appData.loadPositionFile, index, appData.loadPositionFile); @@ -7836,8 +7893,8 @@ GameEnds(result, resultDetails, whosays) if (appData.icsActive && (whosays == GE_ENGINE || whosays >= GE_ENGINE1)) { /* If we are playing on ICS, the server decides when the - game is over, but the engine can offer to draw, claim - a draw, or resign. + game is over, but the engine can offer to draw, claim + a draw, or resign. */ #if ZIPPY if (appData.zippyPlay && first.initDone) { @@ -7866,17 +7923,17 @@ GameEnds(result, resultDetails, whosays) /* If this is an ICS game, only ICS can really say it's done; if not, anyone can. */ - isIcsGame = (gameMode == IcsPlayingWhite || - gameMode == IcsPlayingBlack || - gameMode == IcsObserving || + isIcsGame = (gameMode == IcsPlayingWhite || + gameMode == IcsPlayingBlack || + gameMode == IcsObserving || gameMode == IcsExamining); if (!isIcsGame || whosays == GE_ICS) { /* OK -- not an ICS game, or ICS said it was done */ StopClocks(); - if (!isIcsGame && !appData.noChessProgram) + if (!isIcsGame && !appData.noChessProgram) SetUserThinkingEnables(); - + /* [HGM] if a machine claims the game end we verify this claim */ if(gameMode == TwoMachinesPlay && appData.testClaims) { if(appData.testLegality && whosays >= GE_ENGINE1 ) { @@ -7927,9 +7984,10 @@ GameEnds(result, resultDetails, whosays) } /* (Claiming a loss is accepted no questions asked!) */ } + /* [HGM] bare: don't allow bare King to win */ if((gameInfo.holdingsWidth == 0 || gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) - && gameInfo.variant != VariantLosers && gameInfo.variant != VariantGiveaway + && gameInfo.variant != VariantLosers && gameInfo.variant != VariantGiveaway && gameInfo.variant != VariantSuicide // [HGM] losers: except in losers, of course... && result != GameIsDrawn) { int i, j, k=0, color = (result==WhiteWins ? (int)WhitePawn : (int)BlackPawn); @@ -7949,7 +8007,6 @@ GameEnds(result, resultDetails, whosays) } } - if(serverMoves != NULL && !loadFlag) { char c = '='; if(result==WhiteWins) c = '+'; if(result==BlackWins) c = '-'; @@ -7963,7 +8020,7 @@ GameEnds(result, resultDetails, whosays) /* display last move only if game was not loaded from file */ if ((whosays != GE_FILE) && (currentMove == forwardMostMove)) DisplayMove(currentMove - 1); - + if (forwardMostMove != 0) { if (gameMode != PlayFromGameFile && gameMode != EditGame && lastSavedGame != GameCheckSum() // [HGM] save: suppress duplicates @@ -8044,8 +8101,8 @@ GameEnds(result, resultDetails, whosays) } } } else if (gameMode == EditGame || - gameMode == PlayFromGameFile || - gameMode == AnalyzeMode || + gameMode == PlayFromGameFile || + gameMode == AnalyzeMode || gameMode == AnalyzeFile) { nextGameMode = gameMode; } else { @@ -8085,7 +8142,7 @@ GameEnds(result, resultDetails, whosays) if (first.isr != NULL) RemoveInputSource(first.isr); first.isr = NULL; - + if (first.pr != NoProc) { ExitAnalyzeMode(); DoSleep( appData.delayBeforeQuit ); @@ -8111,7 +8168,7 @@ GameEnds(result, resultDetails, whosays) if (second.isr != NULL) RemoveInputSource(second.isr); second.isr = NULL; - + if (second.pr != NoProc) { DoSleep( appData.delayBeforeQuit ); SendToProgram("quit\n", &second); @@ -8175,12 +8232,12 @@ GameEnds(result, resultDetails, whosays) /* Assumes program was just initialized (initString sent). Leaves program in force mode. */ void -FeedMovesToProgram(cps, upto) +FeedMovesToProgram(cps, upto) ChessProgramState *cps; int upto; { int i; - + if (appData.debugMode) fprintf(debugFP, "Feeding %smoves %d through %d to %s chess program\n", startedFromSetupPosition ? "position and " : "", @@ -8213,7 +8270,7 @@ ResurrectChessProgram() If so, restart it and feed it all the moves made so far. */ if (appData.noChessProgram || first.pr != NoProc) return; - + StartChessProgram(&first); InitChessProgram(&first, FALSE); FeedMovesToProgram(&first, currentMove); @@ -8266,7 +8323,7 @@ Reset(redraw, init) white_holding[0] = black_holding[0] = NULLCHAR; ClearProgramStats(); opponentKibitzes = FALSE; // [HGM] kibitz: do not reserve space in engine-output window in zippy mode - + ResetFrontEnd(); ClearHighlights(); flipView = appData.flipView; @@ -8291,6 +8348,7 @@ Reset(redraw, init) ExitAnalyzeMode(); gameMode = BeginningOfGame; ModeHighlight(); + if(appData.icsActive) gameInfo.variant = VariantNormal; currentMove = forwardMostMove = backwardMostMove = 0; InitPosition(redraw); @@ -8300,6 +8358,7 @@ Reset(redraw, init) commentList[i] = NULL; } } + ResetClocks(); timeRemaining[0][0] = whiteTimeRemaining; timeRemaining[1][0] = blackTimeRemaining; @@ -8309,10 +8368,12 @@ Reset(redraw, init) if (init) { InitChessProgram(&first, startedFromSetupPosition); } + DisplayTitle(""); DisplayMessage("", ""); HistorySet(parseList, backwardMostMove, forwardMostMove, currentMove-1); lastSavedGame = 0; // [HGM] save: make sure next game counts as unsaved + return; } void @@ -8352,7 +8413,7 @@ AutoPlayOneMove() return FALSE; } - + toX = moveList[currentMove][2] - AAA; toY = moveList[currentMove][3] - ONE; @@ -8391,13 +8452,13 @@ LoadGameOneMove(readAhead) ChessMove moveType; char move[MSG_SIZ]; char *p, *q; - - if (gameMode != PlayFromGameFile && gameMode != AnalyzeFile && + + if (gameMode != PlayFromGameFile && gameMode != AnalyzeFile && gameMode != AnalyzeMode && gameMode != Training) { gameFileFP = NULL; return FALSE; } - + yyboardindex = forwardMostMove; if (readAhead != (ChessMove)0) { moveType = readAhead; @@ -8406,11 +8467,11 @@ LoadGameOneMove(readAhead) return FALSE; moveType = (ChessMove) yylex(); } - + done = FALSE; switch (moveType) { case Comment: - if (appData.debugMode) + if (appData.debugMode) fprintf(debugFP, "Parsed Comment: %s\n", yy_text); p = yy_text; if (*p == '{' || *p == '[' || *p == '(') { @@ -8629,7 +8690,7 @@ LoadGameOneMove(readAhead) /* currentMoveString is set as a side-effect of yylex */ strcat(currentMoveString, "\n"); strcpy(moveList[forwardMostMove], currentMoveString); - + thinkOutput[0] = NULLCHAR; MakeMove(fromX, fromY, toX, toY, promoChar); currentMove = forwardMostMove; @@ -8692,7 +8753,7 @@ MakeRegisteredMove() if (appData.debugMode) fprintf(debugFP, "Restoring %s for game %d\n", cmailMove[lastLoadGameNumber - 1], lastLoadGameNumber); - + thinkOutput[0] = NULLCHAR; strcpy(moveList[currentMove], cmailMove[lastLoadGameNumber - 1]); fromX = cmailMove[lastLoadGameNumber - 1][0] - AAA; @@ -8702,13 +8763,13 @@ MakeRegisteredMove() promoChar = cmailMove[lastLoadGameNumber - 1][4]; MakeMove(fromX, fromY, toX, toY, promoChar); ShowMove(fromX, fromY, toX, toY); - + switch (MateTest(boards[currentMove], PosFlags(currentMove), EP_UNKNOWN, castlingRights[currentMove]) ) { case MT_NONE: case MT_CHECK: break; - + case MT_CHECKMATE: case MT_STAINMATE: if (WhiteOnMove(currentMove)) { @@ -8717,14 +8778,14 @@ MakeRegisteredMove() GameEnds(WhiteWins, "White mates", GE_PLAYER); } break; - + case MT_STALEMATE: GameEnds(GameIsDrawn, "Stalemate", GE_PLAYER); break; } break; - + case CMAIL_RESIGN: if (WhiteOnMove(currentMove)) { GameEnds(BlackWins, "White resigns", GE_PLAYER); @@ -8732,11 +8793,11 @@ MakeRegisteredMove() GameEnds(WhiteWins, "Black resigns", GE_PLAYER); } break; - + case CMAIL_ACCEPT: GameEnds(GameIsDrawn, "Draw agreed", GE_PLAYER); break; - + default: break; } @@ -8832,7 +8893,7 @@ LoadGame(f, gameNumber, title, useList) GameMode oldGameMode; VariantClass oldVariant = gameInfo.variant; /* [HGM] PGNvariant */ - if (appData.debugMode) + if (appData.debugMode) fprintf(debugFP, "LoadGame(): on entry, gameMode %d\n", gameMode); if (gameMode == Training ) @@ -8850,7 +8911,7 @@ LoadGame(f, gameNumber, title, useList) if (useList) { lg = (ListGame *) ListElem(&gameList, gameNumber-1); - + if (lg) { fseek(f, lg->offset, 0); GameListHighlight(gameNumber); @@ -8904,12 +8965,12 @@ LoadGame(f, gameNumber, title, useList) /* * Skip the first gn-1 games in the file. - * Also skip over anything that precedes an identifiable - * start of game marker, to avoid being confused by - * garbage at the start of the file. Currently + * Also skip over anything that precedes an identifiable + * start of game marker, to avoid being confused by + * garbage at the start of the file. Currently * recognized start of game markers are the move number "1", * the pattern "gnuchess .* game", the pattern - * "^[#;%] [^ ]* game file", and a PGN tag block. + * "^[#;%] [^ ]* game file", and a PGN tag block. * A game that starts with one of the latter two patterns * will also have a move number 1, possibly * following a position diagram. @@ -8935,7 +8996,7 @@ LoadGame(f, gameNumber, title, useList) gn--; lastLoadGameStart = cm; break; - + case MoveNumberOne: switch (lastLoadGameStart) { case GNUChessGame: @@ -9003,7 +9064,7 @@ LoadGame(f, gameNumber, title, useList) break; } } - + if (appData.debugMode) fprintf(debugFP, "Parsed game start '%s' (%d)\n", yy_text, (int) cm); @@ -9029,11 +9090,11 @@ LoadGame(f, gameNumber, title, useList) free(gameInfo.event); } gameInfo.event = StrSave(yy_text); - } + } startedFromSetupPosition = FALSE; while (cm == PGNTag) { - if (appData.debugMode) + if (appData.debugMode) fprintf(debugFP, "Parsed PGNTag: %s\n", yy_text); err = ParsePGNTag(yy_text, &gameInfo); if (!err) numPGNTags++; @@ -9043,7 +9104,7 @@ LoadGame(f, gameNumber, title, useList) startedFromPositionFile = FALSE; /* [HGM] loadPos: variant switch likely makes position invalid */ InitPosition(TRUE); oldVariant = gameInfo.variant; - if (appData.debugMode) + if (appData.debugMode) fprintf(debugFP, "New variant %d\n", (int) oldVariant); } @@ -9089,7 +9150,7 @@ LoadGame(f, gameNumber, title, useList) /* Handle comments interspersed among the tags */ while (cm == Comment) { char *p; - if (appData.debugMode) + if (appData.debugMode) fprintf(debugFP, "Parsed Comment: %s\n", yy_text); p = yy_text; if (*p == '{' || *p == '[' || *p == '(') { @@ -9150,13 +9211,13 @@ LoadGame(f, gameNumber, title, useList) } while (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r') p++; - + if (strncmp(p, "black", strlen("black"))==0) blackPlaysFirst = TRUE; else blackPlaysFirst = FALSE; startedFromSetupPosition = TRUE; - + CopyBoard(boards[0], initial_position); if (blackPlaysFirst) { currentMove = forwardMostMove = backwardMostMove = 1; @@ -9188,14 +9249,14 @@ LoadGame(f, gameNumber, title, useList) fprintf(debugFP, "Load Game\n"); } DisplayBothClocks(); - } + } /* [HGM] server: flag to write setup moves in broadcast file as one */ loadFlag = appData.suppressLoadMoves; while (cm == Comment) { char *p; - if (appData.debugMode) + if (appData.debugMode) fprintf(debugFP, "Parsed Comment: %s\n", yy_text); p = yy_text; if (*p == '{' || *p == '[' || *p == '(') { @@ -9231,7 +9292,7 @@ LoadGame(f, gameNumber, title, useList) if (!matchMode && (pausing || appData.timeDelay != 0)) { DisplayComment(currentMove - 1, commentList[currentMove]); } - if (!matchMode && appData.timeDelay != 0) + if (!matchMode && appData.timeDelay != 0) DrawPosition(FALSE, boards[currentMove]); if (gameMode == AnalyzeFile || gameMode == AnalyzeMode) { @@ -9239,7 +9300,7 @@ LoadGame(f, gameNumber, title, useList) } /* if the first token after the PGN tags is a move - * and not move number 1, retrieve it from the parser + * and not move number 1, retrieve it from the parser */ if (cm != MoveNumberOne) LoadGameOneMove(cm); @@ -9268,7 +9329,7 @@ LoadGame(f, gameNumber, title, useList) AutoPlayGameLoop(); } - if (appData.debugMode) + if (appData.debugMode) fprintf(debugFP, "LoadGame(): on exit, gameMode %d\n", gameMode); loadFlag = 0; /* [HGM] true game starts */ @@ -9327,7 +9388,7 @@ LoadPosition(f, positionNumber, title) char *p, line[MSG_SIZ]; Board initial_position; int i, j, fenMode, pn; - + if (gameMode == Training ) SetTrainingModeOff(); @@ -9344,7 +9405,7 @@ LoadPosition(f, positionNumber, title) if (first.pr == NoProc) { StartChessProgram(&first); InitChessProgram(&first, FALSE); - } + } pn = positionNumber; if (positionNumber < 0) { /* Negative position number means to seek to that byte offset */ @@ -9382,7 +9443,7 @@ LoadPosition(f, positionNumber, title) case '7': case '8': case '9': case 'H': case 'A': case 'M': case 'h': case 'a': case 'm': case 'E': case 'F': case 'G': case 'e': case 'f': case 'g': - case 'C': case 'W': case 'c': case 'w': + case 'C': case 'W': case 'c': case 'w': fenMode = TRUE; break; } @@ -9412,7 +9473,7 @@ LoadPosition(f, positionNumber, title) } else { (void) fgets(line, MSG_SIZ, f); (void) fgets(line, MSG_SIZ, f); - + for (i = BOARD_HEIGHT - 1; i >= 0; i--) { (void) fgets(line, MSG_SIZ, f); for (p = line, j = BOARD_LEFT; j < BOARD_RGHT; p++) { @@ -9421,7 +9482,7 @@ LoadPosition(f, positionNumber, title) initial_position[i][j++] = CharToPiece(*p); } } - + blackPlaysFirst = FALSE; if (!feof(f)) { (void) fgets(line, MSG_SIZ, f); @@ -9430,7 +9491,7 @@ LoadPosition(f, positionNumber, title) } } startedFromSetupPosition = TRUE; - + SendToProgram("force\n", &first); CopyBoard(boards[0], initial_position); if (blackPlaysFirst) { @@ -9470,7 +9531,7 @@ int i, j; timeRemaining[0][1] = whiteTimeRemaining; timeRemaining[1][1] = blackTimeRemaining; DrawPosition(FALSE, boards[currentMove]); - + return TRUE; } @@ -9537,7 +9598,7 @@ SavePart(str) { static char buf[MSG_SIZ]; char *p; - + p = strchr(str, ' '); if (p == NULL) return str; strncpy(buf, str, p - str); @@ -9616,7 +9677,7 @@ void GetOutOfBookInfo( char * buf ) } sprintf( buf+strlen(buf), "%d%s. ", (idx - offset)/2 + 1, idx & 1 ? ".." : "" ); - sprintf( buf+strlen(buf), "%s%.2f", + sprintf( buf+strlen(buf), "%s%.2f", pvInfoList[idx].score >= 0 ? "+" : "", pvInfoList[idx].score / 100.0 ); } @@ -9637,11 +9698,11 @@ SaveGamePGN(f) char move_buffer[100]; /* [AS] Buffer for move+PV info */ offset = backwardMostMove & (~1L); /* output move numbers start at 1 */ - + tm = time((time_t *) NULL); - + PrintPGNTags(f, &gameInfo); - + if (backwardMostMove > 0 || startedFromSetupPosition) { char *fen = PositionToFEN(backwardMostMove, NULL); fprintf(f, "[FEN \"%s\"]\n[SetUp \"1\"]\n", fen); @@ -9658,7 +9719,7 @@ SaveGamePGN(f) GetOutOfBookInfo( buf ); if( buf[0] != '\0' ) { - fprintf( f, "[%s \"%s\"]\n", PGN_OUT_OF_BOOK, buf ); + fprintf( f, "[%s \"%s\"]\n", PGN_OUT_OF_BOOK, buf ); } } @@ -9759,7 +9820,7 @@ SaveGamePGN(f) sprintf(buf, " %d:%02d%c", seconds/60, seconds%60, 0); } - sprintf( move_buffer, "{%s%.2f/%d%s}", + sprintf( move_buffer, "{%s%.2f/%d%s}", pvInfoList[i].score >= 0 ? "+" : "", pvInfoList[i].score / 100.0, pvInfoList[i].depth, @@ -9784,7 +9845,7 @@ SaveGamePGN(f) i++; } - + /* Start a new line */ if (linelen > 0) fprintf(f, "\n"); @@ -9814,12 +9875,12 @@ SaveGameOldStyle(f) { int i, offset; time_t tm; - + tm = time((time_t *) NULL); - + fprintf(f, "# %s game file -- %s", programName, ctime(&tm)); PrintOpponents(f); - + if (backwardMostMove > 0 || startedFromSetupPosition) { fprintf(f, "\n[--------------\n"); PrintPosition(f, backwardMostMove); @@ -9854,7 +9915,7 @@ SaveGameOldStyle(f) i++; } } - + if (commentList[i] != NULL) { fprintf(f, "[%s]\n", commentList[i]); } @@ -9919,10 +9980,10 @@ SavePosition(f, dummy, dummy2) { time_t tm; char *fen; - + if (appData.oldSaveStyle) { tm = time((time_t *) NULL); - + fprintf(f, "# %s position file -- %s", programName, ctime(&tm)); PrintOpponents(f); fprintf(f, "[--------------\n"); @@ -9947,7 +10008,7 @@ ReloadCmailMsgEvent(unregister) int i; struct stat inbuf, outbuf; int status; - + /* Any registered moves are unregistered if unregister is set, */ /* i.e. invoked by the signal handler */ if (unregister) { @@ -9975,7 +10036,7 @@ ReloadCmailMsgEvent(unregister) outFilename = (char *) malloc(strlen(appData.cmailGameName) + 5); sprintf(outFilename, "%s.out", appData.cmailGameName); } - + status = stat(outFilename, &outbuf); if (status < 0) { cmailMailedMove = FALSE; @@ -9983,10 +10044,10 @@ ReloadCmailMsgEvent(unregister) status = stat(inFilename, &inbuf); cmailMailedMove = (inbuf.st_mtime < outbuf.st_mtime); } - + /* LoadGameFromFile(CMAIL_MAX_GAMES) with cmailMsgLoaded == TRUE counts the games, notes how each one terminated, etc. - + It would be nice to remove this kludge and instead gather all the information while building the game list. (And to keep it in the game list nodes instead of having a bunch of fixed-size @@ -9996,7 +10057,7 @@ ReloadCmailMsgEvent(unregister) */ cmailMsgLoaded = TRUE; LoadGameFromFile(inFilename, CMAIL_MAX_GAMES, "", FALSE); - + /* Load first game in the file or popup game menu */ LoadGameFromFile(inFilename, 0, appData.cmailGameName, TRUE); @@ -10022,7 +10083,7 @@ RegisterMove() cmailMoveRegistered[lastLoadGameNumber - 1] = FALSE; nCmailMovesRegistered --; - if (cmailCommentList[lastLoadGameNumber - 1] != NULL) + if (cmailCommentList[lastLoadGameNumber - 1] != NULL) { free(cmailCommentList[lastLoadGameNumber - 1]); cmailCommentList[lastLoadGameNumber - 1] = NULL; @@ -10069,11 +10130,11 @@ RegisterMove() sprintf(string, "%s.game.out.%d", appData.cmailGameName, lastLoadGameNumber); - + f = fopen(string, "w"); if (appData.oldSaveStyle) { SaveGameOldStyle(f); /* also closes the file */ - + sprintf(string, "%s.pos.out", appData.cmailGameName); f = fopen(string, "w"); SavePosition(f, 0, NULL); /* also closes the file */ @@ -10081,10 +10142,10 @@ RegisterMove() fprintf(f, "{--------------\n"); PrintPosition(f, currentMove); fprintf(f, "--------------}\n\n"); - + SaveGame(f, 0, NULL); /* also closes the file*/ } - + cmailMoveRegistered[lastLoadGameNumber - 1] = TRUE; nCmailMovesRegistered ++; } else if (nCmailGames == 1) { @@ -10127,7 +10188,7 @@ MailMoveEvent() #endif if (! (cmailMailedMove || RegisterMove())) return; - + if ( cmailMailedMove || (nCmailMovesRegistered + nCmailResults == nCmailGames)) { sprintf(string, partCommandString, @@ -10193,7 +10254,7 @@ CmailMsg() char number[5]; char string[MSG_SIZ]; /* Space for game-list */ int i; - + if (!cmailMsgLoaded) return ""; if (cmailMailedMove) { @@ -10210,7 +10271,7 @@ CmailMsg() sprintf(number, "%d", i + 1); prependComma = 1; } - + strcat(string, number); } } @@ -10222,12 +10283,12 @@ CmailMsg() sprintf(cmailMsg, _("Still need to make move for game\n")); break; - + case 2: sprintf(cmailMsg, _("Still need to make moves for both games\n")); break; - + default: sprintf(cmailMsg, _("Still need to make moves for all %d games\n"), @@ -10241,7 +10302,7 @@ CmailMsg() _("Still need to make a move for game %s\n"), string); break; - + case 0: if (nCmailResults == nCmailGames) { sprintf(cmailMsg, _("No unfinished games\n")); @@ -10249,7 +10310,7 @@ CmailMsg() sprintf(cmailMsg, _("Ready to send mail\n")); } break; - + default: sprintf(cmailMsg, _("Still need to make moves for games %s\n"), @@ -10326,7 +10387,7 @@ ExitEvent(status) /* Kill off chess programs */ if (first.pr != NoProc) { ExitAnalyzeMode(); - + DoSleep( appData.delayBeforeQuit ); SendToProgram("quit\n", &first); DoSleep( appData.delayAfterQuit ); @@ -10364,7 +10425,7 @@ PauseEvent() DisplayBothClocks(); } if (gameMode == PlayFromGameFile) { - if (appData.timeDelay >= 0) + if (appData.timeDelay >= 0) AutoPlayGameLoop(); } else if (gameMode == IcsExamining && pauseExamInvalid) { Reset(FALSE, TRUE); @@ -10505,25 +10566,25 @@ MachineWhiteEvent() return; - if (gameMode == PlayFromGameFile || - gameMode == TwoMachinesPlay || - gameMode == Training || - gameMode == AnalyzeMode || + if (gameMode == PlayFromGameFile || + gameMode == TwoMachinesPlay || + gameMode == Training || + gameMode == AnalyzeMode || gameMode == EndOfGame) EditGameEvent(); - if (gameMode == EditPosition) + if (gameMode == EditPosition) EditPositionDone(); if (!WhiteOnMove(currentMove)) { DisplayError(_("It is not White's turn"), 0); return; } - + if (gameMode == AnalyzeMode || gameMode == AnalyzeFile) ExitAnalyzeMode(); - if (gameMode == EditGame || gameMode == AnalyzeMode || + if (gameMode == EditGame || gameMode == AnalyzeMode || gameMode == AnalyzeFile) TruncateGame(); @@ -10566,7 +10627,7 @@ MachineWhiteEvent() if(bookHit) { // [HGM] book: simulate book reply static char bookMove[MSG_SIZ]; // a bit generous? - programStats.nodes = programStats.depth = programStats.time = + programStats.nodes = programStats.depth = programStats.time = programStats.score = programStats.got_only_move = 0; sprintf(programStats.movelist, "%s (xbook)", bookHit); @@ -10586,25 +10647,25 @@ MachineBlackEvent() return; - if (gameMode == PlayFromGameFile || - gameMode == TwoMachinesPlay || - gameMode == Training || - gameMode == AnalyzeMode || + if (gameMode == PlayFromGameFile || + gameMode == TwoMachinesPlay || + gameMode == Training || + gameMode == AnalyzeMode || gameMode == EndOfGame) EditGameEvent(); - if (gameMode == EditPosition) + if (gameMode == EditPosition) EditPositionDone(); if (WhiteOnMove(currentMove)) { DisplayError(_("It is not Black's turn"), 0); return; } - + if (gameMode == AnalyzeMode || gameMode == AnalyzeFile) ExitAnalyzeMode(); - if (gameMode == EditGame || gameMode == AnalyzeMode || + if (gameMode == EditGame || gameMode == AnalyzeMode || gameMode == AnalyzeFile) TruncateGame(); @@ -10641,7 +10702,7 @@ MachineBlackEvent() if(bookHit) { // [HGM] book: simulate book reply static char bookMove[MSG_SIZ]; // a bit generous? - programStats.nodes = programStats.depth = programStats.time = + programStats.nodes = programStats.depth = programStats.time = programStats.score = programStats.got_only_move = 0; sprintf(programStats.movelist, "%s (xbook)", bookHit); @@ -10681,7 +10742,7 @@ TwoMachinesEvent P((void)) char buf[MSG_SIZ]; ChessProgramState *onmove; char *bookHit = NULL; - + if (appData.noChessProgram) return; switch (gameMode) { @@ -10787,7 +10848,7 @@ TwoMachinesEvent P((void)) if(bookHit) { // [HGM] book: simulate book reply static char bookMove[MSG_SIZ]; // a bit generous? - programStats.nodes = programStats.depth = programStats.time = + programStats.nodes = programStats.depth = programStats.time = programStats.score = programStats.got_only_move = 0; sprintf(programStats.movelist, "%s (xbook)", bookHit); @@ -10844,7 +10905,7 @@ IcsClientEvent() case AnalyzeFile: ExitAnalyzeMode(); break; - + default: EditGameEvent(); break; @@ -10909,7 +10970,7 @@ EditGameEvent() default: return; } - + pausing = FALSE; StopClocks(); first.offeredDraw = second.offeredDraw = 0; @@ -10936,8 +10997,8 @@ EditGameEvent() whiteFlag = blackFlag = 0; } DisplayTitle(""); - } - + } + gameMode = EditGame; ModeHighlight(); SetGameInfo(); @@ -10951,16 +11012,16 @@ EditPositionEvent() EditGameEvent(); return; } - + EditGameEvent(); if (gameMode != EditGame) return; - + gameMode = EditPosition; ModeHighlight(); SetGameInfo(); if (currentMove > 0) CopyBoard(boards[0], boards[currentMove]); - + blackPlaysFirst = !WhiteOnMove(currentMove); ResetClocks(); currentMove = forwardMostMove = backwardMostMove = 0; @@ -11053,7 +11114,7 @@ SendMultiLineToICS(buf) len = strlen(buf); if (len > MSG_SIZ) len = MSG_SIZ; - + strncpy(temp, buf, len); temp[len] = 0; @@ -11165,7 +11226,7 @@ EditPositionMenuEvent(selection, x, y) piece > (int)BlackMan && piece <= (int)BlackKing ) { selection = (ChessSquare) (DEMOTED piece); } else if(piece == EmptySquare) selection = BlackSilver; - else selection = (ChessSquare)((int)piece + 1); + else selection = (ChessSquare)((int)piece + 1); goto defaultlabel; case WhiteQueen: @@ -11244,7 +11305,7 @@ void AcceptEvent() { /* Accept a pending offer of any kind from opponent */ - + if (appData.icsActive) { SendToICS(ics_prefix); SendToICS("accept\n"); @@ -11269,7 +11330,7 @@ void DeclineEvent() { /* Decline a pending offer of any kind from opponent */ - + if (appData.icsActive) { SendToICS(ics_prefix); SendToICS("decline\n"); @@ -11341,14 +11402,14 @@ void DrawEvent() { /* Offer draw or accept pending draw offer from opponent */ - + if (appData.icsActive) { /* Note: tournament rules require draw offers to be made after you make your move but before you punch your clock. Currently ICS doesn't let you do that; instead, you immediately punch your clock after making a move, but you can offer a draw at any time. */ - + SendToICS(ics_prefix); SendToICS("draw\n"); } else if (cmailMsgLoaded) { @@ -11382,7 +11443,7 @@ void AdjournEvent() { /* Offer Adjourn or accept pending Adjourn offer from opponent */ - + if (appData.icsActive) { SendToICS(ics_prefix); SendToICS("adjourn\n"); @@ -11396,7 +11457,7 @@ void AbortEvent() { /* Offer Abort or accept pending Abort offer from opponent */ - + if (appData.icsActive) { SendToICS(ics_prefix); SendToICS("abort\n"); @@ -11409,7 +11470,7 @@ void ResignEvent() { /* Resign. You can do this even if it's not your turn. */ - + if (appData.icsActive) { SendToICS(ics_prefix); SendToICS("resign\n"); @@ -11470,12 +11531,12 @@ ForwardInner(target) if (gameMode == PlayFromGameFile && !pausing) PauseEvent(); - + if (gameMode == IcsExamining && pausing) limit = pauseExamForwardMostMove; else limit = forwardMostMove; - + if (target > limit) target = limit; if (target > 0 && moveList[target - 1][0]) { @@ -11497,8 +11558,8 @@ ForwardInner(target) } } } - if (gameMode == EditGame || gameMode == AnalyzeMode || - gameMode == Training || gameMode == PlayFromGameFile || + if (gameMode == EditGame || gameMode == AnalyzeMode || + gameMode == Training || gameMode == PlayFromGameFile || gameMode == AnalyzeFile) { while (currentMove < target) { SendMoveToProgram(currentMove++, &first); @@ -11506,7 +11567,7 @@ ForwardInner(target) } else { currentMove = target; } - + if (gameMode == EditGame || gameMode == EndOfGame) { whiteTimeRemaining = timeRemaining[0][currentMove]; blackTimeRemaining = timeRemaining[1][currentMove]; @@ -11539,13 +11600,13 @@ ToEndEvent() /* to optimze, we temporarily turn off analysis mode while we feed * the remaining moves to the engine. Otherwise we get analysis output * after each move. - */ + */ if (first.analysisSupport) { SendToProgram("exit\nforce\n", &first); first.analyzing = FALSE; } } - + if (gameMode == IcsExamining && !pausing) { SendToICS(ics_prefix); SendToICS("forward 999999\n"); @@ -11580,7 +11641,7 @@ BackwardInner(target) } if (gameMode == PlayFromGameFile && !pausing) PauseEvent(); - + if (moveList[target][0]) { int fromX, fromY, toX, toY; toX = moveList[target][2] - AAA; @@ -11609,7 +11670,7 @@ BackwardInner(target) } else { currentMove = target; } - + if (gameMode == EditGame || gameMode == EndOfGame) { whiteTimeRemaining = timeRemaining[0][currentMove]; blackTimeRemaining = timeRemaining[1][currentMove]; @@ -11639,7 +11700,7 @@ ToStartEvent() if (gameMode == AnalyzeMode || gameMode == AnalyzeFile) { /* to optimze, we temporarily turn off analysis mode while we undo * all the moves. Otherwise we get analysis output after each undo. - */ + */ if (first.analysisSupport) { SendToProgram("exit\nforce\n", &first); first.analyzing = FALSE; @@ -11860,7 +11921,7 @@ PrintPosition(fp, move) int move; { int i, j; - + for (i = BOARD_HEIGHT - 1; i >= 0; i--) { for (j = BOARD_LEFT; j < BOARD_RGHT; j++) { char c = PieceToChar(boards[move][i][j]); @@ -12196,18 +12257,18 @@ SendToProgram(message, cps) if (cps->pr == NULL) return; Attention(cps); - + if (appData.debugMode) { TimeMark now; GetTimeMark(&now); - fprintf(debugFP, "%ld >%-6s: %s", + fprintf(debugFP, "%ld >%-6s: %s", SubtractTimeMarks(&now, &programStartTime), cps->which, message); } - + count = strlen(message); outCount = OutputToProcess(cps->pr, message, count, &error); - if (outCount < count && !exiting + if (outCount < count && !exiting && !endingGame) { /* [HGM] crash: to not hang GameEnds() writing to deceased engines */ sprintf(buf, _("Error writing to %s chess program"), cps->which); if(gameInfo.resultDetails==NULL) { /* [HGM] crash: if game in progress, give reason for abort */ @@ -12268,12 +12329,12 @@ ReceiveFromProgram(isr, closure, message, count, error) } return; } - + if ((end_str = strchr(message, '\r')) != NULL) *end_str = NULLCHAR; if ((end_str = strchr(message, '\n')) != NULL) *end_str = NULLCHAR; - + if (appData.debugMode) { TimeMark now; int print = 1; char *quote = ""; char c; int i; @@ -12281,7 +12342,7 @@ ReceiveFromProgram(isr, closure, message, count, error) if(appData.engineComments != 1) { /* [HGM] debug: decide if protocol-violating output is written */ char start = message[0]; if(start >='A' && start <= 'Z') start += 'a' - 'A'; // be tolerant to capitalizing - if(sscanf(message, "%d%c%d%d%d", &i, &c, &i, &i, &i) != 5 && + if(sscanf(message, "%d%c%d%d%d", &i, &c, &i, &i, &i) != 5 && sscanf(message, "move %c", &c)!=1 && sscanf(message, "offer%c", &c)!=1 && sscanf(message, "resign%c", &c)!=1 && sscanf(message, "feature %c", &c)!=1 && sscanf(message, "error %c", &c)!=1 && sscanf(message, "illegal %c", &c)!=1 && @@ -12293,8 +12354,8 @@ ReceiveFromProgram(isr, closure, message, count, error) } if(print) { GetTimeMark(&now); - fprintf(debugFP, "%ld <%-6s: %s%s\n", - SubtractTimeMarks(&now, &programStartTime), cps->which, + fprintf(debugFP, "%ld <%-6s: %s%s\n", + SubtractTimeMarks(&now, &programStartTime), cps->which, quote, message); } @@ -12303,7 +12364,7 @@ ReceiveFromProgram(isr, closure, message, count, error) /* [DM] if icsEngineAnalyze is active we block all whisper and kibitz output, because nobody want to see this */ if (appData.icsEngineAnalyze) { if (strstr(message, "whisper") != NULL || - strstr(message, "kibitz") != NULL || + strstr(message, "kibitz") != NULL || strstr(message, "tellics") != NULL) return; } @@ -12381,7 +12442,7 @@ SendTimeControl(cps, mps, tc, inc, sd, st) ChessProgramState *WhitePlayer() /* [HGM] return pointer to 'first' or 'second', depending on who plays white */ { - if(gameMode == TwoMachinesPlay && first.twoMachinesColor[0] == 'b' || + if(gameMode == TwoMachinesPlay && first.twoMachinesColor[0] == 'b' || gameMode == BeginningOfGame || gameMode == MachinePlaysBlack) return &second; return &first; @@ -12414,7 +12475,7 @@ SendTimeRemaining(cps, machineWhite) if (time <= 0) time = 1; if (otime <= 0) otime = 1; - + sprintf(message, "time %ld\n", time); SendToProgram(message, cps); @@ -12486,7 +12547,7 @@ StringFeature(p, name, loc, cps) return FALSE; } -int +int ParseOption(Option *opt, ChessProgramState *cps) // [HGM] options: process the string that defines an engine option, and determine // name, type, default value, and allowed value range @@ -12581,7 +12642,7 @@ FeatureDone(cps, val) void ParseFeatures(args, cps) char* args; - ChessProgramState *cps; + ChessProgramState *cps; { char *p = args; char *q; @@ -12593,10 +12654,10 @@ ParseFeatures(args, cps) if (*p == NULLCHAR) return; if (BoolFeature(&p, "setboard", &cps->useSetboard, cps)) continue; - if (BoolFeature(&p, "time", &cps->sendTime, cps)) continue; - if (BoolFeature(&p, "draw", &cps->sendDrawOffers, cps)) continue; - if (BoolFeature(&p, "sigint", &cps->useSigint, cps)) continue; - if (BoolFeature(&p, "sigterm", &cps->useSigterm, cps)) continue; + if (BoolFeature(&p, "time", &cps->sendTime, cps)) continue; + if (BoolFeature(&p, "draw", &cps->sendDrawOffers, cps)) continue; + if (BoolFeature(&p, "sigint", &cps->useSigint, cps)) continue; + if (BoolFeature(&p, "sigterm", &cps->useSigterm, cps)) continue; if (BoolFeature(&p, "reuse", &val, cps)) { /* Engine can disable reuse, but can't enable it if user said no */ if (!val) cps->reuse = FALSE; @@ -12735,7 +12796,7 @@ ShowThinkingEvent() int newState = appData.showThinking // [HGM] thinking: other features now need thinking output as well || !appData.hideThinkingFromHuman || appData.adjudicateLossThreshold != 0 || EngineOutputIsUp(); - + if (oldState == newState) return; oldState = newState; if (gameMode == EditPosition) EditPositionDone(); @@ -12772,8 +12833,8 @@ DisplayMove(moveNumber) char cpThinkOutput[MSG_SIZ]; if(appData.noGUI) return; // [HGM] fast: suppress display of moves - - if (moveNumber == forwardMostMove - 1 || + + if (moveNumber == forwardMostMove - 1 || gameMode == AnalyzeMode || gameMode == AnalyzeFile) { safeStrCpy(cpThinkOutput, thinkOutput, sizeof(cpThinkOutput)); @@ -12827,7 +12888,7 @@ DisplayAnalysisText(text) { char buf[MSG_SIZ]; - if (gameMode == AnalyzeMode || gameMode == AnalyzeFile + if (gameMode == AnalyzeMode || gameMode == AnalyzeFile || appData.icsEngineAnalyze) { sprintf(buf, "Analysis (%s)", first.tidy); AnalysisPopUp(buf, text); @@ -12854,11 +12915,11 @@ DisplayAnalysis() double nps; static char *xtra[] = { "", " (--)", " (++)" }; int h, m, s, cs; - + if (programStats.time == 0) { programStats.time = 1; } - + if (programStats.got_only_move) { safeStrCpy(buf, programStats.movelist, sizeof(buf)); } else { @@ -12926,7 +12987,7 @@ DisplayComment(moveNumber, text) } // [HGM] PV info: display PV info together with (or as) comment if(moveNumber >= 0 && (depth = pvInfoList[moveNumber].depth) > 0) { - if(text == NULL) text = ""; + if(text == NULL) text = ""; score = pvInfoList[moveNumber].score; sprintf(buf, "%s%.2f/%d %d\n%s", score>0 ? "+" : "", score/100., depth, (pvInfoList[moveNumber].time+50)/100, text); @@ -13074,7 +13135,7 @@ GetTimeMark(tm) struct timezone timeZone; gettimeofday(&timeVal, &timeZone); - tm->sec = (long) timeVal.tv_sec; + tm->sec = (long) timeVal.tv_sec; tm->ms = (int) (timeVal.tv_usec / 1000L); #else /*!HAVE_GETTIMEOFDAY*/ @@ -13113,7 +13174,7 @@ SubtractTimeMarks(tm2, tm1) * We give the human user a slight advantage if he is playing white---the * clocks don't run until he makes his first move, so it takes zero time. * Also, we don't account for network lag, so we could get out of sync - * with GNU Chess's clock -- but then, referees are always right. + * with GNU Chess's clock -- but then, referees are always right. */ static TimeMark tickStartTM; @@ -13146,7 +13207,7 @@ AdjustClock(Boolean which, int dir) /* Stop clocks and reset to a fresh time control */ void -ResetClocks() +ResetClocks() { (void) StopClockTimer(); if (appData.icsActive) { @@ -13174,7 +13235,7 @@ DecrementClocks() if (!appData.clockMode) return; if (gameMode==AnalyzeMode || gameMode == AnalyzeFile) return; - + GetTimeMark(&now); lastTickLength = SubtractTimeMarks(&now, &tickStartTM); @@ -13196,7 +13257,7 @@ DecrementClocks() } if (CheckFlags()) return; - + tickStartTM = now; intendedTickLength = NextTickLength(timeRemaining - fudge) + fudge; StartClockTimer(intendedTickLength); @@ -13204,9 +13265,9 @@ DecrementClocks() /* if the time remaining has fallen below the alarm threshold, sound the * alarm. if the alarm has sounded and (due to a takeback or time control * with increment) the time remaining has increased to a level above the - * threshold, reset the alarm so it can sound again. + * threshold, reset the alarm so it can sound again. */ - + if (appData.icsActive && appData.icsAlarm) { /* make sure we are dealing with the user's clock */ @@ -13216,7 +13277,7 @@ DecrementClocks() if (alarmSounded && (timeRemaining > appData.icsAlarmTime)) { alarmSounded = FALSE; - } else if (!alarmSounded && (timeRemaining <= appData.icsAlarmTime)) { + } else if (!alarmSounded && (timeRemaining <= appData.icsAlarmTime)) { PlayAlarmSound(); alarmSounded = TRUE; } @@ -13255,7 +13316,7 @@ SwitchClocks() whiteTimeRemaining -= lastTickLength; /* [HGM] PGNtime: save time for PGN file if engine did not give it */ // if(pvInfoList[forwardMostMove-1].time == -1) - pvInfoList[forwardMostMove-1].time = + pvInfoList[forwardMostMove-1].time = (timeRemaining[0][forwardMostMove-1] - whiteTimeRemaining)/10; } flagged = CheckFlags(); @@ -13285,12 +13346,12 @@ SwitchClocks() whiteTimeRemaining : blackTimeRemaining); StartClockTimer(intendedTickLength); } - + /* Stop both clocks */ void StopClocks() -{ +{ long lastTickLength; TimeMark now; @@ -13311,7 +13372,7 @@ StopClocks() } CheckFlags(); } - + /* Start clock of player on move. Time may have been reset, so if clock is already running, stop and restart it. */ void @@ -13329,7 +13390,7 @@ StartClocks() whiteTimeRemaining : blackTimeRemaining); /* [HGM] nps: figure out nps factors, by determining which engine plays white and/or black once and for all */ - whiteNPS = blackNPS = -1; + whiteNPS = blackNPS = -1; if(gameMode == MachinePlaysWhite || gameMode == TwoMachinesPlay && first.twoMachinesColor[0] == 'w' || appData.zippyPlay && gameMode == IcsPlayingBlack) // first (perhaps only) engine has white whiteNPS = first.nps; @@ -13352,7 +13413,7 @@ TimeString(ms) long second, minute, hour, day; char *sign = ""; static char buf[32]; - + if (ms > 0 && ms <= 9900) { /* convert milliseconds to tenths, rounding up */ double tenths = floor( ((double)(ms + 99L)) / 100.00 ); @@ -13370,14 +13431,14 @@ TimeString(ms) sign = "-"; second = -second; } - + day = second / (60 * 60 * 24); second = second % (60 * 60 * 24); hour = second / (60 * 60); second = second % (60 * 60); minute = second / 60; second = second % 60; - + if (day > 0) sprintf(buf, " %s%ld:%02ld:%02ld:%02ld ", sign, day, hour, minute, second); @@ -13385,7 +13446,7 @@ TimeString(ms) sprintf(buf, " %s%ld:%02ld:%02ld ", sign, hour, minute, second); else sprintf(buf, " %s%2ld:%02ld ", sign, minute, second); - + return buf; } @@ -13398,13 +13459,13 @@ StrStr(string, match) char *string, *match; { int i, length; - + length = strlen(match); - + for (i = strlen(string) - length; i >= 0; i--, string++) if (!strncmp(match, string, length)) return string; - + return NULL; } @@ -13413,9 +13474,9 @@ StrCaseStr(string, match) char *string, *match; { int i, j, length; - + length = strlen(match); - + for (i = strlen(string) - length; i >= 0; i--, string++) { for (j = 0; j < length; j++) { if (ToLower(match[j]) != ToLower(string[j])) @@ -13433,7 +13494,7 @@ StrCaseCmp(s1, s2) char *s1, *s2; { char c1, c2; - + for (;;) { c1 = ToLower(*s1++); c2 = ToLower(*s2++); @@ -13533,7 +13594,7 @@ PositionToFEN(move, overrideCastling) /* [HGM] write promoted pieces as '+' (Shogi) */ *p++ = '+'; piece = (ChessSquare)(DEMOTED piece); - } + } *p++ = PieceToChar(piece); if(p[-1] == '~') { /* [HGM] flag promoted pieces as '~' (Crazyhouse) */ @@ -13616,7 +13677,7 @@ PositionToFEN(move, overrideCastling) } if(gameInfo.variant != VariantShogi && gameInfo.variant != VariantXiangqi && - gameInfo.variant != VariantShatranj && gameInfo.variant != VariantCourier ) { + gameInfo.variant != VariantShatranj && gameInfo.variant != VariantCourier ) { /* En passant target square */ if (move > backwardMostMove) { fromX = moveList[move - 1][0] - AAA; @@ -13657,7 +13718,7 @@ PositionToFEN(move, overrideCastling) } /* Fullmove number */ sprintf(p, "%d", (move / 2) + 1); - + return StrSave(buf); } @@ -13765,7 +13826,7 @@ ParseFEN(board, blackPlaysFirst, fen) case 'w': *blackPlaysFirst = FALSE; break; - case 'b': + case 'b': *blackPlaysFirst = TRUE; break; default: @@ -13868,7 +13929,7 @@ ParseFEN(board, blackPlaysFirst, fen) /* read e.p. field in games that know e.p. capture */ if(gameInfo.variant != VariantShogi && gameInfo.variant != VariantXiangqi && - gameInfo.variant != VariantShatranj && gameInfo.variant != VariantCourier ) { + gameInfo.variant != VariantShatranj && gameInfo.variant != VariantCourier ) { if(*p=='-') { p++; FENepStatus = EP_NONE; } else { @@ -13888,7 +13949,7 @@ ParseFEN(board, blackPlaysFirst, fen) return TRUE; } - + void EditPositionPasteFEN(char *fen) { diff --git a/callback.c b/callback.c new file mode 100644 index 0000000..4bc9210 --- /dev/null +++ b/callback.c @@ -0,0 +1,664 @@ +#include +#include "common.h" +#include "xboard.h" +#include +#include "backend.h" + +#ifdef ENABLE_NLS +# define _(s) gettext (s) +# define N_(s) gettext_noop (s) +#else +# define _(s) (s) +# define N_(s) s +#endif + + +extern GtkWidget *about; +extern GtkWidget *GUI_Window; + +extern char *programVersion; +extern int errorExitStatus; +extern int promotionUp; +extern int fromX; +extern int fromY; +extern int toX; +extern int toY; + +void +QuitProc (object, user_data) + GtkObject *object; + gpointer user_data; +{ + gtk_main_quit(); + ExitEvent(0); +} + +/* Help Menu */ +void InfoProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + char buf[MSG_SIZ]; + snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &", + INFODIR, INFOFILE); + system(buf); + return; +} + +void ManProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + char buf[MSG_SIZ]; + snprintf(buf, sizeof(buf), "xterm -e man xboard &"); + system(buf); + return; +} + +void HintProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + HintEvent(); + return; +} + +void BookProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + BookEvent(); + return; +} + +void AboutProc (object, user_data) + GtkObject *object; + gpointer user_data; +{ + GtkWidget *about; + + const gchar *authors[] = {"Tim Mann ", + "John Chanak", + "Evan Welsh ", + "Elmar Bartel ", + "Jochen Wiedmann", + "Frank McIngvale", + "Hugh Fisher ", + "Allessandro Scotti", + "H.G. Muller ", + "Eric Mullins ", + "Arun Persaud "}; + + /* set up about window */ + about = GTK_WIDGET(gtk_about_dialog_new()); + + /* fill in some information */ + char buf[MSG_SIZ]; +#if ZIPPY + char *zippy = " (with Zippy code)"; +#else + char *zippy = ""; +#endif + sprintf(buf, "%s%s", programVersion, zippy); + + gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about),buf); + + gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(about), + "Copyright 1991 Digital Equipment Corporation\n" + "Enhancements Copyright 1992-2009 Free Software Foundation\n" + "Enhancements Copyright 2005 Alessandro Scotti"); + gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about),"http://www.gnu.org/software/xboard/"); + gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about),authors); + gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(about), + " A. Alper (turkish)\n" + " A. Persaud (german)\n"); + + /* end set up about window */ + gtk_dialog_run(GTK_DIALOG (about)); + gtk_widget_destroy(about); +} + +/* End Help Menu */ + +void IcsClientProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + IcsClientEvent(); + return; +} + +void LoadNextGameProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + ReloadGame(1); + return; +} + +void LoadPrevGameProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + ReloadGame(-1); + return; +} + +void ReloadGameProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + ReloadGame(0); + return; +} + +void MachineWhiteProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + MachineWhiteEvent(); + return; +} + +void MachineBlackProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + MachineBlackEvent(); + return; +} + +void TwoMachinesProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + TwoMachinesEvent(); + return; +} + +void AcceptProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + AcceptEvent(); + return; +} + +void DeclineProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + DeclineEvent(); + return; +} + +void RematchProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + RematchEvent(); + return; +} + +void CallFlagProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + CallFlagEvent(); + return; +} + +void DrawProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + DrawEvent(); + return; +} + +void AbortProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + AbortEvent(); + return; +} + +void AdjournProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + AdjournEvent(); + return; +} + +void ResignProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + ResignEvent(); + return; +} + +void StopObservingProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + StopObservingEvent(); + return; +} + +void StopExaminingProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + StopExaminingEvent(); + return; +} + +void AdjuWhiteProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + UserAdjudicationEvent(+1); + return; +} + +void AdjuBlackProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + UserAdjudicationEvent(-1); + return; +} + +void AdjuDrawProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + UserAdjudicationEvent(0); + return; +} + +void BackwardProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + BackwardEvent(); + return; +} + +void ForwardProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + ForwardEvent(); + return; +} + +void ToStartProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + ToStartEvent(); + return; +} + +void ToEndProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + ToEndEvent(); + return; +} + +void RevertProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + RevertEvent(); + return; +} + +void TruncateGameProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + TruncateGameEvent(); + return; +} + +void MoveNowProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + MoveNowEvent(); + return; +} + +void RetractMoveProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + RetractMoveEvent(); + return; +} + +/* Option Menu */ +void FlipViewProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + printf("DEBUG: in flip view\n"); + flipView = !flipView; + DrawPosition(True, NULL); + return; +} + + +gboolean CloseWindowProc(GtkWidget *button) +{ + gtk_widget_destroy(gtk_widget_get_toplevel(button)); + return TRUE; +} + +void +ResetProc (object, user_data) + GtkObject *object; + gpointer user_data; +{ + ResetGameEvent(); + AnalysisPopDown(); +} + +void WhiteClockProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + if (gameMode == EditPosition || gameMode == IcsExamining) { + SetWhiteToPlayEvent(); + } else if (gameMode == IcsPlayingBlack || gameMode == MachinePlaysWhite) { + CallFlagEvent(); + } +} + +void BlackClockProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + if (gameMode == EditPosition || gameMode == IcsExamining) { + SetBlackToPlayEvent(); + } else if (gameMode == IcsPlayingWhite || gameMode == MachinePlaysBlack) { + CallFlagEvent(); + } +} + + +void ShowCoordsProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + appData.showCoords = !appData.showCoords; + + DrawPosition(True, NULL); +} + +void ErrorPopDownProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + gtk_widget_destroy(GTK_WIDGET(object)); + ErrorPopDown(); +} + +void PauseProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + // todo this toggling of the pause button doesn't seem to work? + // e.g. select pause from buttonbar doesn't activate menumode.pause + PauseEvent(); +} + + +void LoadGameProc(object, user_data) + GtkObject *object; + gpointer user_data; +{ + GtkWidget *dialog; + dialog = gtk_file_chooser_dialog_new (_("Load game file name?"), + GTK_WINDOW(GUI_Window), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + char *filename; + FILE *f; + + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + + //see loadgamepopup + f = fopen(filename, "rb"); + if (f == NULL) { + DisplayError(_("Failed to open file"), errno); + } else { + /* TODO add indec */ + (void) LoadGamePopUp(f, 0, filename); + } + g_free (filename); + } + gtk_widget_destroy (dialog); + ModeHighlight(); +} + + +/************* + * EVENTS + *************/ + +void EventProc(window, event, data) + GtkWindow *window; + GdkEvent *event; + gpointer data; +{ + /* todo do we still need this? + if (!XtIsRealized(widget)) + return; + */ + + switch (event->type) { + case GDK_EXPOSE: + if (event->expose.count > 0) return; /* no clipping is done */ + DrawPosition(True, NULL); + break; + default: + return; + } +} + + +/* + * event handler for parsing user moves + */ +void UserMoveProc(window, event, data) + GtkWindow *window; + GdkEvent *event; + gpointer data; +{ + int x, y; + Boolean saveAnimate; + static int second = 0; + + if (errorExitStatus != -1) return; + + if (event->type == GDK_BUTTON_PRESS) ErrorPopDown(); + + if (promotionUp) + { + if (event->type == GDK_BUTTON_PRESS) + { + /* todo add promotionshellwidget + XtPopdown(promotionShell); + XtDestroyWidget(promotionShell); */ + promotionUp = False; + ClearHighlights(); + fromX = fromY = -1; + } + else + { + return; + } + } + + x = EventToSquare( (int)event->button.x, BOARD_WIDTH ); + y = EventToSquare( (int)event->button.y, BOARD_HEIGHT ); + if (!flipView && y >= 0) + { + y = BOARD_HEIGHT - 1 - y; + } + if (flipView && x >= 0) + { + x = BOARD_WIDTH - 1 - x; + } + + if (fromX == -1) + { + if (event->type == ButtonPress) + { + /* First square */ + if (OKToStartUserMove(x, y)) + { + fromX = x; + fromY = y; + second = 0; + DragPieceBegin(event->button.x, event->button.y); + if (appData.highlightDragging) + { + SetHighlights(x, y, -1, -1); + } + } + } + return; + } + + /* fromX != -1 */ + if (event->type == GDK_BUTTON_PRESS && gameMode != EditPosition && + x >= 0 && y >= 0) { + ChessSquare fromP; + ChessSquare toP; + /* Check if clicking again on the same color piece */ + fromP = boards[currentMove][fromY][fromX]; + toP = boards[currentMove][y][x]; + if ((WhitePawn <= fromP && fromP <= WhiteKing && + WhitePawn <= toP && toP <= WhiteKing) || + (BlackPawn <= fromP && fromP <= BlackKing && + BlackPawn <= toP && toP <= BlackKing)) { + /* Clicked again on same color piece -- changed his mind */ + second = (x == fromX && y == fromY); + if (appData.highlightDragging) { + SetHighlights(x, y, -1, -1); + } else { + ClearHighlights(); + } + if (OKToStartUserMove(x, y)) { + fromX = x; + fromY = y; + DragPieceBegin(event->button.x, event->button.y); + } + return; + } + } + + if (event->type == GDK_BUTTON_RELEASE && x == fromX && y == fromY) + { + DragPieceEnd(event->button.x, event->button.y); + if (appData.animateDragging) + { + /* Undo animation damage if any */ + DrawPosition(FALSE, NULL); + } + if (second) + { + /* Second up/down in same square; just abort move */ + second = 0; + fromX = fromY = -1; + ClearHighlights(); + gotPremove = 0; + ClearPremoveHighlights(); + } + else + { + /* First upclick in same square; start click-click mode */ + SetHighlights(x, y, -1, -1); + } + return; + } + + /* Completed move */ + toX = x; + toY = y; + saveAnimate = appData.animate; + + if (event->type == GDK_BUTTON_PRESS) + { + /* Finish clickclick move */ + if (appData.animate || appData.highlightLastMove) + { + SetHighlights(fromX, fromY, toX, toY); + } + else + { + ClearHighlights(); + } + } + else + { + /* Finish drag move */ + if (appData.highlightLastMove) + { + SetHighlights(fromX, fromY, toX, toY); + } + else + { + ClearHighlights(); + } + DragPieceEnd(event->button.x, event->button.y); + /* Don't animate move and drag both */ + appData.animate = FALSE; + } + + if (IsPromotion(fromX, fromY, toX, toY)) + { + if (appData.alwaysPromoteToQueen) + { + UserMoveEvent(fromX, fromY, toX, toY, 'q'); + if (!appData.highlightLastMove || gotPremove) ClearHighlights(); + if (gotPremove) SetPremoveHighlights(fromX, fromY, toX, toY); + fromX = fromY = -1; + } + else + { + SetHighlights(fromX, fromY, toX, toY); + PromotionPopUp(); + } + } + else + { + UserMoveEvent(fromX, fromY, toX, toY, NULLCHAR); + + if (!appData.highlightLastMove || gotPremove) ClearHighlights(); + if (gotPremove) SetPremoveHighlights(fromX, fromY, toX, toY); + fromX = fromY = -1; + } + + appData.animate = saveAnimate; + if (appData.animate || appData.animateDragging) { + /* Undo animation damage if needed */ + DrawPosition(FALSE, NULL); + } + + return; +} + diff --git a/callback.h b/callback.h new file mode 100644 index 0000000..16d5c36 --- /dev/null +++ b/callback.h @@ -0,0 +1,53 @@ +void QuitProc P((GtkObject *object, gpointer user_data)); +void IcsClientProc P((GtkObject *object, gpointer user_data)); +void MachineBlackProc P((GtkObject *object, gpointer user_data)); +void MachineWhiteProc P((GtkObject *object, gpointer user_data)); +void TwoMachinesProc P((GtkObject *object, gpointer user_data)); +void AcceptProc P((GtkObject *object, gpointer user_data)); +void DeclineProc P((GtkObject *object, gpointer user_data)); +void RematchProc P((GtkObject *object, gpointer user_data)); +void CallFlagProc P((GtkObject *object, gpointer user_data)); +void Drawroc P((GtkObject *object, gpointer user_data)); +void AbortProc P((GtkObject *object, gpointer user_data)); +void AdjournProc P((GtkObject *object, gpointer user_data)); +void ResignProc P((GtkObject *object, gpointer user_data)); +void StopObservingProc P((GtkObject *object, gpointer user_data)); +void StopExaminingProc P((GtkObject *object, gpointer user_data)); +void AdjuWhiteProc P((GtkObject *object, gpointer user_data)); +void AdjuBlackProc P((GtkObject *object, gpointer user_data)); +void AdjuDrawProc P((GtkObject *object, gpointer user_data)); +void ResetProc P((GtkObject *object, gpointer user_data)); +void WhiteClockProc P((GtkObject *object, gpointer user_data)); +void BlackClockProc P((GtkObject *object, gpointer user_data)); + +/* Step Menu */ +void BackwardProc P((GtkObject *object, gpointer user_data)); +void ForwardProc P((GtkObject *object, gpointer user_data)); +void ToStartProc P((GtkObject *object, gpointer user_data)); +void ToEndProc P((GtkObject *object, gpointer user_data)); +void RevertProc P((GtkObject *object, gpointer user_data)); +void TruncateGameProc P((GtkObject *object, gpointer user_data)); +void MoveNowProc P((GtkObject *object, gpointer user_data)); +void RetractMoveProc P((GtkObject *object, gpointer user_data)); + +/* Option Menu */ +void FlipViewProc P((GtkObject *object, gpointer user_data)); + +/* Help Menu */ + +void InfoProc P((GtkObject *object, gpointer user_data)); +void ManProc P((GtkObject *object, gpointer user_data)); +void HintProc P((GtkObject *object, gpointer user_data)); +void BookProc P((GtkObject *object, gpointer user_data)); +void AboutProc P((GtkObject *object, gpointer user_data)); + + +void ShowCoordsProc P((GtkObject *object, gpointer user_data)); +void ErrorPopDownProc P((GtkObject *object, gpointer user_data)); +void PauseProc P((GtkObject *object, gpointer user_data)); +void LoadNextGameProc P((GtkObject *object, gpointer user_data)); +void LoadPrevGameProc P((GtkObject *object, gpointer user_data)); +void ReloadGameProc P((GtkObject *object, gpointer user_data)); +void EventProc P((GtkWindow *window, GdkEvent *event, gpointer data)); +void UserMoveProc P((GtkWindow *window, GdkEvent *event, gpointer data)); +gboolean CloseWindowProc P((GtkWidget *button)); diff --git a/configure.ac b/configure.ac index 7401f6b..7c761ed 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ dnl| to regenerate configure. Then submit your changes to be folded into dnl| the standard version of xboard. dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j -AC_INIT([xboard],[4.4.1.pre],[bug-xboard@gnu.org]) +AC_INIT([xboard],[5.0.0.20090730],[bug-xboard@gnu.org]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h]) @@ -88,6 +88,10 @@ AC_SUBST(NROFFFLAGS) AC_PATH_PROGS(AWKPATH, awk mawk gawk nawk) AC_PATH_PROGS(PERLPATH, perl) +PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.16.0 gmodule-export-2.0 ]) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) + AC_HEADER_STDC AC_HEADER_TIME AC_HEADER_SYS_WAIT diff --git a/frontend.h b/frontend.h index c89673f..314176b 100644 --- a/frontend.h +++ b/frontend.h @@ -55,6 +55,7 @@ #define _FRONTEND #include +#include typedef VOIDSTAR ProcRef; #define NoProc ((ProcRef) 0) @@ -114,7 +115,7 @@ void StartLoadGameTimer P((long millisec)); void AutoSaveGame P((void)); typedef void (*DelayedEventCallback) P((void)); -void ScheduleDelayedEvent P((DelayedEventCallback cb, long millisec)); +void ScheduleDelayedEvent P((DelayedEventCallback cb, guint millisec)); DelayedEventCallback GetDelayedEvent P((void)); void CancelDelayedEvent P((void)); diff --git a/gtk-interface.xml b/gtk-interface.xml new file mode 100644 index 0000000..d7d22f6 --- /dev/null +++ b/gtk-interface.xml @@ -0,0 +1,959 @@ + + + + + + XBoard + + + + True + 0 + none + 0.80000001192092896 + False + + + True + vertical + + + True + + + True + _File + True + + + True + + + True + Reset Game + True + + + + + + True + + + + + Load Game + True + image1 + False + + + + + + True + Load Next Game + True + + + + + + True + Load Previous Game + True + + + + + True + Reload Same Game + True + + + + + + True + Save Game + True + + + + + True + + + + + True + Copy Game + True + + + + + True + Paste Game + True + + + + + True + + + + + True + Load Position + True + + + + + True + Load Next Position + True + + + + + True + Load Previous Position + True + + + + + True + Reload Same Position + True + + + + + True + Save Position + True + + + + + True + + + + + True + Copy Position + True + + + + + True + Paste Position + True + + + + + True + + + + + True + Mail Move + True + + + + + True + Reload CMail Message + True + + + + + True + + + + + gtk-quit + True + True + True + + + + + + + + + + + True + _Mode + True + + + True + + + True + Machine White + True + True + + + + + + True + Machine Black + True + True + menuMode.Machine White + + + + + + True + Two Machines + True + True + menuMode.Machine White + + + + + + True + Analyze Mode + True + True + menuMode.Machine White + + + + + True + Analyze File + True + True + menuMode.Machine White + + + + + True + ICS Client + True + True + menuMode.Machine White + + + + + + True + Edit Game + True + True + menuMode.Machine White + + + + + True + Edit Position + True + True + menuMode.Machine White + + + + + True + Training + True + True + menuMode.Machine White + + + + + True + + + + + True + Show Game List + True + + + + + True + Show Move List + True + + + + + True + Edit Tags + True + + + + + True + Edit Comments + True + + + + + True + ICS Input Box + True + + + + + True + Pause + True + + + + + + + + + True + _Action + True + + + True + + + True + Accept + True + + + + + + True + Decline + True + + + + + + True + Rematch + True + + + + + + True + + + + + True + Call Flag + True + + + + + + True + Draw + True + + + + + + True + Adjourn + True + + + + + + True + Abort + True + + + + + + True + Resign + True + + + + + + True + + + + + True + Stop Observing + True + + + + + True + Stop Examine + True + + + + + True + + + + + True + Adjucate to White + True + + + + + + True + Adjucate to Black + True + + + + + + True + Adjucate Draw + True + + + + + + + + + + True + _Step + True + + + True + + + True + Backward + True + + + + + + True + Forward + True + + + + + + True + Back to Start + True + + + + + + True + Forward to End + True + + + + + + True + Revert + True + + + + + + True + Truncate Game + True + + + + + + True + + + + + True + Move now + True + + + + + + True + Retract Move + True + + + + + + + + + + True + _Options + True + + + True + + + True + Always Queen + True + + + + + True + Animate Dragging + True + + + + + True + Animate Moving + True + + + + + True + Auto Comment + True + + + + + True + Auto Flag + True + + + + + True + Auto Flip View + True + + + + + True + Auto Observe + True + + + + + True + Auto Raise Board + True + + + + + True + Auto Save + True + + + + + True + Blindfold + True + + + + + True + Flash Moves + True + + + + + True + Flip View + True + + + + + + True + Get Move List + True + + + + + True + Highlight Last Move + True + + + + + True + Move Sound + True + + + + + True + ICS Alarm + True + + + + + True + Old Save Style + True + + + + + True + Periodic Updates + True + + + + + True + Ponder Next Move + True + + + + + True + Popup Exit Message + True + + + + + True + Popup Move Errors + True + + + + + True + Premove + True + + + + + True + Quiet Play + True + + + + + True + Show Coords + True + + + + + + True + Show Thinking + True + + + + + True + Test Legality + True + + + + + + + + + True + _Help + True + + + True + + + True + Man XBoard + True + + + + + + True + Info XBoard + True + + + + + + True + Hint + True + + + + + + True + Book + True + + + + + + True + + + + + gtk-about + True + True + True + + + + + + + + + + False + 0 + + + + + True + + + True + + + + True + White: + + + + + 0 + + + + + True + + + + True + Black: + + + + + 1 + + + + + 1 + + + + + True + + + True + not your turn + True + + + 0 + + + + + << + True + True + True + + + + False + False + 1 + + + + + < + True + True + True + + + + False + False + 2 + + + + + P + True + True + True + + + + False + False + 3 + + + + + > + True + True + True + + + False + False + 4 + + + + + >> + True + True + True + + + + False + False + 5 + + + + + False + 2 + + + + + True + GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK + + + + + + 3 + + + + + + + + + True + 0.40000000596046448 + gtk-open + + diff --git a/interface.c b/interface.c new file mode 100644 index 0000000..b5381c9 --- /dev/null +++ b/interface.c @@ -0,0 +1,68 @@ +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "common.h" +#include "frontend.h" +#include "backend.h" +#include "moves.h" +#include "xboard.h" +#include "childio.h" +#include "xgamelist.h" +#include "xhistory.h" +#include "xedittags.h" +#include "gettext.h" +#include "callback.h" + +#ifdef ENABLE_NLS +# define _(s) gettext (s) +# define N_(s) gettext_noop (s) +#else +# define _(s) (s) +# define N_(s) s +#endif + + + +GdkPixbuf *load_pixbuf(char *filename,int size) +{ + GdkPixbuf *image; + + if(size) + image = gdk_pixbuf_new_from_file_at_size(filename,size,size,NULL); + else + image = gdk_pixbuf_new_from_file(filename,NULL); + + if(image == NULL) + { + fprintf(stderr,_("Error: couldn't load file: %s\n"),filename); + exit(1); + } + return image; +} + +void GUI_SetAspectRatio(ratio) + int ratio; +{ + /* sets the aspect ration of the main window */ + GdkGeometry hints; + extern GtkWidget *GUI_Window; + + hints.min_aspect = ratio; + hints.max_aspect = ratio; + + gtk_window_set_geometry_hints (GTK_WINDOW (GUI_Window), + GTK_WIDGET (GUI_Window), + &hints, + GDK_HINT_ASPECT); + return; +} diff --git a/interface.h b/interface.h new file mode 100644 index 0000000..cd0415a --- /dev/null +++ b/interface.h @@ -0,0 +1,26 @@ +/* GTK widgets */ +GtkBuilder *builder=NULL; + +GtkWidget *GUI_Window=NULL; +GtkWidget *GUI_Board=NULL; +GtkWidget *GUI_Whiteclock=NULL; +GtkWidget *GUI_Blackclock=NULL; +GtkWidget *GUI_Error=NULL; + +gint boardWidth; +gint boardHeight; + + +GdkPixbuf *WindowIcon=NULL; +GdkPixbuf *WhiteIcon=NULL; +GdkPixbuf *BlackIcon=NULL; +GdkPixbuf *SVGpieces[100]; +GdkPixbuf *SVGLightSquare=NULL; +GdkPixbuf *SVGDarkSquare=NULL; +GdkPixbuf *SVGNeutralSquare=NULL; + +GdkCursor *BoardCursor=NULL; + + +GdkPixbuf *load_pixbuf(char *filename,int size); +void GUI_SetAspectRatio(int ratio); diff --git a/svg/BlackBishop.svg b/svg/BlackBishop.svg new file mode 100644 index 0000000..bd92057 --- /dev/null +++ b/svg/BlackBishop.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/BlackKing.svg b/svg/BlackKing.svg new file mode 100644 index 0000000..952e36a --- /dev/null +++ b/svg/BlackKing.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/BlackKnight.svg b/svg/BlackKnight.svg new file mode 100644 index 0000000..c8022fd --- /dev/null +++ b/svg/BlackKnight.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/BlackPawn.svg b/svg/BlackPawn.svg new file mode 100644 index 0000000..f53bbf9 --- /dev/null +++ b/svg/BlackPawn.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/BlackQueen.svg b/svg/BlackQueen.svg new file mode 100644 index 0000000..d0bf286 --- /dev/null +++ b/svg/BlackQueen.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/BlackRook.svg b/svg/BlackRook.svg new file mode 100644 index 0000000..47eaf85 --- /dev/null +++ b/svg/BlackRook.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/DarkSquare.svg b/svg/DarkSquare.svg new file mode 100644 index 0000000..5c934c6 --- /dev/null +++ b/svg/DarkSquare.svg @@ -0,0 +1,81 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + D + diff --git a/svg/LightSquare.svg b/svg/LightSquare.svg new file mode 100644 index 0000000..b665d5e --- /dev/null +++ b/svg/LightSquare.svg @@ -0,0 +1,82 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + L + diff --git a/svg/NeutralSquare.svg b/svg/NeutralSquare.svg new file mode 100644 index 0000000..4b42698 --- /dev/null +++ b/svg/NeutralSquare.svg @@ -0,0 +1,107 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + N + + + + + + + diff --git a/svg/WhiteBishop.svg b/svg/WhiteBishop.svg new file mode 100644 index 0000000..0ce3450 --- /dev/null +++ b/svg/WhiteBishop.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/WhiteKing.svg b/svg/WhiteKing.svg new file mode 100644 index 0000000..00f969f --- /dev/null +++ b/svg/WhiteKing.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/WhiteKnight.svg b/svg/WhiteKnight.svg new file mode 100644 index 0000000..d3f5995 --- /dev/null +++ b/svg/WhiteKnight.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/WhitePawn.svg b/svg/WhitePawn.svg new file mode 100644 index 0000000..37ff258 --- /dev/null +++ b/svg/WhitePawn.svg @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/WhiteQueen.svg b/svg/WhiteQueen.svg new file mode 100644 index 0000000..4f34b87 --- /dev/null +++ b/svg/WhiteQueen.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/WhiteRook.svg b/svg/WhiteRook.svg new file mode 100644 index 0000000..82b4fa1 --- /dev/null +++ b/svg/WhiteRook.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/svg/icon_black.svg b/svg/icon_black.svg new file mode 100644 index 0000000..24d5b7c --- /dev/null +++ b/svg/icon_black.svg @@ -0,0 +1,64 @@ + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/svg/icon_white.svg b/svg/icon_white.svg new file mode 100644 index 0000000..2a8abe4 --- /dev/null +++ b/svg/icon_white.svg @@ -0,0 +1,64 @@ + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/svg/pieces.svg b/svg/pieces.svg new file mode 100644 index 0000000..d0501db --- /dev/null +++ b/svg/pieces.svg @@ -0,0 +1,121 @@ + + + + + + +Created by FontForge 20080430 at Sun Apr 5 00:31:19 2009 + By Arun Persaud +Generated from MetaFont bitmap by mftrace 1.2.15, http://www.xs4all.nl/~hanwen/mftrace/ + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + style="stroke-width:1px" + d="M0 161c2 5 6 9 12 11c-1 -6 -6 -12 -12 -11zM26 168l6 4c-1 -4 -2 -5 -6 -4zM42 164l10 8c-1 -6 -4 -8 -10 -8zM63 165l9 7c-1 -5 -4 -7 -9 -7zM80 161c2 5 6 9 12 11c-1 -6 -6 -11 -12 -11zM102 164l10 8c-1 -6 -5 -7 -10 -8zM123 164l9 8c-1 -5 -4 -8 -9 -8zM145 167 l7 5v-4zM162 159c-2 6 4 11 10 13c-1 -6 -5 -10 -10 -13zM78 133c-17 8 -30 3 -48 6c-4 0 -15 2 -16 7c-1 4 5 13 9 13c5 1 10 -3 15 -3c13 -1 40 7 48 -8c16 10 30 6 48 7c5 0 10 3 15 3c4 1 11 -8 9 -12c-3 -5 -12 -6 -17 -7c-11 -1 -21 2 -32 1c-5 -1 -10 -4 -15 -6v-1 c5 0 28 0 28 -7c1 -7 -7 -14 -5 -22c1 -8 8 -14 10 -23c5 -23 -14 -40 -33 -49c1 -3 3 -6 4 -9c2 -18 -28 -15 -22 2c0 3 2 5 4 7c-21 8 -39 28 -34 51c2 7 10 14 11 21c1 6 -10 18 -5 23s20 4 26 5v1zM24 155l-5 -8l47 -3l20 -11c0 31 -44 12 -62 22zM172 152l-4 -7 c0 4 0 6 4 7zM4 147c2 -4 0 -7 -4 -6zM0 121c3 6 10 15 17 13c-4 -5 -10 -14 -17 -13zM157 135l-8 -10l-24 -22c-1 5 3 8 7 12c8 8 15 15 25 20zM133 90c-2 6 3 9 7 13c9 9 20 26 32 29c-1 -6 -7 -11 -11 -15c-9 -9 -18 -20 -28 -27zM0 101c4 9 23 30 33 29 c-6 -9 -15 -16 -22 -23c-3 -3 -6 -7 -11 -6zM133 130l-3 -2zM86 127l-30 -3c5 -8 22 -6 30 -6v-5l-26 2c2 -14 15 -12 26 -12v-5c-7 0 -19 4 -25 0c-4 -2 -7 -8 -9 -13c-8 -24 13 -43 34 -51l3 33c14 0 14 6 0 6l-3 24c3 0 25 0 22 5c-3 4 -18 1 -22 1v9c7 0 15 0 22 2 c2 0 7 2 5 4c-1 3 -5 2 -7 1c-7 -1 -13 -1 -20 -1v9zM41 124c4 -5 -2 -9 -6 -13l-23 -23c-4 -4 -7 -8 -12 -7c7 16 29 31 41 43zM136 73c0 12 16 22 24 30c4 4 7 8 12 9l-10 -14zM47 110c3 -6 -3 -10 -7 -14l-27 -27c-4 -4 -7 -9 -13 -8l16 18zM106 23c-1 9 9 14 15 19 c12 11 22 24 34 36c5 5 10 12 17 14c-1 -9 -11 -15 -17 -21c-16 -16 -31 -35 -49 -48zM85 85l1 -30h-2v12c-14 0 -14 5 0 5zM36 79c2 -5 -1 -8 -4 -11c-7 -7 -22 -28 -32 -27c7 14 25 27 36 38zM100 1c3 7 11 13 17 19l35 35c6 6 12 15 20 17c-1 -8 -10 -14 -15 -19l-38 -38 c-5 -5 -12 -15 -19 -14zM38 61c3 -5 -2 -9 -5 -12l-21 -21c-4 -4 -7 -8 -12 -7c7 15 26 28 38 40zM120 1c7 14 25 27 36 38c5 5 9 11 16 13c-1 -6 -7 -11 -11 -15l-26 -26c-4 -4 -9 -11 -15 -10zM0 1c3 6 9 11 14 16c10 10 21 25 33 31c0 -6 -4 -9 -8 -13l-26 -26 c-4 -4 -7 -9 -13 -8zM20 1c5 11 18 20 27 29c3 3 7 9 12 5l-26 -26c-4 -4 -7 -9 -13 -8zM140 1c4 9 22 28 32 31c-1 -10 -14 -18 -21 -25c-3 -3 -6 -7 -11 -6zM67 30c3 -9 -19 -30 -27 -29c5 11 18 20 27 29zM86 28c-7 -3 -7 -10 0 -13v13zM69 12c5 -5 -3 -12 -9 -11zM160 1 c2 5 6 9 12 11c-1 -6 -6 -12 -12 -11zM85 1l-5 2z" + id="path3095" /> + + style="stroke-width:1px" + d="M0 161c2 5 6 9 12 11c-1 -6 -6 -12 -12 -11zM0 141c4 9 22 28 32 31c-1 -10 -14 -18 -21 -25c-3 -3 -6 -7 -11 -6zM43 165l9 7c-1 -5 -4 -6 -9 -7zM72 172c-1 -3 -3 -4 -6 -4zM92 172c-1 -3 -2 -3 -5 -3zM112 168h-6l6 4v-4zM124 166l8 6c-1 -5 -3 -7 -8 -6zM140 162 l12 10c-1 -6 -5 -11 -12 -10zM148 145c3 10 14 24 24 27c-2 -10 -16 -22 -24 -27zM17 51c1 16 3 38 9 53c4 8 11 13 13 23c2 9 -11 19 -5 27c4 4 14 4 20 5c21 3 42 3 63 0c6 -1 19 0 23 -6s-3 -13 -5 -18c-2 -4 -1 -7 0 -11c2 -9 10 -14 13 -22c4 -15 2 -34 9 -48 c2 -5 8 -5 10 -10c3 -8 -6 -17 -14 -13c-10 5 -2 13 -5 21c-3 12 -13 25 -20 36l-3 -51c13 -6 9 -26 -5 -20c-4 1 -7 6 -7 11c1 4 5 6 5 10c-1 16 -14 32 -16 48h-1c-2 -17 -10 -34 -10 -51c0 -6 7 -9 6 -16c-2 -7 -10 -10 -16 -6c-12 7 1 14 1 22c0 16 -7 35 -10 51h-1 l-17 -51c10 -5 5 -20 -6 -19c-12 2 -11 18 0 20l-3 53c-7 -11 -18 -25 -21 -38c-1 -4 3 -8 2 -13s-5 -8 -10 -8c-14 1 -11 20 1 21zM86 156l-49 -5c2 -6 8 -5 13 -6c12 -2 24 -3 36 -3v14zM144 121c-2 9 20 29 28 31c-2 -11 -19 -25 -28 -31zM133 142c2 0 2 4 0 4 s-2 -4 0 -4zM0 121c4 9 16 21 25 25c1 -8 -17 -26 -25 -25zM86 137l-44 4c5 -11 33 -9 44 -9v-5l-29 2h-11l-3 -9l43 -4v-5l-31 2l-14 1l-8 -10l14 -2l13 -4l26 -2v14c11 0 23 1 34 3c2 0 11 1 10 5c-2 3 -9 1 -11 0c-11 -1 -22 -2 -33 -2v10c11 0 21 1 32 2c2 1 11 1 9 5 c-2 3 -8 1 -10 1c-10 -1 -21 -2 -31 -2v5zM0 101c5 10 22 27 32 32c-2 -10 -13 -18 -20 -25c-4 -4 -7 -8 -12 -7zM150 113c6 6 13 17 22 19c-1 -7 -14 -23 -22 -20v1zM157 94c-2 8 8 16 15 18c-1 -7 -9 -14 -15 -18zM16 99c3 -7 -9 -19 -16 -18zM43 97l-13 2l-6 -36h1z M69 95l-19 1l2 -49h1zM86 47c0 13 7 45 -10 47l9 -47h1zM160 77c-2 7 6 13 12 15c-1 -7 -7 -11 -12 -15zM12 75c2 -7 -5 -15 -12 -14zM163 60c-1 6 3 10 9 12c-1 -6 -5 -9 -9 -12zM38 61c2 -5 -2 -9 -6 -12zM135 58h2l-3 -7zM70 53c3 -5 -2 -9 -6 -12zM172 51l-1 1zM99 36 c1 6 3 10 8 12c0 -6 -4 -9 -8 -12zM15 45c-5 -1 -4 -10 2 -10c6 1 4 11 -2 10zM139 38l-1 3zM73 36l-4 -10h-1zM50 31c-7 1 -7 -9 -1 -10c6 0 8 10 1 10zM30 30c1 -4 -2 -6 -5 -9c-6 -6 -16 -21 -25 -20zM171 30c0 -4 -3 -6 -6 -9c-6 -6 -16 -21 -25 -20zM105 26l-1 1z M144 27l4 -2l-9 -9zM0 21c2 3 3 4 7 4c-2 -3 -3 -5 -7 -4zM86 26c-6 -2 -5 -7 0 -10v10zM33 16c5 -6 -7 -16 -13 -15zM110 13l4 -2c-3 -5 -8 -11 -14 -10zM60 1l11 11c1 -6 -5 -12 -11 -11zM160 1c2 5 6 9 12 11c-1 -6 -6 -12 -12 -11zM133 11c-1 -5 -8 -11 -13 -10 c3 6 8 7 13 10zM40 1c2 5 6 7 11 7c-3 -4 -6 -8 -11 -7zM81 4l5 -1l-6 -2z" + id="path3099" /> + style="stroke-width:1px" + unicode="Ľ" + d="M0 161c2 5 6 9 12 11c-1 -6 -6 -12 -12 -11zM0 141c4 9 22 28 32 31c-1 -10 -14 -18 -21 -25c-3 -3 -6 -7 -11 -6zM0 121c7 14 25 27 36 38c5 5 9 11 16 13c-1 -9 -11 -15 -18 -21c-6 -6 -12 -13 -19 -20c-4 -4 -9 -11 -15 -10zM58 160c4 5 8 10 14 12 c-1 -8 -7 -11 -14 -12zM81 163l11 9c-1 -6 -5 -9 -11 -9zM100 162l12 10c-1 -7 -6 -10 -12 -10zM117 159c4 5 9 11 15 13c-1 -7 -8 -13 -15 -13zM133 154c3 7 12 16 19 18c-1 -8 -11 -18 -19 -18zM143 140c0 10 19 29 29 32c-2 -11 -20 -26 -29 -32zM71 61 c-7 -4 -14 -8 -22 -9c-18 -2 -39 11 -36 32c3 15 18 19 23 31c4 8 -2 24 4 30c4 5 14 6 20 7c18 4 38 4 56 0c5 -2 14 -3 17 -7c7 -6 -1 -23 4 -31c7 -11 21 -16 23 -31c2 -20 -18 -33 -36 -31c-8 1 -15 5 -22 9l-2 -17l-10 -9l-1 -12c9 0 9 -5 0 -5c0 -9 -5 -9 -5 0 c-9 0 -9 5 0 5l-1 12l-10 9zM144 121c0 10 18 28 28 31c-2 -11 -19 -25 -28 -31zM86 150c-12 0 -28 -1 -38 -7l38 -6v-5c-15 0 -29 3 -43 8c0 -16 31 -15 43 -15v-5l-44 6l1 -11l11 -4l32 -4v-5h3c0 -9 2 -16 6 -24c3 -6 8 -12 14 -15c5 -3 10 -5 16 -6c14 -1 31 8 30 24 c-1 10 -8 18 -16 24c-4 3 -7 7 -12 8c-13 1 -28 -5 -41 -5v11c11 0 22 1 32 4c2 0 11 2 9 5s-8 1 -10 1c-10 -3 -20 -4 -31 -4v6c11 0 22 1 32 4c2 1 12 4 8 7c-2 2 -8 -1 -11 -1c-10 -3 -19 -4 -29 -4v13zM29 132c3 -9 -21 -32 -29 -31c5 12 20 22 29 31zM150 113 c6 6 13 17 22 19c-1 -7 -14 -23 -22 -20v1zM161 99c-1 6 5 11 11 13c-1 -6 -6 -10 -11 -13zM84 102c-14 0 -29 7 -43 7c-12 -1 -25 -22 -22 -33c4 -21 31 -23 46 -13c6 4 11 10 14 16c3 7 5 15 5 23zM128 108c5 -7 13 -10 17 -17c9 -13 0 -27 -14 -28c-15 -1 -27 8 -33 21 c-2 4 -6 14 -3 17c2 3 6 2 9 2c8 1 16 3 24 5zM168 85c-1 4 0 6 4 7zM5 88c1 -4 0 -8 -5 -7zM87 83c-8 -8 -19 -34 -5 -41c16 -8 16 18 13 26c-3 5 -5 10 -8 15zM86 73c5 -6 11 -24 0 -27v27zM100 1l16 18l39 34l17 19c-1 -8 -10 -14 -15 -19l-38 -38c-5 -5 -12 -15 -19 -14 zM6 69c3 -5 -1 -9 -6 -8zM0 41c2 5 11 17 17 12c-5 -5 -10 -13 -17 -12zM120 1c7 14 25 27 36 38c5 5 9 11 16 13c-1 -6 -7 -11 -11 -15l-26 -26c-4 -4 -9 -11 -15 -10zM0 21c4 8 20 27 30 26c-5 -7 -21 -27 -30 -26zM108 45l1 3zM20 1c6 12 21 23 30 32c5 5 9 10 15 13 c0 -6 -4 -9 -8 -13l-24 -24c-4 -4 -7 -9 -13 -8zM0 1c6 13 22 24 32 34c5 5 8 9 15 9c-9 -13 -22 -23 -33 -34c-4 -4 -8 -10 -14 -9zM106 23c-3 9 13 21 21 21zM71 34l4 -3c-9 -6 -16 -16 -23 -23c-4 -4 -7 -8 -12 -7c6 12 21 23 31 33zM140 1c4 9 22 28 32 31 c-1 -10 -14 -18 -21 -25c-3 -3 -6 -7 -11 -6zM60 1c3 6 7 11 14 10c-3 -5 -8 -11 -14 -10zM160 1c2 5 6 9 12 11c-1 -6 -6 -12 -12 -11zM84 0l-4 3l4 -2v-1z" + id="glyph3101" /> + diff --git a/xboard.c b/xboard.c index 0e8b132..424e2d2 100644 --- a/xboard.c +++ b/xboard.c @@ -2,7 +2,7 @@ * xboard.c -- X front end for XBoard * * Copyright 1991 by Digital Equipment Corporation, Maynard, - * Massachusetts. + * Massachusetts. * * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, * 2007, 2008, 2009 Free Software Foundation, Inc. @@ -182,6 +182,10 @@ extern char *getenv(); #include "bitmaps/bitmaps.h" #endif +#include +#include +#include + #include "bitmaps/icon_white.bm" #include "bitmaps/icon_black.bm" #include "bitmaps/checkmark.bm" @@ -195,6 +199,8 @@ extern char *getenv(); #include "xhistory.h" #include "xedittags.h" #include "gettext.h" +#include "callback.h" +#include "interface.h" // must be moved to xengineoutput.h @@ -229,6 +235,13 @@ typedef struct { MenuItem *mi; } Menu; +typedef struct { + char *name; + gboolean value; +} Enables; + + + int main P((int argc, char **argv)); RETSIGTYPE CmailSigHandler P((int sig)); RETSIGTYPE IntSigHandler P((int sig)); @@ -244,12 +257,8 @@ void PieceMenuPopup P((Widget w, XEvent *event, String *params, Cardinal *num_params)); static void PieceMenuSelect P((Widget w, ChessSquare piece, caddr_t junk)); static void DropMenuSelect P((Widget w, ChessSquare piece, caddr_t junk)); -void ReadBitmap P((Pixmap *pm, String name, unsigned char bits[], - u_int wreq, u_int hreq)); -void CreateGrid P((void)); int EventToSquare P((int x, int limit)); void DrawSquare P((int row, int column, ChessSquare piece, int do_flash)); -void EventProc P((Widget widget, caddr_t unused, XEvent *event)); void HandleUserMove P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void AnimateUserMove P((Widget w, XEvent * event, @@ -258,10 +267,6 @@ void WhiteClock P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void BlackClock P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void DrawPositionProc P((Widget w, XEvent *event, - String *prms, Cardinal *nprms)); -void XDrawPosition P((Widget w, /*Boolean*/int repaint, - Board board)); void CommentPopUp P((char *title, char *label)); void CommentPopDown P((void)); void CommentCallback P((Widget w, XtPointer client_data, @@ -288,14 +293,6 @@ void EditCommentPopDown P((void)); void EditCommentCallback P((Widget w, XtPointer client_data, XtPointer call_data)); void SelectCommand P((Widget w, XtPointer client_data, XtPointer call_data)); -void ResetProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void LoadGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void LoadNextGameProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void LoadPrevGameProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void ReloadGameProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); void LoadPositionProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void LoadNextPositionProc P((Widget w, XEvent *event, String *prms, @@ -316,20 +313,10 @@ void SavePositionProc P((Widget w, XEvent *event, void MailMoveProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void ReloadCmailMsgProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void QuitProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void PauseProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void MachineBlackProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void MachineWhiteProc P((Widget w, XEvent *event, - String *prms, Cardinal *nprms)); void AnalyzeModeProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void AnalyzeFileProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void TwoMachinesProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void IcsClientProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); void EditGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void EditPositionProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); @@ -338,32 +325,7 @@ void EditCommentProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void IcsInputBoxProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void AcceptProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void DeclineProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void RematchProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void CallFlagProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void DrawProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void AbortProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void AdjournProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void ResignProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void AdjuWhiteProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void AdjuBlackProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void AdjuDrawProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void EnterKeyProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void StopObservingProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void StopExaminingProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void BackwardProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void ForwardProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void ToStartProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void ToEndProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void RevertProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void TruncateGameProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void RetractMoveProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); -void MoveNowProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void AlwaysQueenProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void AnimateDraggingProc P((Widget w, XEvent *event, String *prms, @@ -381,7 +343,6 @@ void AutosaveProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void BlindfoldProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void FlashMovesProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void FlipViewProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void GetMoveListProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void HighlightDraggingProc P((Widget w, XEvent *event, String *prms, @@ -402,20 +363,13 @@ void PopupExitMessageProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void PremoveProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void QuietPlayProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void ShowCoordsProc P((Widget w, XEvent *event, String *prms, - Cardinal *nprms)); void ShowThinkingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void HideThinkingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void TestLegalityProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void InfoProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void ManProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void HintProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void BookProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void AboutGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -void AboutProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void DebugProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void NothingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void Iconify P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); @@ -427,9 +381,9 @@ void ErrorPopUp P((char *title, char *text, int modal)); void ErrorPopDown P((void)); static char *ExpandPathName P((char *path)); static void CreateAnimVars P((void)); -static void DragPieceBegin P((int x, int y)); +void DragPieceBegin P((int x, int y)); static void DragPieceMove P((int x, int y)); -static void DragPieceEnd P((int x, int y)); +void DragPieceEnd P((int x, int y)); static void DrawDragPiece P((void)); char *ModeToWidgetName P((GameMode mode)); void EngineOutputUpdate( FrontEndProgramStats * stats ); @@ -446,6 +400,8 @@ void UciPopDown P(()); void TimeControlPopDown P(()); void NewVariantPopDown P(()); void SettingsPopDown P(()); +void SetMenuEnables P((Enables *enab)); + /* * XBoard depends on Xt R4 or higher */ @@ -457,17 +413,21 @@ Window xBoardWindow; Pixel lightSquareColor, darkSquareColor, whitePieceColor, blackPieceColor, jailSquareColor, highlightSquareColor, premoveHighlightColor; Pixel lowTimeWarningColor; -GC lightSquareGC, darkSquareGC, jailSquareGC, lineGC, wdPieceGC, wlPieceGC, - bdPieceGC, blPieceGC, wbPieceGC, bwPieceGC, coordGC, highlineGC, - wjPieceGC, bjPieceGC, prelineGC, countGC; + +#define LINE_TYPE_NORMAL 0 +#define LINE_TYPE_HIGHLIGHT 1 +#define LINE_TYPE_PRE 2 + + +GC lightSquareGC, darkSquareGC, jailSquareGC, wdPieceGC, wlPieceGC, + bdPieceGC, blPieceGC, wbPieceGC, bwPieceGC, coordGC, + wjPieceGC, bjPieceGC; Pixmap iconPixmap, wIconPixmap, bIconPixmap, xMarkPixmap; Widget shellWidget, layoutWidget, formWidget, boardWidget, messageWidget, whiteTimerWidget, blackTimerWidget, titleWidget, widgetList[16], commentShell, promotionShell, whitePieceMenu, blackPieceMenu, dropMenu, menuBarWidget, buttonBarWidget, editShell, errorShell, analysisShell, ICSInputShell, fileNameShell, askQuestionShell; -XSegment gridSegments[(BOARD_SIZE + 1) * 2]; -XSegment jailGridSegments[(BOARD_SIZE + 3) * 2]; Font clockFontID, coordFontID, countFontID; XFontStruct *clockFontStruct, *coordFontStruct, *countFontStruct; XtAppContext appContext; @@ -499,7 +459,7 @@ Pixmap pieceBitmap2[2][(int)BlackPawn+4]; /* [HGM] pieces */ Pixmap xpmPieceBitmap[4][(int)BlackPawn]; /* LL, LD, DL, DD actually used*/ Pixmap xpmPieceBitmap2[4][(int)BlackPawn+4]; /* LL, LD, DL, DD set to select from */ Pixmap xpmLightSquare, xpmDarkSquare, xpmJailSquare; -int useImages, useImageSqs; +int useImages=0, useImageSqs; XImage *ximPieceBitmap[4][(int)BlackPawn+4]; /* LL, LD, DL, DD */ Pixmap ximMaskPm[(int)BlackPawn]; /* clipmasks, used for XIM pieces */ Pixmap ximMaskPm2[(int)BlackPawn+4]; /* clipmasks, used for XIM pieces */ @@ -542,15 +502,161 @@ static Pixmap xpmMask[BlackKing + 1]; SizeDefaults sizeDefaults[] = SIZE_DEFAULTS; +Enables icsEnables[] = { + { "menuFile.Mail Move", False }, + { "menuFile.Reload CMail Message", False }, + { "menuMode.Machine Black", False }, + { "menuMode.Machine White", False }, + { "menuMode.Analysis Mode", False }, + { "menuMode.Analyze File", False }, + { "menuMode.Two Machines", False }, +#ifndef ZIPPY + { "menuHelp.Hint", False }, + { "menuHelp.Book", False }, + { "menuStep.Move Now", False }, + { "menuOptions.Periodic Updates", False }, + { "menuOptions.Hide Thinking", False }, + { "menuOptions.Ponder Next Move", False }, +#endif + { NULL, False } +}; + +Enables ncpEnables[] = { + { "menuFile.Mail Move", False }, + { "menuFile.Reload CMail Message", False }, + { "menuMode.Machine White", False }, + { "menuMode.Machine Black", False }, + { "menuMode.Analysis Mode", False }, + { "menuMode.Analyze File", False }, + { "menuMode.Two Machines", False }, + { "menuMode.ICS Client", False }, + { "menuMode.ICS Input Box", False }, + { "Action", False }, + { "menuStep.Revert", False }, + { "menuStep.Move Now", False }, + { "menuStep.Retract Move", False }, + { "menuOptions.Auto Comment", False }, + { "menuOptions.Auto Flag", False }, + { "menuOptions.Auto Flip View", False }, + { "menuOptions.Auto Observe", False }, + { "menuOptions.Auto Raise Board", False }, + { "menuOptions.Get Move List", False }, + { "menuOptions.ICS Alarm", False }, + { "menuOptions.Move Sound", False }, + { "menuOptions.Quiet Play", False }, + { "menuOptions.Hide Thinking", False }, + { "menuOptions.Periodic Updates", False }, + { "menuOptions.Ponder Next Move", False }, + { "menuHelp.Hint", False }, + { "menuHelp.Book", False }, + { NULL, False } +}; + +Enables gnuEnables[] = { + { "menuMode.ICS Client", False }, + { "menuMode.ICS Input Box", False }, + { "menuAction.Accept", False }, + { "menuAction.Decline", False }, + { "menuAction.Rematch", False }, + { "menuAction.Adjourn", False }, + { "menuAction.Stop Examining", False }, + { "menuAction.Stop Observing", False }, + { "menuStep.Revert", False }, + { "menuOptions.Auto Comment", False }, + { "menuOptions.Auto Observe", False }, + { "menuOptions.Auto Raise Board", False }, + { "menuOptions.Get Move List", False }, + { "menuOptions.Premove", False }, + { "menuOptions.Quiet Play", False }, + + /* The next two options rely on SetCmailMode being called *after* */ + /* SetGNUMode so that when GNU is being used to give hints these */ + /* menu options are still available */ + + { "menuFile.Mail Move", False }, + { "menuFile.Reload CMail Message", False }, + { NULL, False } +}; + +Enables cmailEnables[] = { + { "Action", True }, + { "menuAction.Call Flag", False }, + { "menuAction.Draw", True }, + { "menuAction.Adjourn", False }, + { "menuAction.Abort", False }, + { "menuAction.Stop Observing", False }, + { "menuAction.Stop Examining", False }, + { "menuFile.Mail Move", True }, + { "menuFile.Reload CMail Message", True }, + { NULL, False } +}; + +Enables trainingOnEnables[] = { + { "menuMode.Edit Comment", False }, + { "menuMode.Pause", False }, + { "menuStep.Forward", False }, + { "menuStep.Backward", False }, + { "menuStep.Forward to End", False }, + { "menuStep.Back to Start", False }, + { "menuStep.Move Now", False }, + { "menuStep.Truncate Game", False }, + { NULL, False } +}; + +Enables trainingOffEnables[] = { + { "menuMode.Edit Comment", True }, + { "menuMode.Pause", True }, + { "menuStep.Forward", True }, + { "menuStep.Backward", True }, + { "menuStep.Forward to End", True }, + { "menuStep.Back to Start", True }, + { "menuStep.Move Now", True }, + { "menuStep.Truncate Game", True }, + { NULL, False } +}; + +Enables machineThinkingEnables[] = { + { "menuFile.Load Game", False }, + { "menuFile.Load Next Game", False }, + { "menuFile.Load Previous Game", False }, + { "menuFile.Reload Same Game", False }, + { "menuFile.Paste Game", False }, + { "menuFile.Load Position", False }, + { "menuFile.Load Next Position", False }, + { "menuFile.Load Previous Position", False }, + { "menuFile.Reload Same Position", False }, + { "menuFile.Paste Position", False }, + { "menuMode.Machine White", False }, + { "menuMode.Machine Black", False }, + { "menuMode.Two Machines", False }, + { "menuStep.Retract Move", False }, + { NULL, False } +}; + +Enables userThinkingEnables[] = { + { "menuFile.Load Game", True }, + { "menuFile.Load Next Game", True }, + { "menuFile.Load Previous Game", True }, + { "menuFile.Reload Same Game", True }, + { "menuFile.Paste Game", True }, + { "menuFile.Load Position", True }, + { "menuFile.Load Next Position", True }, + { "menuFile.Load Previous Position", True }, + { "menuFile.Reload Same Position", True }, + { "menuFile.Paste Position", True }, + { "menuMode.Machine White", True }, + { "menuMode.Machine Black", True }, + { "menuMode.Two Machines", True }, + { "menuStep.Retract Move", True }, + { NULL, False } +}; + + + MenuItem fileMenu[] = { - {N_("New Game"), ResetProc}, {N_("New Shuffle Game ..."), ShuffleMenuProc}, {N_("New Variant ..."), NewVariantProc}, // [HGM] variant: not functional yet {"----", NothingProc}, - {N_("Load Game"), LoadGameProc}, - {N_("Load Next Game"), LoadNextGameProc}, - {N_("Load Previous Game"), LoadPrevGameProc}, - {N_("Reload Same Game"), ReloadGameProc}, {N_("Save Game"), SaveGameProc}, {"----", NothingProc}, {N_("Copy Game"), CopyGameProc}, @@ -568,17 +674,16 @@ MenuItem fileMenu[] = { {N_("Mail Move"), MailMoveProc}, {N_("Reload CMail Message"), ReloadCmailMsgProc}, {"----", NothingProc}, - {N_("Exit"), QuitProc}, {NULL, NULL} }; MenuItem modeMenu[] = { - {N_("Machine White"), MachineWhiteProc}, - {N_("Machine Black"), MachineBlackProc}, - {N_("Two Machines"), TwoMachinesProc}, + // {N_("Machine White"), MachineWhiteProc}, + // {N_("Machine Black"), MachineBlackProc}, + // {N_("Two Machines"), TwoMachinesProc}, {N_("Analysis Mode"), AnalyzeModeProc}, {N_("Analyze File"), AnalyzeFileProc }, - {N_("ICS Client"), IcsClientProc}, + // {N_("ICS Client"), IcsClientProc}, {N_("Edit Game"), EditGameProc}, {N_("Edit Position"), EditPositionProc}, {N_("Training"), TrainingProc}, @@ -591,46 +696,12 @@ MenuItem modeMenu[] = { {N_("Edit Tags"), EditTagsProc}, {N_("Edit Comment"), EditCommentProc}, {N_("ICS Input Box"), IcsInputBoxProc}, - {N_("Pause"), PauseProc}, - {NULL, NULL} -}; - -MenuItem actionMenu[] = { - {N_("Accept"), AcceptProc}, - {N_("Decline"), DeclineProc}, - {N_("Rematch"), RematchProc}, - {"----", NothingProc}, - {N_("Call Flag"), CallFlagProc}, - {N_("Draw"), DrawProc}, - {N_("Adjourn"), AdjournProc}, - {N_("Abort"), AbortProc}, - {N_("Resign"), ResignProc}, - {"----", NothingProc}, - {N_("Stop Observing"), StopObservingProc}, - {N_("Stop Examining"), StopExaminingProc}, - {"----", NothingProc}, - {N_("Adjudicate to White"), AdjuWhiteProc}, - {N_("Adjudicate to Black"), AdjuBlackProc}, - {N_("Adjudicate Draw"), AdjuDrawProc}, - {NULL, NULL} -}; - -MenuItem stepMenu[] = { - {N_("Backward"), BackwardProc}, - {N_("Forward"), ForwardProc}, - {N_("Back to Start"), ToStartProc}, - {N_("Forward to End"), ToEndProc}, - {N_("Revert"), RevertProc}, - {N_("Truncate Game"), TruncateGameProc}, - {"----", NothingProc}, - {N_("Move Now"), MoveNowProc}, - {N_("Retract Move"), RetractMoveProc}, {NULL, NULL} }; MenuItem optionsMenu[] = { - {N_("Flip View"), FlipViewProc}, - {"----", NothingProc}, + // {N_("Flip View"), FlipViewProc}, + // {"----", NothingProc}, {N_("Adjudications ..."), EngineMenuProc}, {N_("General Settings ..."), UciMenuProc}, {N_("Engine #1 Settings ..."), FirstSettingsProc}, @@ -662,63 +733,48 @@ MenuItem optionsMenu[] = { {N_("Popup Move Errors"), PopupMoveErrorsProc}, {N_("Premove"), PremoveProc}, {N_("Quiet Play"), QuietPlayProc}, - {N_("Show Coords"), ShowCoordsProc}, {N_("Hide Thinking"), HideThinkingProc}, {N_("Test Legality"), TestLegalityProc}, {NULL, NULL} }; -MenuItem helpMenu[] = { - {N_("Info XBoard"), InfoProc}, - {N_("Man XBoard"), ManProc}, - {"----", NothingProc}, - {N_("Hint"), HintProc}, - {N_("Book"), BookProc}, - {"----", NothingProc}, - {N_("About XBoard"), AboutProc}, - {NULL, NULL} -}; - Menu menuBar[] = { {N_("File"), fileMenu}, {N_("Mode"), modeMenu}, - {N_("Action"), actionMenu}, - {N_("Step"), stepMenu}, {N_("Options"), optionsMenu}, - {N_("Help"), helpMenu}, {NULL, NULL} }; #define PAUSE_BUTTON N_("P") MenuItem buttonBar[] = { - {"<<", ToStartProc}, - {"<", BackwardProc}, - {PAUSE_BUTTON, PauseProc}, - {">", ForwardProc}, - {">>", ToEndProc}, + // {"<<", ToStartProc}, + // {"<", BackwardProc}, + // {PAUSE_BUTTON, PauseProc}, + // {">", ForwardProc}, + // {">>", ToEndProc}, {NULL, NULL} }; #define PIECE_MENU_SIZE 18 String pieceMenuStrings[2][PIECE_MENU_SIZE] = { { N_("White"), "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"), - N_("Queen"), N_("King"), "----", N_("Elephant"), N_("Cannon"), - N_("Archbishop"), N_("Chancellor"), "----", N_("Promote"), N_("Demote"), + N_("Queen"), N_("King"), "----", N_("Elephant"), N_("Cannon"), + N_("Archbishop"), N_("Chancellor"), "----", N_("Promote"), N_("Demote"), N_("Empty square"), N_("Clear board") }, { N_("Black"), "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"), - N_("Queen"), N_("King"), "----", N_("Elephant"), N_("Cannon"), - N_("Archbishop"), N_("Chancellor"), "----", N_("Promote"), N_("Demote"), + N_("Queen"), N_("King"), "----", N_("Elephant"), N_("Cannon"), + N_("Archbishop"), N_("Chancellor"), "----", N_("Promote"), N_("Demote"), N_("Empty square"), N_("Clear board") } }; /* must be in same order as PieceMenuStrings! */ ChessSquare pieceMenuTranslation[2][PIECE_MENU_SIZE] = { { WhitePlay, (ChessSquare) 0, WhitePawn, WhiteKnight, WhiteBishop, WhiteRook, WhiteQueen, WhiteKing, (ChessSquare) 0, WhiteAlfil, - WhiteCannon, WhiteAngel, WhiteMarshall, (ChessSquare) 0, + WhiteCannon, WhiteAngel, WhiteMarshall, (ChessSquare) 0, PromotePiece, DemotePiece, EmptySquare, ClearBoard }, { BlackPlay, (ChessSquare) 0, BlackPawn, BlackKnight, BlackBishop, BlackRook, BlackQueen, BlackKing, (ChessSquare) 0, BlackAlfil, - BlackCannon, BlackAngel, BlackMarshall, (ChessSquare) 0, + BlackCannon, BlackAngel, BlackMarshall, (ChessSquare) 0, PromotePiece, DemotePiece, EmptySquare, ClearBoard }, }; @@ -745,15 +801,6 @@ DropMenuEnables dmEnables[] = { { 'Q', "Queen" } }; -Arg shellArgs[] = { - { XtNwidth, 0 }, - { XtNheight, 0 }, - { XtNminWidth, 0 }, - { XtNminHeight, 0 }, - { XtNmaxWidth, 0 }, - { XtNmaxHeight, 0 } -}; - Arg layoutArgs[] = { { XtNborderWidth, 0 }, { XtNdefaultDistance, 0 }, @@ -770,25 +817,6 @@ Arg boardArgs[] = { { XtNheight, 0 } }; -Arg titleArgs[] = { - { XtNjustify, (XtArgVal) XtJustifyRight }, - { XtNlabel, (XtArgVal) "..." }, - { XtNresizable, (XtArgVal) True }, - { XtNresize, (XtArgVal) False } -}; - -Arg messageArgs[] = { - { XtNjustify, (XtArgVal) XtJustifyLeft }, - { XtNlabel, (XtArgVal) "..." }, - { XtNresizable, (XtArgVal) True }, - { XtNresize, (XtArgVal) False } -}; - -Arg timerArgs[] = { - { XtNborderWidth, 0 }, - { XtNjustify, (XtArgVal) XtJustifyLeft } -}; - XtResource clientResources[] = { { "whitePieceColor", "whitePieceColor", XtRString, sizeof(String), XtOffset(AppDataPtr, whitePieceColor), XtRString, @@ -1776,7 +1804,6 @@ XrmOptionDescRec shellOptions[] = { XtActionsRec boardActions[] = { - { "DrawPosition", DrawPositionProc }, { "HandleUserMove", HandleUserMove }, { "AnimateUserMove", AnimateUserMove }, { "FileNameAction", FileNameAction }, @@ -1786,12 +1813,7 @@ XtActionsRec boardActions[] = { { "WhiteClock", WhiteClock }, { "BlackClock", BlackClock }, { "Iconify", Iconify }, - { "ResetProc", ResetProc }, - { "LoadGameProc", LoadGameProc }, - { "LoadNextGameProc", LoadNextGameProc }, - { "LoadPrevGameProc", LoadPrevGameProc }, { "LoadSelectedProc", LoadSelectedProc }, - { "ReloadGameProc", ReloadGameProc }, { "LoadPositionProc", LoadPositionProc }, { "LoadNextPositionProc", LoadNextPositionProc }, { "LoadPrevPositionProc", LoadPrevPositionProc }, @@ -1804,13 +1826,12 @@ XtActionsRec boardActions[] = { { "SavePositionProc", SavePositionProc }, { "MailMoveProc", MailMoveProc }, { "ReloadCmailMsgProc", ReloadCmailMsgProc }, - { "QuitProc", QuitProc }, - { "MachineWhiteProc", MachineWhiteProc }, - { "MachineBlackProc", MachineBlackProc }, + // { "MachineWhiteProc", MachineWhiteProc }, + // { "MachineBlackProc", MachineBlackProc }, { "AnalysisModeProc", AnalyzeModeProc }, { "AnalyzeFileProc", AnalyzeFileProc }, - { "TwoMachinesProc", TwoMachinesProc }, - { "IcsClientProc", IcsClientProc }, + // { "TwoMachinesProc", TwoMachinesProc }, + // { "IcsClientProc", IcsClientProc }, { "EditGameProc", EditGameProc }, { "EditPositionProc", EditPositionProc }, { "TrainingProc", EditPositionProc }, @@ -1821,29 +1842,28 @@ XtActionsRec boardActions[] = { { "EditCommentProc", EditCommentProc }, { "IcsAlarmProc", IcsAlarmProc }, { "IcsInputBoxProc", IcsInputBoxProc }, - { "PauseProc", PauseProc }, - { "AcceptProc", AcceptProc }, - { "DeclineProc", DeclineProc }, - { "RematchProc", RematchProc }, - { "CallFlagProc", CallFlagProc }, - { "DrawProc", DrawProc }, - { "AdjournProc", AdjournProc }, - { "AbortProc", AbortProc }, - { "ResignProc", ResignProc }, - { "AdjuWhiteProc", AdjuWhiteProc }, - { "AdjuBlackProc", AdjuBlackProc }, - { "AdjuDrawProc", AdjuDrawProc }, + // { "AcceptProc", AcceptProc }, + // { "DeclineProc", DeclineProc }, + // { "RematchProc", RematchProc }, + // { "CallFlagProc", CallFlagProc }, + // { "DrawProc", DrawProc }, + // { "AdjournProc", AdjournProc }, + // { "AbortProc", AbortProc }, + // { "ResignProc", ResignProc }, + // { "AdjuWhiteProc", AdjuWhiteProc }, + // { "AdjuBlackProc", AdjuBlackProc }, + // { "AdjuDrawProc", AdjuDrawProc }, { "EnterKeyProc", EnterKeyProc }, - { "StopObservingProc", StopObservingProc }, - { "StopExaminingProc", StopExaminingProc }, - { "BackwardProc", BackwardProc }, - { "ForwardProc", ForwardProc }, - { "ToStartProc", ToStartProc }, - { "ToEndProc", ToEndProc }, - { "RevertProc", RevertProc }, - { "TruncateGameProc", TruncateGameProc }, - { "MoveNowProc", MoveNowProc }, - { "RetractMoveProc", RetractMoveProc }, + // { "StopObservingProc", StopObservingProc }, + // { "StopExaminingProc", StopExaminingProc }, + // { "BackwardProc", BackwardProc }, + // { "ForwardProc", ForwardProc }, + // { "ToStartProc", ToStartProc }, + // { "ToEndProc", ToEndProc }, + // { "RevertProc", RevertProc }, + // { "TruncateGameProc", TruncateGameProc }, + // { "MoveNowProc", MoveNowProc }, + // { "RetractMoveProc", RetractMoveProc }, { "AlwaysQueenProc", AlwaysQueenProc }, { "AnimateDraggingProc", AnimateDraggingProc }, { "AnimateMovingProc", AnimateMovingProc }, @@ -1854,7 +1874,7 @@ XtActionsRec boardActions[] = { { "AutosaveProc", AutosaveProc }, { "BlindfoldProc", BlindfoldProc }, { "FlashMovesProc", FlashMovesProc }, - { "FlipViewProc", FlipViewProc }, + // { "FlipViewProc", FlipViewProc }, { "GetMoveListProc", GetMoveListProc }, #if HIGHDRAG { "HighlightDraggingProc", HighlightDraggingProc }, @@ -1869,16 +1889,14 @@ XtActionsRec boardActions[] = { { "PopupMoveErrorsProc", PopupMoveErrorsProc }, { "PremoveProc", PremoveProc }, { "QuietPlayProc", QuietPlayProc }, - { "ShowCoordsProc", ShowCoordsProc }, { "ShowThinkingProc", ShowThinkingProc }, { "HideThinkingProc", HideThinkingProc }, { "TestLegalityProc", TestLegalityProc }, - { "InfoProc", InfoProc }, - { "ManProc", ManProc }, - { "HintProc", HintProc }, - { "BookProc", BookProc }, + // { "InfoProc", InfoProc }, + // { "ManProc", ManProc }, + // { "HintProc", HintProc }, + // { "BookProc", BookProc }, { "AboutGameProc", AboutGameProc }, - { "AboutProc", AboutProc }, { "DebugProc", DebugProc }, { "NothingProc", NothingProc }, { "CommentPopDown", (XtActionProc) CommentPopDown }, @@ -1901,47 +1919,6 @@ XtActionsRec boardActions[] = { { "SettingsPopDown", (XtActionProc) SettingsPopDown }, }; -char globalTranslations[] = - ":R: ResignProc() \n \ - :r: ResetProc() \n \ - :g: LoadGameProc() \n \ - :N: LoadNextGameProc() \n \ - :P: LoadPrevGameProc() \n \ - :Q: QuitProc() \n \ - :F: ToEndProc() \n \ - :f: ForwardProc() \n \ - :B: ToStartProc() \n \ - :b: BackwardProc() \n \ - :p: PauseProc() \n \ - :d: DrawProc() \n \ - :t: CallFlagProc() \n \ - :i: Iconify() \n \ - :c: Iconify() \n \ - :v: FlipViewProc() \n \ - Control_L: BackwardProc() \n \ - Control_L: ForwardProc() \n \ - Control_R: BackwardProc() \n \ - Control_R: ForwardProc() \n \ - Shift1: AskQuestionProc(\"Direct command\",\ - \"Send to chess program:\",,1) \n \ - Shift2: AskQuestionProc(\"Direct command\",\ - \"Send to second chess program:\",,2) \n"; - -char boardTranslations[] = - ": HandleUserMove() \n \ - : HandleUserMove() \n \ - : AnimateUserMove() \n \ - Shift: XawPositionSimpleMenu(menuB) XawPositionSimpleMenu(menuD)\ - PieceMenuPopup(menuB) \n \ - Any: XawPositionSimpleMenu(menuW) XawPositionSimpleMenu(menuD) \ - PieceMenuPopup(menuW) \n \ - Shift: XawPositionSimpleMenu(menuW) XawPositionSimpleMenu(menuD)\ - PieceMenuPopup(menuW) \n \ - Any: XawPositionSimpleMenu(menuB) XawPositionSimpleMenu(menuD) \ - PieceMenuPopup(menuB) \n"; - -char whiteTranslations[] = ": WhiteClock()\n"; -char blackTranslations[] = ": BlackClock()\n"; char ICSInputTranslations[] = "Return: EnterKeyProc() \n"; @@ -1953,144 +1930,6 @@ String xboardResources[] = { NULL }; - -/* Max possible square size */ -#define MAXSQSIZE 256 - -static int xpm_avail[MAXSQSIZE]; - -#ifdef HAVE_DIR_STRUCT - -/* Extract piece size from filename */ -static int -xpm_getsize(name, len, ext) - char *name; - int len; - char *ext; -{ - char *p, *d; - char buf[10]; - - if (len < 4) - return 0; - - if ((p=strchr(name, '.')) == NULL || - StrCaseCmp(p+1, ext) != 0) - return 0; - - p = name + 3; - d = buf; - - while (*p && isdigit(*p)) - *(d++) = *(p++); - - *d = 0; - return atoi(buf); -} - -/* Setup xpm_avail */ -static int -xpm_getavail(dirname, ext) - char *dirname; - char *ext; -{ - DIR *dir; - struct dirent *ent; - int i; - - for (i=0; id_name, NAMLEN(ent), ext); - if (i > 0 && i < MAXSQSIZE) - xpm_avail[i] = 1; - } - - closedir(dir); - - return 0; -} - -void -xpm_print_avail(fp, ext) - FILE *fp; - char *ext; -{ - int i; - - fprintf(fp, _("Available `%s' sizes:\n"), ext); - for (i=1; i= 1000-2) { printf(_("too many arguments\n")); exit(-1); } -//fprintf(stderr, "arg %s\n", argv[i]); + //fprintf(stderr, "arg %s\n", argv[i]); if(argv[i][0] != '@') argvCopy[j++] = argv[i]; else { char c; FILE *f = fopen(argv[i]+1, "rb"); @@ -2415,25 +2214,72 @@ main(argc, argv) XtAppInitialize(&appContext, "XBoard", shellOptions, XtNumber(shellOptions), &argc, argv, xboardResources, NULL, 0); - if (argc > 1) { + + + /* set up GTK */ + gtk_init (&argc, &argv); + + /* parse glade file to build widgets */ + + builder = gtk_builder_new (); + gtk_builder_add_from_file (builder, "gtk-interface.xml", NULL); + + /* test if everything worked ok */ + + GUI_Window = GTK_WIDGET (gtk_builder_get_object (builder, "MainWindow")); + if(!GUI_Window) printf("Error: gtk_builder didn't work!\n"); + GUI_Board = GTK_WIDGET (gtk_builder_get_object (builder, "Board")); + if(!GUI_Board) printf("Error: gtk_builder didn't work!\n"); + GUI_Whiteclock = GTK_WIDGET (gtk_builder_get_object (builder, "WhiteClock")); + if(!GUI_Whiteclock) printf("Error: gtk_builder didn't work!\n"); + GUI_Blackclock = GTK_WIDGET (gtk_builder_get_object (builder, "BlackClock")); + if(!GUI_Blackclock) printf("Error: gtk_builder didn't work!\n"); + + gtk_builder_connect_signals (builder, NULL); + + // don't unref the builder, since we use it to get references to widgets + // g_object_unref (G_OBJECT (builder)); + + /* end parse glade file */ + + if (argc > 1) + { fprintf(stderr, _("%s: unrecognized argument %s\n"), programName, argv[1]); fprintf(stderr, "Recognized options:\n"); - for(i = 0; i < XtNumber(shellOptions); i++) { + for(i = 0; i < XtNumber(shellOptions); i++) + { j = fprintf(stderr, " %s%s", shellOptions[i].option, (shellOptions[i].argKind == XrmoptionSepArg ? " ARG" : "")); - if (i++ < XtNumber(shellOptions)) { + if (i++ < XtNumber(shellOptions)) + { fprintf(stderr, "%*c%s%s\n", 40 - j, ' ', shellOptions[i].option, (shellOptions[i].argKind == XrmoptionSepArg ? " ARG" : "")); - } else { + } + else + { fprintf(stderr, "\n"); - } - } + } + } exit(2); - } + } + + if ((chessDir = (char *) getenv("CHESSDIR")) == NULL) + { + chessDir = "."; + } + else + { + if (chdir(chessDir) != 0) + { + fprintf(stderr, _("%s: can't cd to CHESSDIR: "), programName); + perror(chessDir); + exit(1); + } + } p = getenv("HOME"); if (p == NULL) p = "/tmp"; @@ -2481,7 +2327,7 @@ main(argc, argv) /* [HGM,HR] make sure board size is acceptable */ if(appData.NrFiles > BOARD_SIZE || appData.NrRanks > BOARD_SIZE ) - DisplayFatalError(_("Recompile with BOARD_SIZE > 12, to support this size"), 0, 2); + DisplayFatalError(_("Recompile with BOARD_SIZE > 12, to support this size"), 0, 2); #if !HIGHDRAG /* This feature does not work; animation needs a rewrite */ @@ -2493,15 +2339,16 @@ main(argc, argv) xScreen = DefaultScreen(xDisplay); wm_delete_window = XInternAtom(xDisplay, "WM_DELETE_WINDOW", True); - gameInfo.variant = StringToVariant(appData.variant); - InitPosition(FALSE); + gameInfo.variant = StringToVariant(appData.variant); + InitPosition(FALSE); #if 0 + /* * Determine boardSize */ gameInfo.boardWidth = gameInfo.boardHeight = 8; // [HGM] boardsize: make sure we start as 8x8 -//#ifndef IDSIZE + //#ifndef IDSIZE // [HGM] as long as we have not created the possibility to change size while running, start with requested size gameInfo.boardWidth = appData.NrFiles > 0 ? appData.NrFiles : 8; gameInfo.boardHeight = appData.NrRanks > 0 ? appData.NrRanks : 8; @@ -2513,50 +2360,50 @@ main(argc, argv) InitDrawingSizes(-1, 0); // [HGM] initsize: make this into a subroutine #else if (isdigit(appData.boardSize[0])) { - i = sscanf(appData.boardSize, "%d,%d,%d,%d,%d,%d,%d", &squareSize, - &lineGap, &clockFontPxlSize, &coordFontPxlSize, - &fontPxlSize, &smallLayout, &tinyLayout); - if (i == 0) { - fprintf(stderr, _("%s: bad boardSize syntax %s\n"), - programName, appData.boardSize); - exit(2); - } - if (i < 7) { - /* Find some defaults; use the nearest known size */ - SizeDefaults *szd, *nearest; - int distance = 99999; - nearest = szd = sizeDefaults; - while (szd->name != NULL) { - if (abs(szd->squareSize - squareSize) < distance) { - nearest = szd; - distance = abs(szd->squareSize - squareSize); - if (distance == 0) break; - } - szd++; - } - if (i < 2) lineGap = nearest->lineGap; - if (i < 3) clockFontPxlSize = nearest->clockFontPxlSize; - if (i < 4) coordFontPxlSize = nearest->coordFontPxlSize; - if (i < 5) fontPxlSize = nearest->fontPxlSize; - if (i < 6) smallLayout = nearest->smallLayout; - if (i < 7) tinyLayout = nearest->tinyLayout; + i = sscanf(appData.boardSize, "%d,%d,%d,%d,%d,%d,%d", &squareSize, + &lineGap, &clockFontPxlSize, &coordFontPxlSize, + &fontPxlSize, &smallLayout, &tinyLayout); + if (i == 0) { + fprintf(stderr, _("%s: bad boardSize syntax %s\n"), + programName, appData.boardSize); + exit(2); + } + if (i < 7) { + /* Find some defaults; use the nearest known size */ + SizeDefaults *szd, *nearest; + int distance = 99999; + nearest = szd = sizeDefaults; + while (szd->name != NULL) { + if (abs(szd->squareSize - squareSize) < distance) { + nearest = szd; + distance = abs(szd->squareSize - squareSize); + if (distance == 0) break; + } + szd++; + } + if (i < 2) lineGap = nearest->lineGap; + if (i < 3) clockFontPxlSize = nearest->clockFontPxlSize; + if (i < 4) coordFontPxlSize = nearest->coordFontPxlSize; + if (i < 5) fontPxlSize = nearest->fontPxlSize; + if (i < 6) smallLayout = nearest->smallLayout; + if (i < 7) tinyLayout = nearest->tinyLayout; } - } else { + } else { SizeDefaults *szd = sizeDefaults; if (*appData.boardSize == NULLCHAR) { - while (DisplayWidth(xDisplay, xScreen) < szd->minScreenSize || - DisplayHeight(xDisplay, xScreen) < szd->minScreenSize) { - szd++; - } - if (szd->name == NULL) szd--; + while (DisplayWidth(xDisplay, xScreen) < szd->minScreenSize || + DisplayHeight(xDisplay, xScreen) < szd->minScreenSize) { + szd++; + } + if (szd->name == NULL) szd--; } else { - while (szd->name != NULL && - StrCaseCmp(szd->name, appData.boardSize) != 0) szd++; - if (szd->name == NULL) { - fprintf(stderr, _("%s: unrecognized boardSize name %s\n"), - programName, appData.boardSize); - exit(2); - } + while (szd->name != NULL && + StrCaseCmp(szd->name, appData.boardSize) != 0) szd++; + if (szd->name == NULL) { + fprintf(stderr, _("%s: unrecognized boardSize name %s\n"), + programName, appData.boardSize); + exit(2); + } } squareSize = szd->squareSize; lineGap = szd->lineGap; @@ -2567,27 +2414,7 @@ main(argc, argv) tinyLayout = szd->tinyLayout; } - /* Now, using squareSize as a hint, find a good XPM/XIM set size */ - if (strlen(appData.pixmapDirectory) > 0) { - p = ExpandPathName(appData.pixmapDirectory); - if (!p) { - fprintf(stderr, _("Error expanding path name \"%s\"\n"), - appData.pixmapDirectory); - exit(1); - } - if (appData.debugMode) { - fprintf(stderr, _("\ -XBoard square size (hint): %d\n\ -%s fulldir:%s:\n"), squareSize, IMAGE_EXT, p); - } - squareSize = xpm_closest_to(p, squareSize, IMAGE_EXT); - if (appData.debugMode) { - fprintf(stderr, _("Closest %s size: %d\n"), IMAGE_EXT, squareSize); - } - } - - /* [HR] height treated separately (hacked) */ - boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap); + boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap); boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap); if (appData.showJail == 1) { /* Jail on top and bottom */ @@ -2701,7 +2528,7 @@ XBoard square size (hint): %d\n\ if (forceMono) { fprintf(stderr, _("%s: too few colors available; trying monochrome mode\n"), programName); - + if (appData.bitmapDirectory == NULL || appData.bitmapDirectory[0] == NULLCHAR) appData.bitmapDirectory = DEF_BITMAP_DIR; @@ -2711,7 +2538,7 @@ XBoard square size (hint): %d\n\ vFrom.addr = (caddr_t) appData.lowTimeWarningColor; vFrom.size = strlen(appData.lowTimeWarningColor); XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo); - if (vTo.addr == NULL) + if (vTo.addr == NULL) appData.monoMode = True; else lowTimeWarningColor = *(Pixel *) vTo.addr; @@ -2744,7 +2571,7 @@ XBoard square size (hint): %d\n\ textColors[ColorNone].fg = textColors[ColorNone].bg = -1; textColors[ColorNone].attr = 0; - XtAppAddActions(appContext, boardActions, XtNumber(boardActions)); + // XtAppAddActions(appContext, boardActions, XtNumber(boardActions)); /* * widget hierarchy @@ -2756,427 +2583,170 @@ XBoard square size (hint): %d\n\ } else { layoutName = "normalLayout"; } - /* Outer layoutWidget is there only to provide a name for use in - resources that depend on the layout style */ - layoutWidget = - XtCreateManagedWidget(layoutName, formWidgetClass, shellWidget, - layoutArgs, XtNumber(layoutArgs)); - formWidget = - XtCreateManagedWidget("form", formWidgetClass, layoutWidget, - formArgs, XtNumber(formArgs)); - XtSetArg(args[0], XtNdefaultDistance, &sep); - XtGetValues(formWidget, args, 1); - - j = 0; - widgetList[j++] = menuBarWidget = CreateMenuBar(menuBar); - XtSetArg(args[0], XtNtop, XtChainTop); - XtSetArg(args[1], XtNbottom, XtChainTop); - XtSetValues(menuBarWidget, args, 2); - - widgetList[j++] = whiteTimerWidget = - XtCreateWidget("whiteTime", labelWidgetClass, - formWidget, timerArgs, XtNumber(timerArgs)); - XtSetArg(args[0], XtNfont, clockFontStruct); - XtSetArg(args[1], XtNtop, XtChainTop); - XtSetArg(args[2], XtNbottom, XtChainTop); - XtSetValues(whiteTimerWidget, args, 3); - - widgetList[j++] = blackTimerWidget = - XtCreateWidget("blackTime", labelWidgetClass, - formWidget, timerArgs, XtNumber(timerArgs)); - XtSetArg(args[0], XtNfont, clockFontStruct); - XtSetArg(args[1], XtNtop, XtChainTop); - XtSetArg(args[2], XtNbottom, XtChainTop); - XtSetValues(blackTimerWidget, args, 3); if (appData.titleInWindow) { - widgetList[j++] = titleWidget = - XtCreateWidget("title", labelWidgetClass, formWidget, - titleArgs, XtNumber(titleArgs)); - XtSetArg(args[0], XtNtop, XtChainTop); - XtSetArg(args[1], XtNbottom, XtChainTop); - XtSetValues(titleWidget, args, 2); + /* todo check what this appdata does */ } if (appData.showButtonBar) { - widgetList[j++] = buttonBarWidget = CreateButtonBar(buttonBar); - XtSetArg(args[0], XtNleft, XtChainRight); // [HGM] glue to right window edge - XtSetArg(args[1], XtNright, XtChainRight); // for good run-time sizing - XtSetArg(args[2], XtNtop, XtChainTop); - XtSetArg(args[3], XtNbottom, XtChainTop); - XtSetValues(buttonBarWidget, args, 4); + /* TODO hide button bar if requested */ } - widgetList[j++] = messageWidget = - XtCreateWidget("message", labelWidgetClass, formWidget, - messageArgs, XtNumber(messageArgs)); - XtSetArg(args[0], XtNtop, XtChainTop); - XtSetArg(args[1], XtNbottom, XtChainTop); - XtSetValues(messageWidget, args, 2); + /* + * gtk set properties of widgets + */ - widgetList[j++] = boardWidget = - XtCreateWidget("board", widgetClass, formWidget, boardArgs, - XtNumber(boardArgs)); + /* set board size */ + gtk_widget_set_size_request(GTK_WIDGET(GUI_Board), + boardWidth,boardHeight); - XtManageChildren(widgetList, j); + /* end gtk set properties of widgets */ - timerWidth = (boardWidth - sep) / 2; - XtSetArg(args[0], XtNwidth, timerWidth); - XtSetValues(whiteTimerWidget, args, 1); - XtSetValues(blackTimerWidget, args, 1); + if (appData.titleInWindow) + { + if (smallLayout) + { + /* make it small */ + if (appData.showButtonBar) + { - XtSetArg(args[0], XtNbackground, &timerBackgroundPixel); - XtSetArg(args[1], XtNforeground, &timerForegroundPixel); - XtGetValues(whiteTimerWidget, args, 2); + } + } + else + { + if (appData.showButtonBar) + { + } + } + } + else + { + } - if (appData.showButtonBar) { - XtSetArg(args[0], XtNbackground, &buttonBackgroundPixel); - XtSetArg(args[1], XtNforeground, &buttonForegroundPixel); - XtGetValues(XtNameToWidget(buttonBarWidget, PAUSE_BUTTON), args, 2); - } + // [HGM] it seems the layout code ends here, but perhaps the color stuff is size independent and would + // not need to go into InitDrawingSizes(). +#endif - /* - * formWidget uses these constraints but they are stored - * in the children. - */ - i = 0; - XtSetArg(args[i], XtNfromHoriz, 0); i++; - XtSetValues(menuBarWidget, args, i); - if (appData.titleInWindow) { - if (smallLayout) { - i = 0; - XtSetArg(args[i], XtNfromVert, menuBarWidget); i++; - XtSetValues(whiteTimerWidget, args, i); - i = 0; - XtSetArg(args[i], XtNfromVert, menuBarWidget); i++; - XtSetArg(args[i], XtNfromHoriz, whiteTimerWidget); i++; - XtSetValues(blackTimerWidget, args, i); - i = 0; - XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++; - XtSetArg(args[i], XtNjustify, XtJustifyLeft); i++; - XtSetValues(titleWidget, args, i); - i = 0; - XtSetArg(args[i], XtNfromVert, titleWidget); i++; - XtSetArg(args[i], XtNresizable, (XtArgVal) True); i++; - XtSetValues(messageWidget, args, i); - if (appData.showButtonBar) { - i = 0; - XtSetArg(args[i], XtNfromVert, titleWidget); i++; - XtSetArg(args[i], XtNfromHoriz, messageWidget); i++; - XtSetValues(buttonBarWidget, args, i); - } - } else { - i = 0; - XtSetArg(args[i], XtNfromVert, titleWidget); i++; - XtSetValues(whiteTimerWidget, args, i); - i = 0; - XtSetArg(args[i], XtNfromVert, titleWidget); i++; - XtSetArg(args[i], XtNfromHoriz, whiteTimerWidget); i++; - XtSetValues(blackTimerWidget, args, i); - i = 0; - XtSetArg(args[i], XtNfromHoriz, menuBarWidget); i++; - XtSetValues(titleWidget, args, i); - i = 0; - XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++; - XtSetArg(args[i], XtNresizable, (XtArgVal) True); i++; - XtSetValues(messageWidget, args, i); - if (appData.showButtonBar) { - i = 0; - XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++; - XtSetArg(args[i], XtNfromHoriz, messageWidget); i++; - XtSetValues(buttonBarWidget, args, i); - } - } - } else { - i = 0; - XtSetArg(args[i], XtNfromVert, menuBarWidget); i++; - XtSetValues(whiteTimerWidget, args, i); - i = 0; - XtSetArg(args[i], XtNfromVert, menuBarWidget); i++; - XtSetArg(args[i], XtNfromHoriz, whiteTimerWidget); i++; - XtSetValues(blackTimerWidget, args, i); - i = 0; - XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++; - XtSetArg(args[i], XtNresizable, (XtArgVal) True); i++; - XtSetValues(messageWidget, args, i); - if (appData.showButtonBar) { - i = 0; - XtSetArg(args[i], XtNfromVert, whiteTimerWidget); i++; - XtSetArg(args[i], XtNfromHoriz, messageWidget); i++; - XtSetValues(buttonBarWidget, args, i); - } - } - i = 0; - XtSetArg(args[0], XtNfromVert, messageWidget); - XtSetArg(args[1], XtNtop, XtChainTop); - XtSetArg(args[2], XtNbottom, XtChainBottom); - XtSetArg(args[3], XtNleft, XtChainLeft); - XtSetArg(args[4], XtNright, XtChainRight); - XtSetValues(boardWidget, args, 5); + /* set some checkboxes in the menu according to appData */ - XtRealizeWidget(shellWidget); + if (appData.alwaysPromoteToQueen) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Always Queen")),TRUE); - /* - * Correct the width of the message and title widgets. - * It is not known why some systems need the extra fudge term. - * The value "2" is probably larger than needed. - */ - XawFormDoLayout(formWidget, False); + if (appData.animateDragging) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Animate Dragging")),TRUE); -#define WIDTH_FUDGE 2 - i = 0; - XtSetArg(args[i], XtNborderWidth, &bor); i++; - XtSetArg(args[i], XtNheight, &h); i++; - XtGetValues(messageWidget, args, i); - if (appData.showButtonBar) { - i = 0; - XtSetArg(args[i], XtNwidth, &w); i++; - XtGetValues(buttonBarWidget, args, i); - w = boardWidth - w - sep - 2*bor - WIDTH_FUDGE; - } else { - w = boardWidth - 2*bor + 1; /*!! +1 compensates for kludge below */ - } + if (appData.animate) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Animate Moving")),TRUE); - gres = XtMakeResizeRequest(messageWidget, w, h, &wr, &hr); - if (gres != XtGeometryYes && appData.debugMode) { - fprintf(stderr, _("%s: messageWidget geometry error %d %d %d %d %d\n"), - programName, gres, w, h, wr, hr); - } + if (appData.autoComment) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Auto Comment")),TRUE); - /* !! Horrible hack to work around bug in XFree86 4.0.1 (X11R6.4.3) */ - /* The size used for the child widget in layout lags one resize behind - its true size, so we resize a second time, 1 pixel smaller. Yeech! */ - w--; - gres = XtMakeResizeRequest(messageWidget, w, h, &wr, &hr); - if (gres != XtGeometryYes && appData.debugMode) { - fprintf(stderr, _("%s: messageWidget geometry error %d %d %d %d %d\n"), - programName, gres, w, h, wr, hr); - } - /* !! end hack */ - XtSetArg(args[0], XtNleft, XtChainLeft); // [HGM] glue ends for good run-time sizing - XtSetArg(args[1], XtNright, XtChainRight); - XtSetValues(messageWidget, args, 2); + if (appData.autoCallFlag) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Auto Flag")),TRUE); - if (appData.titleInWindow) { - i = 0; - XtSetArg(args[i], XtNborderWidth, &bor); i++; - XtSetArg(args[i], XtNheight, &h); i++; - XtGetValues(titleWidget, args, i); - if (smallLayout) { - w = boardWidth - 2*bor; - } else { - XtSetArg(args[0], XtNwidth, &w); - XtGetValues(menuBarWidget, args, 1); - w = boardWidth - w - sep - 2*bor - WIDTH_FUDGE; - } + if (appData.autoFlipView) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Auto Flip View")),TRUE); - gres = XtMakeResizeRequest(titleWidget, w, h, &wr, &hr); - if (gres != XtGeometryYes && appData.debugMode) { - fprintf(stderr, - _("%s: titleWidget geometry error %d %d %d %d %d\n"), - programName, gres, w, h, wr, hr); - } - } - XawFormDoLayout(formWidget, True); + if (appData.autoObserve) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Auto Observe")),TRUE); - xBoardWindow = XtWindow(boardWidget); + if (appData.autoRaiseBoard) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Auto Raise Board")),TRUE); - // [HGM] it seems the layout code ends here, but perhaps the color stuff is size independent and would - // not need to go into InitDrawingSizes(). -#endif + if (appData.autoSaveGames) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Auto Save")),TRUE); - /* - * Create X checkmark bitmap and initialize option menu checks. - */ - ReadBitmap(&xMarkPixmap, "checkmark.bm", - checkmark_bits, checkmark_width, checkmark_height); - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - if (appData.alwaysPromoteToQueen) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Always Queen"), - args, 1); - } - if (appData.animateDragging) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Animate Dragging"), - args, 1); - } - if (appData.animate) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Animate Moving"), - args, 1); - } - if (appData.autoComment) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Comment"), - args, 1); - } - if (appData.autoCallFlag) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Flag"), - args, 1); - } - if (appData.autoFlipView) { - XtSetValues(XtNameToWidget(menuBarWidget,"menuOptions.Auto Flip View"), - args, 1); - } - if (appData.autoObserve) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Observe"), - args, 1); - } - if (appData.autoRaiseBoard) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Auto Raise Board"), args, 1); - } - if (appData.autoSaveGames) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Save"), - args, 1); - } - if (appData.saveGameFile[0] != NULLCHAR) { + if (appData.saveGameFile[0] != NULLCHAR) + { /* Can't turn this off from menu */ - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Auto Save"), - args, 1); - XtSetSensitive(XtNameToWidget(menuBarWidget, "menuOptions.Auto Save"), - False); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Auto Save")),TRUE); + gtk_action_set_sensitive(GTK_ACTION (gtk_builder_get_object (builder, "menuOptions.Auto Save")),FALSE); + } + + if (appData.blindfold) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Blindfold")),TRUE); + + if (appData.flashCount > 0) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Flash Moves")),TRUE); + + if (appData.getMoveList) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Get Move List")),TRUE); - } - if (appData.blindfold) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Blindfold"), args, 1); - } - if (appData.flashCount > 0) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Flash Moves"), - args, 1); - } - if (appData.getMoveList) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Get Move List"), - args, 1); - } #if HIGHDRAG - if (appData.highlightDragging) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Highlight Dragging"), - args, 1); - } + if (appData.highlightDragging) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Highlight Dragging")),TRUE); #endif - if (appData.highlightLastMove) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Highlight Last Move"), - args, 1); - } - if (appData.icsAlarm) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.ICS Alarm"), - args, 1); - } - if (appData.ringBellAfterMoves) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Move Sound"), - args, 1); - } - if (appData.oldSaveStyle) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Old Save Style"), args, 1); - } - if (appData.periodicUpdates) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Periodic Updates"), args, 1); - } - if (appData.ponderNextMove) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Ponder Next Move"), args, 1); - } - if (appData.popupExitMessage) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Popup Exit Message"), args, 1); - } - if (appData.popupMoveErrors) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Popup Move Errors"), args, 1); - } - if (appData.premove) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Premove"), args, 1); - } - if (appData.quietPlay) { - XtSetValues(XtNameToWidget(menuBarWidget, - "menuOptions.Quiet Play"), args, 1); - } - if (appData.showCoords) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Show Coords"), - args, 1); - } - if (appData.hideThinkingFromHuman) { - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Hide Thinking"), - args, 1); - } - if (appData.testLegality) { - XtSetValues(XtNameToWidget(menuBarWidget,"menuOptions.Test Legality"), - args, 1); - } - /* - * Create an icon. - */ - ReadBitmap(&wIconPixmap, "icon_white.bm", - icon_white_bits, icon_white_width, icon_white_height); - ReadBitmap(&bIconPixmap, "icon_black.bm", - icon_black_bits, icon_black_width, icon_black_height); - iconPixmap = wIconPixmap; - i = 0; - XtSetArg(args[i], XtNiconPixmap, iconPixmap); i++; - XtSetValues(shellWidget, args, i); + if (appData.highlightLastMove) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Highlight Last Move")),TRUE); - /* - * Create a cursor for the board widget. - */ - window_attributes.cursor = XCreateFontCursor(xDisplay, XC_hand2); - XChangeWindowAttributes(xDisplay, xBoardWindow, - CWCursor, &window_attributes); + if (appData.icsAlarm) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.ICS Alarm")),TRUE); - /* - * Inhibit shell resizing. - */ - shellArgs[0].value = (XtArgVal) &w; - shellArgs[1].value = (XtArgVal) &h; - XtGetValues(shellWidget, shellArgs, 2); - shellArgs[4].value = shellArgs[2].value = w; - shellArgs[5].value = shellArgs[3].value = h; - XtSetValues(shellWidget, &shellArgs[2], 4); - marginW = w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board - marginH = h - boardHeight; + if (appData.ringBellAfterMoves) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Move Sound")),TRUE); - CatchDeleteWindow(shellWidget, "QuitProc"); + if (appData.oldSaveStyle) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Old Save Style")),TRUE); - CreateGCs(); - CreateGrid(); -#if HAVE_LIBXPM - if (appData.bitmapDirectory[0] != NULLCHAR) { - CreatePieces(); - } else { - CreateXPMPieces(); + if (appData.periodicUpdates) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Periodic Updates")),TRUE); + + if (appData.ponderNextMove) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Ponder Next Move")),TRUE); + + if (appData.popupExitMessage) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Popup Exit Message")),TRUE); + + if (appData.popupMoveErrors) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Popup Move Errors")),TRUE); + + if (appData.premove) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Premove")),TRUE); + + if (appData.quietPlay) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Quit Play")),TRUE); + + if (appData.showCoords) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Show Coords")),TRUE); + + if (appData.showThinking) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Show Thinking")),TRUE); + + if (appData.testLegality) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuOptions.Test Legality")),TRUE); + + /* end setting check boxes */ + + + /* load square colors */ + SVGLightSquare = load_pixbuf("svg/LightSquare.svg",squareSize); + SVGDarkSquare = load_pixbuf("svg/DarkSquare.svg",squareSize); + SVGNeutralSquare = load_pixbuf("svg/NeutralSquare.svg",squareSize); + + /* use two icons to indicate if it is white's or black's turn */ + WhiteIcon = load_pixbuf("svg/icon_white.svg",0); + BlackIcon = load_pixbuf("svg/icon_black.svg",0); + WindowIcon = WhiteIcon; + gtk_window_set_icon(GTK_WINDOW(GUI_Window),WindowIcon); + + /* do resizing to a fixed aspect ratio */ + + { + int i,j; } -#else - CreateXIMPieces(); - /* Create regular pieces */ - if (!useImages) CreatePieces(); -#endif + GUI_SetAspectRatio(0.7); + /* realize window */ + gtk_widget_show (GUI_Window); + + CreateGCs(); + CreatePieces(); CreatePieceMenus(); if (appData.animate || appData.animateDragging) CreateAnimVars(); - XtAugmentTranslations(formWidget, - XtParseTranslationTable(globalTranslations)); - XtAugmentTranslations(boardWidget, - XtParseTranslationTable(boardTranslations)); - XtAugmentTranslations(whiteTimerWidget, - XtParseTranslationTable(whiteTranslations)); - XtAugmentTranslations(blackTimerWidget, - XtParseTranslationTable(blackTranslations)); - - /* Why is the following needed on some versions of X instead - * of a translation? */ - XtAddEventHandler(boardWidget, ExposureMask, False, - (XtEventHandler) EventProc, NULL); - /* end why */ - InitBackEnd2(); if (errorExitStatus == -1) { @@ -3196,7 +2766,18 @@ XBoard square size (hint): %d\n\ gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes() InitPosition(TRUE); - XtAppMainLoop(appContext); + /* + * Create a cursor for the board widget. + * (This needs to be called after the window has been created to have access to board-window) + */ + + BoardCursor = gdk_cursor_new(GDK_HAND2); + gdk_window_set_cursor(GUI_Board->window, BoardCursor); + gdk_cursor_destroy(BoardCursor); + + /* end cursor */ + gtk_main (); + if (appData.debugMode) fclose(debugFP); // [DM] debug return 0; } @@ -3277,184 +2858,35 @@ ResetFrontEnd() return; } -typedef struct { - char *name; - Boolean value; -} Enables; - void SetMenuEnables(enab) Enables *enab; { - Widget w; - if (!menuBarWidget) return; + GObject *o; + + if (!builder) return; while (enab->name != NULL) { - w = XtNameToWidget(menuBarWidget, enab->name); - if (w == NULL) { - DisplayError(enab->name, 0); - } else { - XtSetSensitive(w, enab->value); - } + o = gtk_builder_get_object(builder, enab->name); + if(GTK_IS_WIDGET(o)) + gtk_widget_set_sensitive(GTK_WIDGET (o),enab->value); + else + { + if(GTK_IS_ACTION(o)) + gtk_action_set_sensitive(GTK_ACTION (o),enab->value); + else + DisplayError(enab->name, 0); + } enab++; } } -Enables icsEnables[] = { - { "menuFile.Mail Move", False }, - { "menuFile.Reload CMail Message", False }, - { "menuMode.Machine Black", False }, - { "menuMode.Machine White", False }, - { "menuMode.Analysis Mode", False }, - { "menuMode.Analyze File", False }, - { "menuMode.Two Machines", False }, -#ifndef ZIPPY - { "menuHelp.Hint", False }, - { "menuHelp.Book", False }, - { "menuStep.Move Now", False }, - { "menuOptions.Periodic Updates", False }, - { "menuOptions.Hide Thinking", False }, - { "menuOptions.Ponder Next Move", False }, -#endif - { NULL, False } -}; - -Enables ncpEnables[] = { - { "menuFile.Mail Move", False }, - { "menuFile.Reload CMail Message", False }, - { "menuMode.Machine White", False }, - { "menuMode.Machine Black", False }, - { "menuMode.Analysis Mode", False }, - { "menuMode.Analyze File", False }, - { "menuMode.Two Machines", False }, - { "menuMode.ICS Client", False }, - { "menuMode.ICS Input Box", False }, - { "Action", False }, - { "menuStep.Revert", False }, - { "menuStep.Move Now", False }, - { "menuStep.Retract Move", False }, - { "menuOptions.Auto Comment", False }, - { "menuOptions.Auto Flag", False }, - { "menuOptions.Auto Flip View", False }, - { "menuOptions.Auto Observe", False }, - { "menuOptions.Auto Raise Board", False }, - { "menuOptions.Get Move List", False }, - { "menuOptions.ICS Alarm", False }, - { "menuOptions.Move Sound", False }, - { "menuOptions.Quiet Play", False }, - { "menuOptions.Hide Thinking", False }, - { "menuOptions.Periodic Updates", False }, - { "menuOptions.Ponder Next Move", False }, - { "menuHelp.Hint", False }, - { "menuHelp.Book", False }, - { NULL, False } -}; - -Enables gnuEnables[] = { - { "menuMode.ICS Client", False }, - { "menuMode.ICS Input Box", False }, - { "menuAction.Accept", False }, - { "menuAction.Decline", False }, - { "menuAction.Rematch", False }, - { "menuAction.Adjourn", False }, - { "menuAction.Stop Examining", False }, - { "menuAction.Stop Observing", False }, - { "menuStep.Revert", False }, - { "menuOptions.Auto Comment", False }, - { "menuOptions.Auto Observe", False }, - { "menuOptions.Auto Raise Board", False }, - { "menuOptions.Get Move List", False }, - { "menuOptions.Premove", False }, - { "menuOptions.Quiet Play", False }, - - /* The next two options rely on SetCmailMode being called *after* */ - /* SetGNUMode so that when GNU is being used to give hints these */ - /* menu options are still available */ - - { "menuFile.Mail Move", False }, - { "menuFile.Reload CMail Message", False }, - { NULL, False } -}; - -Enables cmailEnables[] = { - { "Action", True }, - { "menuAction.Call Flag", False }, - { "menuAction.Draw", True }, - { "menuAction.Adjourn", False }, - { "menuAction.Abort", False }, - { "menuAction.Stop Observing", False }, - { "menuAction.Stop Examining", False }, - { "menuFile.Mail Move", True }, - { "menuFile.Reload CMail Message", True }, - { NULL, False } -}; - -Enables trainingOnEnables[] = { - { "menuMode.Edit Comment", False }, - { "menuMode.Pause", False }, - { "menuStep.Forward", False }, - { "menuStep.Backward", False }, - { "menuStep.Forward to End", False }, - { "menuStep.Back to Start", False }, - { "menuStep.Move Now", False }, - { "menuStep.Truncate Game", False }, - { NULL, False } -}; - -Enables trainingOffEnables[] = { - { "menuMode.Edit Comment", True }, - { "menuMode.Pause", True }, - { "menuStep.Forward", True }, - { "menuStep.Backward", True }, - { "menuStep.Forward to End", True }, - { "menuStep.Back to Start", True }, - { "menuStep.Move Now", True }, - { "menuStep.Truncate Game", True }, - { NULL, False } -}; - -Enables machineThinkingEnables[] = { - { "menuFile.Load Game", False }, - { "menuFile.Load Next Game", False }, - { "menuFile.Load Previous Game", False }, - { "menuFile.Reload Same Game", False }, - { "menuFile.Paste Game", False }, - { "menuFile.Load Position", False }, - { "menuFile.Load Next Position", False }, - { "menuFile.Load Previous Position", False }, - { "menuFile.Reload Same Position", False }, - { "menuFile.Paste Position", False }, - { "menuMode.Machine White", False }, - { "menuMode.Machine Black", False }, - { "menuMode.Two Machines", False }, - { "menuStep.Retract Move", False }, - { NULL, False } -}; - -Enables userThinkingEnables[] = { - { "menuFile.Load Game", True }, - { "menuFile.Load Next Game", True }, - { "menuFile.Load Previous Game", True }, - { "menuFile.Reload Same Game", True }, - { "menuFile.Paste Game", True }, - { "menuFile.Load Position", True }, - { "menuFile.Load Next Position", True }, - { "menuFile.Load Previous Position", True }, - { "menuFile.Reload Same Position", True }, - { "menuFile.Paste Position", True }, - { "menuMode.Machine White", True }, - { "menuMode.Machine Black", True }, - { "menuMode.Two Machines", True }, - { "menuStep.Retract Move", True }, - { NULL, False } -}; - void SetICSMode() { SetMenuEnables(icsEnables); #ifdef ZIPPY if (appData.zippyPlay && !appData.noChessProgram) /* [DM] icsEngineAnalyze */ - XtSetSensitive(XtNameToWidget(menuBarWidget, "menuMode.Analysis Mode"), True); + {}; // XtSetSensitive(XtNameToWidget(menuBarWidget, "menuMode.Analysis Mode"), True); #endif } @@ -3481,7 +2913,7 @@ SetTrainingModeOn() { SetMenuEnables(trainingOnEnables); if (appData.showButtonBar) { - XtSetSensitive(buttonBarWidget, False); + // XtSetSensitive(buttonBarWidget, False); } CommentPopDown(); } @@ -3491,7 +2923,7 @@ SetTrainingModeOff() { SetMenuEnables(trainingOffEnables); if (appData.showButtonBar) { - XtSetSensitive(buttonBarWidget, True); + // XtSetSensitive(buttonBarWidget, True); } } @@ -3511,8 +2943,8 @@ SetMachineThinkingEnables() case MachinePlaysBlack: case MachinePlaysWhite: case TwoMachinesPlay: - XtSetSensitive(XtNameToWidget(menuBarWidget, - ModeToWidgetName(gameMode)), True); +// XtSetSensitive(XtNameToWidget(menuBarWidget, +// ModeToWidgetName(gameMode)), True); break; default: break; @@ -3634,26 +3066,12 @@ void CreateGCs() gc_values.function = GXcopy; gc_values.foreground = XBlackPixel(xDisplay, xScreen); - gc_values.background = XBlackPixel(xDisplay, xScreen); - lineGC = XtGetGC(shellWidget, value_mask, &gc_values); - - gc_values.foreground = XBlackPixel(xDisplay, xScreen); gc_values.background = XWhitePixel(xDisplay, xScreen); coordGC = XtGetGC(shellWidget, value_mask, &gc_values); XSetFont(xDisplay, coordGC, coordFontID); - // [HGM] make font for holdings counts (white on black0 - gc_values.foreground = XWhitePixel(xDisplay, xScreen); - gc_values.background = XBlackPixel(xDisplay, xScreen); - countGC = XtGetGC(shellWidget, value_mask, &gc_values); - XSetFont(xDisplay, countGC, countFontID); - if (appData.monoMode) { gc_values.foreground = XWhitePixel(xDisplay, xScreen); - gc_values.background = XWhitePixel(xDisplay, xScreen); - highlineGC = XtGetGC(shellWidget, value_mask, &gc_values); - - gc_values.foreground = XWhitePixel(xDisplay, xScreen); gc_values.background = XBlackPixel(xDisplay, xScreen); lightSquareGC = wbPieceGC = XtGetGC(shellWidget, value_mask, &gc_values); @@ -3677,14 +3095,6 @@ void CreateGCs() } } } else { - gc_values.foreground = highlightSquareColor; - gc_values.background = highlightSquareColor; - highlineGC = XtGetGC(shellWidget, value_mask, &gc_values); - - gc_values.foreground = premoveHighlightColor; - gc_values.background = premoveHighlightColor; - prelineGC = XtGetGC(shellWidget, value_mask, &gc_values); - gc_values.foreground = lightSquareColor; gc_values.background = darkSquareColor; lightSquareGC = XtGetGC(shellWidget, value_mask, &gc_values); @@ -3723,462 +3133,37 @@ void CreateGCs() } } -void loadXIM(xim, xmask, filename, dest, mask) - XImage *xim; - XImage *xmask; - char *filename; - Pixmap *dest; - Pixmap *mask; -{ - int x, y, w, h, p; - FILE *fp; - Pixmap temp; - XGCValues values; - GC maskGC; - - fp = fopen(filename, "rb"); - if (!fp) { - fprintf(stderr, _("%s: error loading XIM!\n"), programName); - exit(1); - } - - w = fgetc(fp); - h = fgetc(fp); - - for (y=0; ydepth); - XPutImage(xDisplay, *dest, lightSquareGC, xim, - 0, 0, 0, 0, w, h); - - /* create Pixmap of clipmask - Note: We assume the white/black pieces have the same - outline, so we make only 6 masks. This is okay - since the XPM clipmask routines do the same. */ - if (xmask) { - temp = XCreatePixmap(xDisplay, DefaultRootWindow(xDisplay), - w, h, xim->depth); - XPutImage(xDisplay, temp, lightSquareGC, xmask, - 0, 0, 0, 0, w, h); - - /* now create the 1-bit version */ - *mask = XCreatePixmap(xDisplay, DefaultRootWindow(xDisplay), - w, h, 1); - - values.foreground = 1; - values.background = 0; - - /* Don't use XtGetGC, not read only */ - maskGC = XCreateGC(xDisplay, *mask, - GCForeground | GCBackground, &values); - XCopyPlane(xDisplay, temp, *mask, maskGC, - 0, 0, squareSize, squareSize, 0, 0, 1); - XFreePixmap(xDisplay, temp); - } -} - - -char pieceBitmapNames[] = "pnbrqfeacwmohijgdvlsukpnsl"; - -void CreateXIMPieces() -{ - int piece, kind; - char buf[MSG_SIZ]; - u_int ss; - static char *ximkind[] = { "ll", "ld", "dl", "dd" }; - XImage *ximtemp; - - ss = squareSize; - - /* The XSynchronize calls were copied from CreatePieces. - Not sure if needed, but can't hurt */ - XSynchronize(xDisplay, True); /* Work-around for xlib/xt - buffering bug */ - - /* temp needed by loadXIM() */ - ximtemp = XGetImage(xDisplay, DefaultRootWindow(xDisplay), - 0, 0, ss, ss, AllPlanes, XYPixmap); - - if (strlen(appData.pixmapDirectory) == 0) { - useImages = 0; - } else { - useImages = 1; - if (appData.monoMode) { - DisplayFatalError(_("XIM pieces cannot be used in monochrome mode"), - 0, 2); - ExitEvent(2); - } - fprintf(stderr, _("\nLoading XIMs...\n")); - /* Load pieces */ - for (piece = (int) WhitePawn; piece <= (int) WhiteKing + 4; piece++) { - fprintf(stderr, "%d", piece+1); - for (kind=0; kind<4; kind++) { - fprintf(stderr, "."); - snprintf(buf, sizeof(buf), "%s/%s%c%s%u.xim", - ExpandPathName(appData.pixmapDirectory), - piece <= (int) WhiteKing ? "" : "w", - pieceBitmapNames[piece], - ximkind[kind], ss); - ximPieceBitmap[kind][piece] = - XGetImage(xDisplay, DefaultRootWindow(xDisplay), - 0, 0, ss, ss, AllPlanes, XYPixmap); - if (appData.debugMode) - fprintf(stderr, _("(File:%s:) "), buf); - loadXIM(ximPieceBitmap[kind][piece], - ximtemp, buf, - &(xpmPieceBitmap2[kind][piece]), - &(ximMaskPm2[piece])); - if(piece <= (int)WhiteKing) - xpmPieceBitmap[kind][piece] = xpmPieceBitmap2[kind][piece]; - } - fprintf(stderr," "); - } - /* Load light and dark squares */ - /* If the LSQ and DSQ pieces don't exist, we will - draw them with solid squares. */ - snprintf(buf,sizeof(buf), "%s/lsq%u.xim", ExpandPathName(appData.pixmapDirectory), ss); - if (access(buf, 0) != 0) { - useImageSqs = 0; - } else { - useImageSqs = 1; - fprintf(stderr, _("light square ")); - ximLightSquare= - XGetImage(xDisplay, DefaultRootWindow(xDisplay), - 0, 0, ss, ss, AllPlanes, XYPixmap); - if (appData.debugMode) - fprintf(stderr, _("(File:%s:) "), buf); - - loadXIM(ximLightSquare, NULL, buf, &xpmLightSquare, NULL); - fprintf(stderr, _("dark square ")); - snprintf(buf,sizeof(buf), "%s/dsq%u.xim", - ExpandPathName(appData.pixmapDirectory), ss); - if (appData.debugMode) - fprintf(stderr, _("(File:%s:) "), buf); - ximDarkSquare= - XGetImage(xDisplay, DefaultRootWindow(xDisplay), - 0, 0, ss, ss, AllPlanes, XYPixmap); - loadXIM(ximDarkSquare, NULL, buf, &xpmDarkSquare, NULL); - xpmJailSquare = xpmLightSquare; - } - fprintf(stderr, _("Done.\n")); - } - XSynchronize(xDisplay, False); /* Work-around for xlib/xt buffering bug */ -} - -#if HAVE_LIBXPM -void CreateXPMPieces() -{ - int piece, kind, r; - char buf[MSG_SIZ]; - u_int ss = squareSize; - XpmAttributes attr; - static char *xpmkind[] = { "ll", "ld", "dl", "dd" }; - XpmColorSymbol symbols[4]; - -#if 0 - /* Apparently some versions of Xpm don't define XpmFormat at all --tpm */ - if (appData.debugMode) { - fprintf(stderr, "XPM Library Version: %d.%d%c\n", - XpmFormat, XpmVersion, (char)('a' + XpmRevision - 1)); - } -#endif - - /* The XSynchronize calls were copied from CreatePieces. - Not sure if needed, but can't hurt */ - XSynchronize(xDisplay, True); /* Work-around for xlib/xt buffering bug */ - - /* Setup translations so piece colors match square colors */ - symbols[0].name = "light_piece"; - symbols[0].value = appData.whitePieceColor; - symbols[1].name = "dark_piece"; - symbols[1].value = appData.blackPieceColor; - symbols[2].name = "light_square"; - symbols[2].value = appData.lightSquareColor; - symbols[3].name = "dark_square"; - symbols[3].value = appData.darkSquareColor; - - attr.valuemask = XpmColorSymbols; - attr.colorsymbols = symbols; - attr.numsymbols = 4; - - if (appData.monoMode) { - DisplayFatalError(_("XPM pieces cannot be used in monochrome mode"), - 0, 2); - ExitEvent(2); - } - if (strlen(appData.pixmapDirectory) == 0) { - XpmPieces* pieces = builtInXpms; - useImages = 1; - /* Load pieces */ - while (pieces->size != squareSize && pieces->size) pieces++; - if (!pieces->size) { - fprintf(stderr, _("No builtin XPM pieces of size %d\n"), squareSize); - exit(1); - } - for (piece = (int) WhitePawn; piece <= (int) WhiteKing + 4; piece++) { - for (kind=0; kind<4; kind++) { - - if ((r=XpmCreatePixmapFromData(xDisplay, xBoardWindow, - pieces->xpm[piece][kind], - &(xpmPieceBitmap2[kind][piece]), - NULL, &attr)) != 0) { - fprintf(stderr, _("Error %d loading XPM image \"%s\"\n"), - r, buf); - exit(1); - } - if(piece <= (int) WhiteKing) - xpmPieceBitmap[kind][piece] = xpmPieceBitmap2[kind][piece]; - } - } - useImageSqs = 0; - xpmJailSquare = xpmLightSquare; - } else { - useImages = 1; - - fprintf(stderr, _("\nLoading XPMs...\n")); - - /* Load pieces */ - for (piece = (int) WhitePawn; piece <= (int) WhiteKing + 4; piece++) { - fprintf(stderr, "%d ", piece+1); - for (kind=0; kind<4; kind++) { - snprintf(buf, sizeof(buf), "%s/%s%c%s%u.xpm", - ExpandPathName(appData.pixmapDirectory), - piece > (int) WhiteKing ? "w" : "", - pieceBitmapNames[piece], - xpmkind[kind], ss); - if (appData.debugMode) { - fprintf(stderr, _("(File:%s:) "), buf); - } - if ((r=XpmReadFileToPixmap(xDisplay, xBoardWindow, buf, - &(xpmPieceBitmap2[kind][piece]), - NULL, &attr)) != 0) { - if(piece != (int)WhiteKing && piece > (int)WhiteQueen) { - // [HGM] missing: read of unorthodox piece failed; substitute King. - snprintf(buf, sizeof(buf), "%s/k%s%u.xpm", - ExpandPathName(appData.pixmapDirectory), - xpmkind[kind], ss); - if (appData.debugMode) { - fprintf(stderr, _("(Replace by File:%s:) "), buf); - } - r=XpmReadFileToPixmap(xDisplay, xBoardWindow, buf, - &(xpmPieceBitmap2[kind][piece]), - NULL, &attr); - } - if (r != 0) { - fprintf(stderr, _("Error %d loading XPM file \"%s\"\n"), - r, buf); - exit(1); - } - } - if(piece <= (int) WhiteKing) - xpmPieceBitmap[kind][piece] = xpmPieceBitmap2[kind][piece]; - } - } - /* Load light and dark squares */ - /* If the LSQ and DSQ pieces don't exist, we will - draw them with solid squares. */ - fprintf(stderr, _("light square ")); - snprintf(buf, sizeof(buf), "%s/lsq%u.xpm", ExpandPathName(appData.pixmapDirectory), ss); - if (access(buf, 0) != 0) { - useImageSqs = 0; - } else { - useImageSqs = 1; - if (appData.debugMode) - fprintf(stderr, _("(File:%s:) "), buf); - - if ((r=XpmReadFileToPixmap(xDisplay, xBoardWindow, buf, - &xpmLightSquare, NULL, &attr)) != 0) { - fprintf(stderr, _("Error %d loading XPM file \"%s\"\n"), r, buf); - exit(1); - } - fprintf(stderr, _("dark square ")); - snprintf(buf, sizeof(buf), "%s/dsq%u.xpm", - ExpandPathName(appData.pixmapDirectory), ss); - if (appData.debugMode) { - fprintf(stderr, _("(File:%s:) "), buf); - } - if ((r=XpmReadFileToPixmap(xDisplay, xBoardWindow, buf, - &xpmDarkSquare, NULL, &attr)) != 0) { - fprintf(stderr, _("Error %d loading XPM file \"%s\"\n"), r, buf); - exit(1); - } - } - xpmJailSquare = xpmLightSquare; - fprintf(stderr, _("Done.\n")); - } - XSynchronize(xDisplay, False); /* Work-around for xlib/xt - buffering bug */ -} -#endif /* HAVE_LIBXPM */ - -#if HAVE_LIBXPM -/* No built-in bitmaps */ -void CreatePieces() -{ - int piece, kind; - char buf[MSG_SIZ]; - u_int ss = squareSize; - - XSynchronize(xDisplay, True); /* Work-around for xlib/xt - buffering bug */ - - for (kind = SOLID; kind <= (appData.monoMode ? OUTLINE : SOLID); kind++) { - for (piece = (int) WhitePawn; piece <= (int) WhiteKing + 4; piece++) { - sprintf(buf, "%s%c%u%c.bm", piece > (int)WhiteKing ? "w" : "", - pieceBitmapNames[piece], - ss, kind == SOLID ? 's' : 'o'); - ReadBitmap(&pieceBitmap2[kind][piece], buf, NULL, ss, ss); - if(piece <= (int)WhiteKing) - pieceBitmap[kind][piece] = pieceBitmap2[kind][piece]; - } - } - - XSynchronize(xDisplay, False); /* Work-around for xlib/xt - buffering bug */ -} -#else -/* With built-in bitmaps */ void CreatePieces() { - BuiltInBits* bib = builtInBits; - int piece, kind; - char buf[MSG_SIZ]; - u_int ss = squareSize; - - XSynchronize(xDisplay, True); /* Work-around for xlib/xt - buffering bug */ - - while (bib->squareSize != ss && bib->squareSize != 0) bib++; - - for (kind = SOLID; kind <= (appData.monoMode ? OUTLINE : SOLID); kind++) { - for (piece = (int) WhitePawn; piece <= (int) WhiteKing + 4; piece++) { - sprintf(buf, "%s%c%u%c.bm", piece > (int)WhiteKing ? "w" : "", - pieceBitmapNames[piece], - ss, kind == SOLID ? 's' : 'o'); - ReadBitmap(&pieceBitmap2[kind][piece], buf, - bib->bits[kind][piece], ss, ss); - if(piece <= (int)WhiteKing) - pieceBitmap[kind][piece] = pieceBitmap2[kind][piece]; - } - } + /* order of pieces + WhitePawn, WhiteKnight, WhiteBishop, WhiteRook, WhiteQueen, WhiteKing, + BlackPawn, BlackKnight, BlackBishop, BlackRook, BlackQueen, BlackKing, + */ + int i; - XSynchronize(xDisplay, False); /* Work-around for xlib/xt - buffering bug */ -} -#endif + /* get some defaults going */ + for(i=WhitePawn; iwindow)); + + /* draw the highlight */ + cairo_move_to (cr, x, y); + cairo_rel_line_to (cr, 0,squareSize+lineGap); + cairo_rel_line_to (cr, squareSize+lineGap,0); + cairo_rel_line_to (cr, 0,-squareSize-lineGap); + cairo_close_path (cr); + + cairo_set_line_width (cr, lineGap); + switch(line_type) + { + /* TODO: use appdata colors */ + case LINE_TYPE_HIGHLIGHT: + cairo_set_source_rgba (cr, 1, 1, 0, 1.0); + break; + case LINE_TYPE_PRE: + cairo_set_source_rgba (cr, 1, 0, 0, 1.0); + break; + case LINE_TYPE_NORMAL: + default: + cairo_set_source_rgba (cr, 0, 1, 0, 1.0); + } + + cairo_stroke (cr); + + /* free memory */ + cairo_destroy (cr); + + return; } int hi1X = -1, hi1Y = -1, hi2X = -1, hi2Y = -1; @@ -4532,26 +3549,34 @@ void SetHighlights(fromX, fromY, toX, toY) int fromX, fromY, toX, toY; { - if (hi1X != fromX || hi1Y != fromY) { - if (hi1X >= 0 && hi1Y >= 0) { - drawHighlight(hi1X, hi1Y, lineGC); - } - if (fromX >= 0 && fromY >= 0) { - drawHighlight(fromX, fromY, highlineGC); - } - } - if (hi2X != toX || hi2Y != toY) { - if (hi2X >= 0 && hi2Y >= 0) { - drawHighlight(hi2X, hi2Y, lineGC); - } - if (toX >= 0 && toY >= 0) { - drawHighlight(toX, toY, highlineGC); - } - } + if (hi1X != fromX || hi1Y != fromY) + { + if (hi1X >= 0 && hi1Y >= 0) + { + drawHighlight(hi1X, hi1Y, LINE_TYPE_NORMAL); + } + if (fromX >= 0 && fromY >= 0) + { + drawHighlight(fromX, fromY, LINE_TYPE_HIGHLIGHT); + } + } + if (hi2X != toX || hi2Y != toY) + { + if (hi2X >= 0 && hi2Y >= 0) + { + drawHighlight(hi2X, hi2Y, LINE_TYPE_NORMAL); + } + if (toX >= 0 && toY >= 0) + { + drawHighlight(toX, toY, LINE_TYPE_HIGHLIGHT); + } + } hi1X = fromX; hi1Y = fromY; hi2X = toX; hi2Y = toY; + + return; } void @@ -4565,26 +3590,35 @@ void SetPremoveHighlights(fromX, fromY, toX, toY) int fromX, fromY, toX, toY; { - if (pm1X != fromX || pm1Y != fromY) { - if (pm1X >= 0 && pm1Y >= 0) { - drawHighlight(pm1X, pm1Y, lineGC); - } - if (fromX >= 0 && fromY >= 0) { - drawHighlight(fromX, fromY, prelineGC); - } - } - if (pm2X != toX || pm2Y != toY) { - if (pm2X >= 0 && pm2Y >= 0) { - drawHighlight(pm2X, pm2Y, lineGC); - } - if (toX >= 0 && toY >= 0) { - drawHighlight(toX, toY, prelineGC); - } - } + if (pm1X != fromX || pm1Y != fromY) + { + if (pm1X >= 0 && pm1Y >= 0) + { + drawHighlight(pm1X, pm1Y, LINE_TYPE_NORMAL); + } + if (fromX >= 0 && fromY >= 0) + { + drawHighlight(fromX, fromY, LINE_TYPE_PRE); + } + } + if (pm2X != toX || pm2Y != toY) + { + if (pm2X >= 0 && pm2Y >= 0) + { + drawHighlight(pm2X, pm2Y, LINE_TYPE_NORMAL); + } + if (toX >= 0 && toY >= 0) + { + drawHighlight(toX, toY, LINE_TYPE_PRE); + } + } + pm1X = fromX; pm1Y = fromY; pm2X = toX; pm2Y = toY; + + return; } void @@ -4598,172 +3632,38 @@ static void BlankSquare(x, y, color, piece, dest) ChessSquare piece; Drawable dest; { - if (useImages && useImageSqs) { - Pixmap pm; - switch (color) { - case 1: /* light */ - pm = xpmLightSquare; - break; - case 0: /* dark */ - pm = xpmDarkSquare; - break; - case 2: /* neutral */ - default: - pm = xpmJailSquare; - break; + GdkPixbuf *pb; + + switch (color) + { + case 0: /* dark */ + pb = SVGDarkSquare; + break; + case 1: /* light */ + pb = SVGLightSquare; + break; + case 2: /* neutral */ + default: + pb = SVGNeutralSquare; + break; } - XCopyArea(xDisplay, pm, dest, wlPieceGC, 0, 0, - squareSize, squareSize, x, y); - } else { - GC gc; - switch (color) { - case 1: /* light */ - gc = lightSquareGC; - break; - case 0: /* dark */ - gc = darkSquareGC; - break; - case 2: /* neutral */ - default: - gc = jailSquareGC; - break; - } - XFillRectangle(xDisplay, dest, gc, x, y, squareSize, squareSize); - } -} - -/* - I split out the routines to draw a piece so that I could - make a generic flash routine. -*/ -static void monoDrawPiece_1bit(piece, square_color, x, y, dest) - ChessSquare piece; - int square_color, x, y; - Drawable dest; -{ - /* Avoid XCopyPlane on 1-bit screens to work around Sun bug */ - switch (square_color) { - case 1: /* light */ - case 2: /* neutral */ - default: - XCopyArea(xDisplay, (int) piece < (int) BlackPawn - ? *pieceToOutline(piece) - : *pieceToSolid(piece), - dest, bwPieceGC, 0, 0, - squareSize, squareSize, x, y); - break; - case 0: /* dark */ - XCopyArea(xDisplay, (int) piece < (int) BlackPawn - ? *pieceToSolid(piece) - : *pieceToOutline(piece), - dest, wbPieceGC, 0, 0, - squareSize, squareSize, x, y); - break; - } -} - -static void monoDrawPiece(piece, square_color, x, y, dest) - ChessSquare piece; - int square_color, x, y; - Drawable dest; -{ - switch (square_color) { - case 1: /* light */ - case 2: /* neutral */ - default: - XCopyPlane(xDisplay, (int) piece < (int) BlackPawn - ? *pieceToOutline(piece) - : *pieceToSolid(piece), - dest, bwPieceGC, 0, 0, - squareSize, squareSize, x, y, 1); - break; - case 0: /* dark */ - XCopyPlane(xDisplay, (int) piece < (int) BlackPawn - ? *pieceToSolid(piece) - : *pieceToOutline(piece), - dest, wbPieceGC, 0, 0, - squareSize, squareSize, x, y, 1); - break; - } -} - -static void colorDrawPiece(piece, square_color, x, y, dest) - ChessSquare piece; - int square_color, x, y; - Drawable dest; -{ - if(pieceToSolid(piece) == NULL) return; // [HGM] bitmaps: make it non-fatal if we have no bitmap; - switch (square_color) { - case 1: /* light */ - XCopyPlane(xDisplay, *pieceToSolid(piece), - dest, (int) piece < (int) BlackPawn - ? wlPieceGC : blPieceGC, 0, 0, - squareSize, squareSize, x, y, 1); - break; - case 0: /* dark */ - XCopyPlane(xDisplay, *pieceToSolid(piece), - dest, (int) piece < (int) BlackPawn - ? wdPieceGC : bdPieceGC, 0, 0, - squareSize, squareSize, x, y, 1); - break; - case 2: /* neutral */ - default: - XCopyPlane(xDisplay, *pieceToSolid(piece), - dest, (int) piece < (int) BlackPawn - ? wjPieceGC : bjPieceGC, 0, 0, - squareSize, squareSize, x, y, 1); - break; - } + gdk_draw_pixbuf(GDK_WINDOW(GUI_Board->window),NULL,pb,0,0,x,y,-1,-1, GDK_RGB_DITHER_NORMAL, 0, 0); + return; } -static void colorDrawPieceImage(piece, square_color, x, y, dest) +static void DrawPiece(piece, square_color, x, y, dest) ChessSquare piece; int square_color, x, y; Drawable dest; { - int kind; + /* redraw background, since piece might be transparent in some areas */ + BlankSquare(x,y,square_color,piece,dest); - switch (square_color) { - case 1: /* light */ - case 2: /* neutral */ - default: - if ((int)piece < (int) BlackPawn) { - kind = 0; - } else { - kind = 2; - piece -= BlackPawn; - } - break; - case 0: /* dark */ - if ((int)piece < (int) BlackPawn) { - kind = 1; - } else { - kind = 3; - piece -= BlackPawn; - } - break; - } - XCopyArea(xDisplay, xpmPieceBitmap[kind][piece], - dest, wlPieceGC, 0, 0, - squareSize, squareSize, x, y); -} - -typedef void (*DrawFunc)(); - -DrawFunc ChooseDrawFunc() -{ - if (appData.monoMode) { - if (DefaultDepth(xDisplay, xScreen) == 1) { - return monoDrawPiece_1bit; - } else { - return monoDrawPiece; - } - } else { - if (useImages) - return colorDrawPieceImage; - else - return colorDrawPiece; - } + /* draw piece */ + gdk_draw_pixbuf(GDK_WINDOW(GUI_Board->window),NULL, + GDK_PIXBUF(SVGpieces[piece]),0,0,x,y,-1,-1, + GDK_RGB_DITHER_NORMAL, 0, 0); + return ; } /* [HR] determine square color depending on chess variant. */ @@ -4796,141 +3696,182 @@ void DrawSquare(row, column, piece, do_flash) int row, column, do_flash; ChessSquare piece; { - int square_color, x, y, direction, font_ascent, font_descent; + int square_color, x, y; int i; char string[2]; - XCharStruct overall; - DrawFunc drawfunc; int flash_delay; /* Calculate delay in milliseconds (2-delays per complete flash) */ flash_delay = 500 / appData.flashRate; - if (flipView) { + /* calculate x and y coordinates from row and column */ + if (flipView) + { x = lineGap + ((BOARD_WIDTH-1)-column) * (squareSize + lineGap); y = lineGap + row * (squareSize + lineGap); - } else { + } + else + { x = lineGap + column * (squareSize + lineGap); y = lineGap + ((BOARD_HEIGHT-1)-row) * (squareSize + lineGap); - } + } square_color = SquareColor(row, column); - if ( // [HGM] holdings: blank out area between board and holdings - column == BOARD_LEFT-1 || column == BOARD_RGHT - || (column == BOARD_LEFT-2 && row < BOARD_HEIGHT-gameInfo.holdingsSize) - || (column == BOARD_RGHT+1 && row >= gameInfo.holdingsSize) ) { - BlankSquare(x, y, 2, EmptySquare, xBoardWindow); - - // [HGM] print piece counts next to holdings - string[1] = NULLCHAR; - if (column == (flipView ? BOARD_LEFT-1 : BOARD_RGHT) && piece > 1 ) { - string[0] = '0' + piece; - XTextExtents(countFontStruct, string, 1, &direction, - &font_ascent, &font_descent, &overall); - if (appData.monoMode) { - XDrawImageString(xDisplay, xBoardWindow, countGC, - x + squareSize - overall.width - 2, - y + font_ascent + 1, string, 1); - } else { - XDrawString(xDisplay, xBoardWindow, countGC, - x + squareSize - overall.width - 2, - y + font_ascent + 1, string, 1); - } - } - if (column == (flipView ? BOARD_RGHT : BOARD_LEFT-1) && piece > 1) { - string[0] = '0' + piece; - XTextExtents(countFontStruct, string, 1, &direction, - &font_ascent, &font_descent, &overall); - if (appData.monoMode) { - XDrawImageString(xDisplay, xBoardWindow, countGC, - x + 2, y + font_ascent + 1, string, 1); - } else { - XDrawString(xDisplay, xBoardWindow, countGC, - x + 2, y + font_ascent + 1, string, 1); - } - } - } else { - if (piece == EmptySquare || appData.blindfold) { - BlankSquare(x, y, square_color, piece, xBoardWindow); - } else { - drawfunc = ChooseDrawFunc(); - if (do_flash && appData.flashCount > 0) { - for (i=0; i= gameInfo.holdingsSize) ) + { + BlankSquare(x, y, 2, EmptySquare, xBoardWindow); - string[1] = NULLCHAR; - if (appData.showCoords && row == (flipView ? BOARD_HEIGHT-1 : 0) - && column >= BOARD_LEFT && column < BOARD_RGHT) { - string[0] = 'a' + column - BOARD_LEFT; - XTextExtents(coordFontStruct, string, 1, &direction, - &font_ascent, &font_descent, &overall); - if (appData.monoMode) { - XDrawImageString(xDisplay, xBoardWindow, coordGC, - x + squareSize - overall.width - 2, - y + squareSize - font_descent - 1, string, 1); - } else { - XDrawString(xDisplay, xBoardWindow, coordGC, - x + squareSize - overall.width - 2, - y + squareSize - font_descent - 1, string, 1); - } - } - if (appData.showCoords && column == (flipView ? BOARD_RGHT-1 : BOARD_LEFT)) { - string[0] = ONE + row; - XTextExtents(coordFontStruct, string, 1, &direction, - &font_ascent, &font_descent, &overall); - if (appData.monoMode) { - XDrawImageString(xDisplay, xBoardWindow, coordGC, - x + 2, y + font_ascent + 1, string, 1); - } else { - XDrawString(xDisplay, xBoardWindow, coordGC, - x + 2, y + font_ascent + 1, string, 1); - } - } -} + // [HGM] print piece counts next to holdings + string[1] = NULLCHAR; + if(piece > 1) + { + cairo_text_extents_t extents; + cairo_t *cr; + int xpos, ypos; + /* get a cairo_t */ + cr = gdk_cairo_create (GDK_WINDOW(GUI_Board->window)); -/* Why is this needed on some versions of X? */ -void EventProc(widget, unused, event) - Widget widget; - caddr_t unused; - XEvent *event; -{ - if (!XtIsRealized(widget)) - return; + string[0] = '0' + piece; - switch (event->type) { - case Expose: - if (event->xexpose.count > 0) return; /* no clipping is done */ - XDrawPosition(widget, True, NULL); - break; - default: - return; - } -} -/* end why */ + /* TODO this has to go into the font-selection */ + cairo_select_font_face (cr, "Sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); -void DrawPosition(fullRedraw, board) - /*Boolean*/int fullRedraw; - Board board; -{ - XDrawPosition(boardWidget, fullRedraw, board); + cairo_set_font_size (cr, 12.0); + cairo_text_extents (cr, string, &extents); + + if (column == (flipView ? BOARD_LEFT-1 : BOARD_RGHT) ) + { + xpos= x + squareSize - extents.width - 2; + ypos= y + extents.y_bearing + 1; + } + if (column == (flipView ? BOARD_RGHT : BOARD_LEFT-1) && piece > 1) + { + xpos= x + 2; + ypos = y + extents.y_bearing + 1; + } + + /* TODO mono mode? */ + cairo_move_to (cr, xpos, ypos); + cairo_text_path (cr, string); + cairo_set_source_rgb (cr, 1.0, 1.0, 1); + cairo_fill_preserve (cr); + cairo_set_source_rgb (cr, 0, 0, 0); + cairo_set_line_width (cr, 0.1); + cairo_stroke (cr); + + /* free memory */ + cairo_destroy (cr); + } + } + else + { + /* square on the board */ + if (piece == EmptySquare || appData.blindfold) + { + BlankSquare(x, y, square_color, piece, xBoardWindow); + } + else + { + if (do_flash && appData.flashCount > 0) + { + for (i=0; iwindow)); + + if (row == (flipView ? BOARD_HEIGHT-1 : 0) && + column >= BOARD_LEFT && column < BOARD_RGHT) + { + string[0] = 'a' + column - BOARD_LEFT; + cairo_text_extents (cr, string, &extents); + + xpos = x + squareSize - extents.width - 2; + ypos = y + squareSize - extents.height - extents.y_bearing - 1; + + if (appData.monoMode) + { /*TODO*/ + } + else + { + } + + cairo_move_to (cr, xpos, ypos); + cairo_text_path (cr, string); + cairo_set_source_rgb (cr, 0.0, 0.0, 0); + cairo_fill_preserve (cr); + cairo_set_source_rgb (cr, 0, 1.0, 0); + cairo_set_line_width (cr, 0.1); + cairo_stroke (cr); + } + if ( column == (flipView ? BOARD_RGHT-1 : BOARD_LEFT)) + { + + string[0] = ONE + row; + cairo_text_extents (cr, string, &extents); + + xpos = x + 2; + ypos = y + extents.height + 1; + + if (appData.monoMode) + { /*TODO*/ + } + else + { + } + + cairo_move_to (cr, xpos, ypos); + cairo_text_path (cr, string); + cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); + cairo_fill_preserve (cr); + cairo_set_source_rgb (cr, 0, 0, 1.0); + cairo_set_line_width (cr, 0.1); + cairo_stroke (cr); + + } + /* free memory */ + cairo_destroy (cr); + } + + return; } + /* Returns 1 if there are "too many" differences between b1 and b2 (i.e. more than 1 move was made) */ static int too_many_diffs(b1, b2) @@ -5003,116 +3944,150 @@ static int damage[BOARD_SIZE][BOARD_SIZE]; /* * event handler for redrawing the board */ -void XDrawPosition(w, repaint, board) - Widget w; +void DrawPosition( repaint, board) /*Boolean*/int repaint; - Board board; + Board board; { - int i, j, do_flash; - static int lastFlipView = 0; - static int lastBoardValid = 0; - static Board lastBoard; - Arg args[16]; - int rrow, rcol; + int i, j, do_flash; + static int lastFlipView = 0; + static int lastBoardValid = 0; + static Board lastBoard; + int rrow, rcol; - if (board == NULL) { - if (!lastBoardValid) return; - board = lastBoard; - } - if (!lastBoardValid || lastFlipView != flipView) { - XtSetArg(args[0], XtNleftBitmap, (flipView ? xMarkPixmap : None)); - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Flip View"), - args, 1); - } + if (board == NULL) { + if (!lastBoardValid) return; + board = lastBoard; + } + if (!lastBoardValid || lastFlipView != flipView) { + // XtSetArg(args[0], XtNleftBitmap, (flipView ? xMarkPixmap : None)); + // XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Flip View"), + // args, 1); + } - /* - * It would be simpler to clear the window with XClearWindow() - * but this causes a very distracting flicker. - */ + /* + * It would be simpler to clear the window with XClearWindow() + * but this causes a very distracting flicker. + */ - if (!repaint && lastBoardValid && lastFlipView == flipView) { + if (!repaint && lastBoardValid && lastFlipView == flipView) + { + /* If too much changes (begin observing new game, etc.), don't + do flashing */ + do_flash = too_many_diffs(board, lastBoard) ? 0 : 1; + + /* Special check for castling so we don't flash both the king + and the rook (just flash the king). */ + if (do_flash) + { + if (check_castle_draw(board, lastBoard, &rrow, &rcol)) + { + /* Draw rook with NO flashing. King will be drawn flashing later */ + DrawSquare(rrow, rcol, board[rrow][rcol], 0); + lastBoard[rrow][rcol] = board[rrow][rcol]; + } + } - /* If too much changes (begin observing new game, etc.), don't - do flashing */ - do_flash = too_many_diffs(board, lastBoard) ? 0 : 1; + /* First pass -- Draw (newly) empty squares and repair damage. + This prevents you from having a piece show up twice while it + is flashing on its new square */ + for (i = 0; i < BOARD_HEIGHT; i++) + for (j = 0; j < BOARD_WIDTH; j++) + if ((board[i][j] != lastBoard[i][j] && board[i][j] == EmptySquare) + || damage[i][j]) + { + DrawSquare(i, j, board[i][j], 0); + damage[i][j] = False; + } - /* Special check for castling so we don't flash both the king - and the rook (just flash the king). */ - if (do_flash) { - if (check_castle_draw(board, lastBoard, &rrow, &rcol)) { - /* Draw rook with NO flashing. King will be drawn flashing later */ - DrawSquare(rrow, rcol, board[rrow][rcol], 0); - lastBoard[rrow][rcol] = board[rrow][rcol]; + /* Second pass -- Draw piece(s) in new position and flash them */ + for (i = 0; i < BOARD_HEIGHT; i++) + for (j = 0; j < BOARD_WIDTH; j++) + if (board[i][j] != lastBoard[i][j]) + { + DrawSquare(i, j, board[i][j], do_flash); } - } + } + else + { + /* redraw Grid */ + if (lineGap > 0) + { + int x1,x2,y1,y2; + cairo_t *cr; + + /* get a cairo_t */ + cr = gdk_cairo_create (GDK_WINDOW(GUI_Board->window)); + + cairo_set_line_width (cr, lineGap); + + /* TODO: use appdata colors */ + cairo_set_source_rgba (cr, 0, 1, 0, 1.0); - /* First pass -- Draw (newly) empty squares and repair damage. - This prevents you from having a piece show up twice while it - is flashing on its new square */ - for (i = 0; i < BOARD_HEIGHT; i++) - for (j = 0; j < BOARD_WIDTH; j++) - if ((board[i][j] != lastBoard[i][j] && board[i][j] == EmptySquare) - || damage[i][j]) { - DrawSquare(i, j, board[i][j], 0); - damage[i][j] = False; + cairo_stroke (cr); + + for (i = 0; i < BOARD_HEIGHT + 1; i++) + { + x1 = 0; + x2 = lineGap + BOARD_WIDTH * (squareSize + lineGap); + y1 = y2 = lineGap / 2 + (i * (squareSize + lineGap)); + + cairo_move_to (cr, x1, y1); + cairo_rel_line_to (cr, x2,0); + cairo_stroke (cr); } - /* Second pass -- Draw piece(s) in new position and flash them */ - for (i = 0; i < BOARD_HEIGHT; i++) - for (j = 0; j < BOARD_WIDTH; j++) - if (board[i][j] != lastBoard[i][j]) { - DrawSquare(i, j, board[i][j], do_flash); + for (j = 0; j < BOARD_WIDTH + 1; j++) + { + y1 = 0; + y2 = lineGap + BOARD_HEIGHT * (squareSize + lineGap); + x1 = x2 = lineGap / 2 + (j * (squareSize + lineGap)); + + cairo_move_to (cr, x1, y1); + cairo_rel_line_to (cr, 0, y2); + cairo_stroke (cr); } - } else { - if (lineGap > 0) - XDrawSegments(xDisplay, xBoardWindow, lineGC, - gridSegments, BOARD_HEIGHT + BOARD_WIDTH + 2); - for (i = 0; i < BOARD_HEIGHT; i++) - for (j = 0; j < BOARD_WIDTH; j++) { - DrawSquare(i, j, board[i][j], 0); - damage[i][j] = False; + /* free memory */ + cairo_destroy (cr); + } + + /* draw pieces */ + for (i = 0; i < BOARD_HEIGHT; i++) + for (j = 0; j < BOARD_WIDTH; j++) + { + DrawSquare(i, j, board[i][j], 0); + damage[i][j] = False; } } - CopyBoard(lastBoard, board); - lastBoardValid = 1; - lastFlipView = flipView; + CopyBoard(lastBoard, board); + lastBoardValid = 1; + lastFlipView = flipView; - /* Draw highlights */ - if (pm1X >= 0 && pm1Y >= 0) { - drawHighlight(pm1X, pm1Y, prelineGC); + /* Draw highlights */ + if (pm1X >= 0 && pm1Y >= 0) + { + drawHighlight(pm1X, pm1Y, LINE_TYPE_PRE); } - if (pm2X >= 0 && pm2Y >= 0) { - drawHighlight(pm2X, pm2Y, prelineGC); + if (pm2X >= 0 && pm2Y >= 0) + { + drawHighlight(pm2X, pm2Y, LINE_TYPE_PRE); } - if (hi1X >= 0 && hi1Y >= 0) { - drawHighlight(hi1X, hi1Y, highlineGC); + if (hi1X >= 0 && hi1Y >= 0) + { + drawHighlight(hi1X, hi1Y, LINE_TYPE_HIGHLIGHT); } - if (hi2X >= 0 && hi2Y >= 0) { - drawHighlight(hi2X, hi2Y, highlineGC); + if (hi2X >= 0 && hi2Y >= 0) + { + drawHighlight(hi2X, hi2Y, LINE_TYPE_HIGHLIGHT); } - /* If piece being dragged around board, must redraw that too */ - DrawDragPiece(); - - XSync(xDisplay, False); -} + /* If piece being dragged around board, must redraw that too */ + DrawDragPiece(); - -/* - * event handler for redrawing the board - */ -void DrawPositionProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - XDrawPosition(w, True, NULL); + return; } - /* * event handler for parsing user moves */ @@ -5139,8 +4114,8 @@ void HandleUserMove(w, event, prms, nprms) if (promotionUp) { if (event->type == ButtonPress) { - XtPopdown(promotionShell); - XtDestroyWidget(promotionShell); +// XtPopdown(promotionShell); +// XtDestroyWidget(promotionShell); promotionUp = False; ClearHighlights(); fromX = fromY = -1; @@ -5160,9 +4135,10 @@ void HandleUserMove(w, event, prms, nprms) /* [HGM] holdings: next 5 lines: ignore all clicks between board and holdings */ if(event->type == ButtonPress - && ( x == BOARD_LEFT-1 || x == BOARD_RGHT - || x == BOARD_LEFT-2 && y < BOARD_HEIGHT-gameInfo.holdingsSize - || x == BOARD_RGHT+1 && y >= gameInfo.holdingsSize) ) + && ( x == BOARD_LEFT-1 || + x == BOARD_RGHT || + (x == BOARD_LEFT-2 && y < BOARD_HEIGHT-gameInfo.holdingsSize ) || + (x == BOARD_RGHT+1 && y >= gameInfo.holdingsSize)) ) return; if (fromX == -1) { @@ -5979,8 +4955,8 @@ void PromotionPopUp() XawDialogAddButton(dialog, _("King"), PromotionCallback, (XtPointer) dialog); } - if(gameInfo.variant == VariantCapablanca || - gameInfo.variant == VariantGothic || + if(gameInfo.variant == VariantCapablanca || + gameInfo.variant == VariantGothic || gameInfo.variant == VariantCapaRandom) { XawDialogAddButton(dialog, _("Archbishop"), PromotionCallback, (XtPointer) dialog); @@ -6079,77 +5055,41 @@ void ErrorPopDown() { if (!errorUp) return; errorUp = False; - XtPopdown(errorShell); - XtDestroyWidget(errorShell); + + if(GUI_Error) + gtk_widget_destroy(GTK_WIDGET(GUI_Error)); + if (errorExitStatus != -1) ExitEvent(errorExitStatus); + + return; } void ErrorPopUp(title, label, modal) char *title, *label; int modal; { - Arg args[16]; - Widget dialog, layout; - Position x, y; - int xx, yy; - Window junk; - Dimension bw_width, pw_width; - Dimension pw_height; - int i; - - i = 0; - XtSetArg(args[i], XtNresizable, True); i++; - XtSetArg(args[i], XtNtitle, title); i++; - errorShell = - XtCreatePopupShell("errorpopup", transientShellWidgetClass, - shellWidget, args, i); - layout = - XtCreateManagedWidget(layoutName, formWidgetClass, errorShell, - layoutArgs, XtNumber(layoutArgs)); - - i = 0; - XtSetArg(args[i], XtNlabel, label); i++; - XtSetArg(args[i], XtNborderWidth, 0); i++; - dialog = XtCreateManagedWidget("dialog", dialogWidgetClass, - layout, args, i); - - XawDialogAddButton(dialog, _("ok"), ErrorCallback, (XtPointer) dialog); - - XtRealizeWidget(errorShell); - CatchDeleteWindow(errorShell, "ErrorPopDown"); - - i = 0; - XtSetArg(args[i], XtNwidth, &bw_width); i++; - XtGetValues(boardWidget, args, i); - i = 0; - XtSetArg(args[i], XtNwidth, &pw_width); i++; - XtSetArg(args[i], XtNheight, &pw_height); i++; - XtGetValues(errorShell, args, i); + GUI_Error = gtk_message_dialog_new(GTK_WINDOW(GUI_Window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + (gchar *)label); -#ifdef NOTDEF - /* This code seems to tickle an X bug if it is executed too soon - after xboard starts up. The coordinates get transformed as if - the main window was positioned at (0, 0). - */ - XtTranslateCoords(boardWidget, (bw_width - pw_width) / 2, - 0 - pw_height + squareSize / 3, &x, &y); -#else - XTranslateCoordinates(xDisplay, XtWindow(boardWidget), - RootWindowOfScreen(XtScreen(boardWidget)), - (bw_width - pw_width) / 2, - 0 - pw_height + squareSize / 3, &xx, &yy, &junk); - x = xx; - y = yy; -#endif - if (y < 0) y = 0; /*avoid positioning top offscreen*/ - - i = 0; - XtSetArg(args[i], XtNx, x); i++; - XtSetArg(args[i], XtNy, y); i++; - XtSetValues(errorShell, args, i); + gtk_window_set_title(GTK_WINDOW(GUI_Error),(gchar *) title); + if(modal) + { + gtk_dialog_run(GTK_DIALOG(GUI_Error)); + gtk_widget_destroy(GTK_WIDGET(GUI_Error)); + } + else + { + g_signal_connect_swapped (GUI_Error, "response", + G_CALLBACK (ErrorPopDownProc), + GUI_Error); + errorUp = True; + gtk_widget_show(GTK_WIDGET(GUI_Error)); + } - errorUp = True; - XtPopup(errorShell, modal ? XtGrabExclusive : XtGrabNone); + return; } /* Disable all user input other than deleting the window */ @@ -6158,7 +5098,7 @@ void FreezeUI() { if (frozen) return; /* Grab by a widget that doesn't accept input */ - XtAddGrab(messageWidget, TRUE, FALSE); + // XtAddGrab(messageWidget, TRUE, FALSE); frozen = 1; } @@ -6166,7 +5106,7 @@ void FreezeUI() void ThawUI() { if (!frozen) return; - XtRemoveGrab(messageWidget); + // XtRemoveGrab(messageWidget); frozen = 0; } @@ -6214,80 +5154,43 @@ char *ModeToWidgetName(mode) void ModeHighlight() { - Arg args[16]; static int oldPausing = FALSE; static GameMode oldmode = (GameMode) -1; char *wname; - if (!boardWidget || !XtIsRealized(boardWidget)) return; + // todo this toggling of the pause button doesn't seem to work? + // e.g. select pause from buttonbar doesn't activate menumode.pause + + // if (!boardWidget || !XtIsRealized(boardWidget)) return; if (pausing != oldPausing) { - oldPausing = pausing; + oldPausing = pausing; + gtk_button_set_relief(GTK_BUTTON (gtk_builder_get_object (builder, "menuMode.Pause")),pausing?GTK_RELIEF_NORMAL:GTK_RELIEF_NONE); + /* toggle background color in showbuttonbar */ + if (appData.showButtonBar) { if (pausing) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); + gtk_button_pressed(GTK_BUTTON (gtk_builder_get_object (builder, "buttonbar.Pause"))); } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Pause"), - args, 1); - - if (appData.showButtonBar) { -#if 0 - if (pausing) { - XtSetArg(args[0], XtNbackground, buttonForegroundPixel); - XtSetArg(args[1], XtNforeground, buttonBackgroundPixel); - } else { - XtSetArg(args[0], XtNbackground, buttonBackgroundPixel); - XtSetArg(args[1], XtNforeground, buttonForegroundPixel); - } -#else - /* Always toggle, don't set. Previous code messes up when - invoked while the button is pressed, as releasing it - toggles the state again. */ - { - Pixel oldbg, oldfg; - XtSetArg(args[0], XtNbackground, &oldbg); - XtSetArg(args[1], XtNforeground, &oldfg); - XtGetValues(XtNameToWidget(buttonBarWidget, PAUSE_BUTTON), - args, 2); - XtSetArg(args[0], XtNbackground, oldfg); - XtSetArg(args[1], XtNforeground, oldbg); - } -#endif - XtSetValues(XtNameToWidget(buttonBarWidget, PAUSE_BUTTON), args, 2); + gtk_button_released(GTK_BUTTON (gtk_builder_get_object (builder, "buttonbar.Pause"))); } + } } wname = ModeToWidgetName(oldmode); - if (wname != NULL) { - XtSetArg(args[0], XtNleftBitmap, None); - XtSetValues(XtNameToWidget(menuBarWidget, wname), args, 1); - } - wname = ModeToWidgetName(gameMode); - if (wname != NULL) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - XtSetValues(XtNameToWidget(menuBarWidget, wname), args, 1); - } + if(wname) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, wname)),True); + oldmode = gameMode; /* Maybe all the enables should be handled here, not just this one */ - XtSetSensitive(XtNameToWidget(menuBarWidget, "menuMode.Training"), - gameMode == Training || gameMode == PlayFromGameFile); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "menuMode.Training")), + gameMode == Training || gameMode == PlayFromGameFile); } /* * Button/menu procedures */ -void ResetProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ResetGameEvent(); - AnalysisPopDown(); -} int LoadGamePopUp(f, gameNumber, title) FILE *f; @@ -6310,44 +5213,6 @@ int LoadGamePopUp(f, gameNumber, title) return LoadGame(f, gameNumber, title, FALSE); } -void LoadGameProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - if (gameMode == AnalyzeMode || gameMode == AnalyzeFile) { - Reset(FALSE, TRUE); - } - FileNamePopUp(_("Load game file name?"), "", LoadGamePopUp, "rb"); -} - -void LoadNextGameProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ReloadGame(1); -} - -void LoadPrevGameProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ReloadGame(-1); -} - -void ReloadGameProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ReloadGame(0); -} void LoadNextPositionProc(w, event, prms, nprms) Widget w; @@ -6612,44 +5477,6 @@ void AutoSaveGame() SaveGameProc(NULL, NULL, NULL, NULL); } - -void QuitProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ExitEvent(0); -} - -void PauseProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - PauseEvent(); -} - - -void MachineBlackProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - MachineBlackEvent(); -} - -void MachineWhiteProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - MachineWhiteEvent(); -} - void AnalyzeModeProc(w, event, prms, nprms) Widget w; XEvent *event; @@ -6715,23 +5542,6 @@ void AnalyzeFileProc(w, event, prms, nprms) AnalysisPeriodicEvent(1); } -void TwoMachinesProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - TwoMachinesEvent(); -} - -void IcsClientProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - IcsClientEvent(); -} void EditGameProc(w, event, prms, nprms) Widget w; @@ -6786,104 +5596,6 @@ void IcsInputBoxProc(w, event, prms, nprms) } } -void AcceptProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - AcceptEvent(); -} - -void DeclineProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - DeclineEvent(); -} - -void RematchProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - RematchEvent(); -} - -void CallFlagProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - CallFlagEvent(); -} - -void DrawProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - DrawEvent(); -} - -void AbortProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - AbortEvent(); -} - -void AdjournProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - AdjournEvent(); -} - -void ResignProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ResignEvent(); -} - -void AdjuWhiteProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - UserAdjudicationEvent(+1); -} - -void AdjuBlackProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - UserAdjudicationEvent(-1); -} - -void AdjuDrawProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - UserAdjudicationEvent(0); -} void EnterKeyProc(w, event, prms, nprms) Widget w; @@ -6895,98 +5607,6 @@ void EnterKeyProc(w, event, prms, nprms) ICSInputSendText(); } -void StopObservingProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - StopObservingEvent(); -} - -void StopExaminingProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - StopExaminingEvent(); -} - - -void ForwardProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ForwardEvent(); -} - - -void BackwardProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - BackwardEvent(); -} - -void ToStartProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ToStartEvent(); -} - -void ToEndProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - ToEndEvent(); -} - -void RevertProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - RevertEvent(); -} - -void TruncateGameProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - TruncateGameEvent(); -} -void RetractMoveProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - RetractMoveEvent(); -} - -void MoveNowProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - MoveNowEvent(); -} - - void AlwaysQueenProc(w, event, prms, nprms) Widget w; XEvent *event; @@ -7225,16 +5845,6 @@ void FlashMovesProc(w, event, prms, nprms) args, 1); } -void FlipViewProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - flipView = !flipView; - DrawPosition(True, NULL); -} - void GetMoveListProc(w, event, prms, nprms) Widget w; XEvent *event; @@ -7467,27 +6077,6 @@ void QuietPlayProc(w, event, prms, nprms) args, 1); } -void ShowCoordsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - Arg args[16]; - - appData.showCoords = !appData.showCoords; - - if (appData.showCoords) { - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - } else { - XtSetArg(args[0], XtNleftBitmap, None); - } - XtSetValues(XtNameToWidget(menuBarWidget, "menuOptions.Show Coords"), - args, 1); - - DrawPosition(True, NULL); -} - void ShowThinkingProc(w, event, prms, nprms) Widget w; XEvent *event; @@ -7530,74 +6119,6 @@ void HideThinkingProc(w, event, prms, nprms) args, 1); } -void InfoProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - char buf[MSG_SIZ]; - snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &", - INFODIR, INFOFILE); - system(buf); -} - -void ManProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - char buf[MSG_SIZ]; - String name; - if (nprms && *nprms > 0) - name = prms[0]; - else - name = "xboard"; - snprintf(buf, sizeof(buf), "xterm -e man %s &", name); - system(buf); -} - -void HintProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - HintEvent(); -} - -void BookProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - BookEvent(); -} - -void AboutProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; -{ - char buf[MSG_SIZ]; -#if ZIPPY - char *zippy = " (with Zippy code)"; -#else - char *zippy = ""; -#endif - snprintf(buf, sizeof(buf), "%s%s\n\n%s\n%s\n%s\n\n%s%s\n%s", - programVersion, zippy, - "Copyright 1991 Digital Equipment Corporation", - "Enhancements Copyright 1992-2009 Free Software Foundation", - "Enhancements Copyright 2005 Alessandro Scotti", - PACKAGE, " is free software and carries NO WARRANTY;", - "see the file COPYING for more information."); - ErrorPopUp(_("About XBoard"), buf, FALSE); -} - void DebugProc(w, event, prms, nprms) Widget w; XEvent *event; @@ -7639,7 +6160,7 @@ void Iconify(w, event, prms, nprms) } void DisplayMessage(message, extMessage) - char *message, *extMessage; + gchar *message, *extMessage; { char buf[MSG_SIZ]; Arg arg; @@ -7652,57 +6173,59 @@ void DisplayMessage(message, extMessage) message = extMessage; } } - XtSetArg(arg, XtNlabel, message); - XtSetValues(messageWidget, &arg, 1); + gtk_label_set_text( GTK_LABEL(gtk_builder_get_object (builder, "Messages")),message); + + return; } void DisplayTitle(text) char *text; { - Arg args[16]; - int i; - char title[MSG_SIZ]; - char icon[MSG_SIZ]; + gchar title[MSG_SIZ]; if (text == NULL) text = ""; - if (appData.titleInWindow) { - i = 0; - XtSetArg(args[i], XtNlabel, text); i++; - XtSetValues(titleWidget, args, i); - } + if (appData.titleInWindow) + { + /* TODO */ + } - if (*text != NULLCHAR) { - strcpy(icon, text); + if (*text != NULLCHAR) + { strcpy(title, text); - } else if (appData.icsActive) { - snprintf(icon, sizeof(icon), "%s", appData.icsHost); + } + else if (appData.icsActive) + { snprintf(title, sizeof(title), "%s: %s", programName, appData.icsHost); - } else if (appData.cmailGameName[0] != NULLCHAR) { - snprintf(icon, sizeof(icon), "%s", "CMail"); + } + else if (appData.cmailGameName[0] != NULLCHAR) + { snprintf(title,sizeof(title), "%s: %s", programName, "CMail"); #ifdef GOTHIC // [HGM] license: This stuff should really be done in back-end, but WinBoard already had a pop-up for it - } else if (gameInfo.variant == VariantGothic) { - strcpy(icon, programName); + } + else if (gameInfo.variant == VariantGothic) + { strcpy(title, GOTHIC); #endif #ifdef FALCON - } else if (gameInfo.variant == VariantFalcon) { - strcpy(icon, programName); + } + else if (gameInfo.variant == VariantFalcon) + { strcpy(title, FALCON); #endif - } else if (appData.noChessProgram) { - strcpy(icon, programName); + } + else if (appData.noChessProgram) + { strcpy(title, programName); - } else { - strcpy(icon, first.tidy); + } + else + { snprintf(title,sizeof(title), "%s: %s", programName, first.tidy); - } - i = 0; - XtSetArg(args[i], XtNiconName, (XtArgVal) icon); i++; - XtSetArg(args[i], XtNtitle, (XtArgVal) title); i++; - XtSetValues(shellWidget, args, i); + } + gtk_window_set_title(GTK_WINDOW(GUI_Window),title); + + return; } @@ -8130,60 +6653,72 @@ char *HostName() #endif /* not HAVE_GETHOSTNAME */ } -XtIntervalId delayedEventTimerXID = 0; +guint delayedEventTimerTag = 0; DelayedEventCallback delayedEventCallback = 0; void -FireDelayedEvent() +FireDelayedEvent(data) + gpointer data; { - delayedEventTimerXID = 0; - delayedEventCallback(); + /* remove timer */ + g_source_remove(delayedEventTimerTag); + delayedEventTimerTag = 0; + + /* call function */ + delayedEventCallback(); + + return; } void ScheduleDelayedEvent(cb, millisec) - DelayedEventCallback cb; long millisec; + DelayedEventCallback cb; guint millisec; { - if(delayedEventTimerXID && delayedEventCallback == cb) + if(delayedEventTimerTag && delayedEventCallback == cb) // [HGM] alive: replace, rather than add or flush identical event - XtRemoveTimeOut(delayedEventTimerXID); + g_source_remove(delayedEventTimerTag); delayedEventCallback = cb; - delayedEventTimerXID = - XtAppAddTimeOut(appContext, millisec, - (XtTimerCallbackProc) FireDelayedEvent, (XtPointer) 0); + delayedEventTimerTag = g_timeout_add(millisec,(GSourceFunc) FireDelayedEvent, NULL); + return; } DelayedEventCallback GetDelayedEvent() { - if (delayedEventTimerXID) { - return delayedEventCallback; - } else { - return NULL; - } + if (delayedEventTimerTag) + { + return delayedEventCallback; + } + else + { + return NULL; + } } void CancelDelayedEvent() { - if (delayedEventTimerXID) { - XtRemoveTimeOut(delayedEventTimerXID); - delayedEventTimerXID = 0; - } + if (delayedEventTimerTag) + { + g_source_remove(delayedEventTimerTag); + delayedEventTimerTag = 0; + } + + return; } -XtIntervalId loadGameTimerXID = 0; +guint loadGameTimerTag = 0; int LoadGameTimerRunning() { - return loadGameTimerXID != 0; + return loadGameTimerTag != 0; } int StopLoadGameTimer() { - if (loadGameTimerXID != 0) { - XtRemoveTimeOut(loadGameTimerXID); - loadGameTimerXID = 0; + if (loadGameTimerTag != 0) { + g_source_remove(loadGameTimerTag); + loadGameTimerTag = 0; return TRUE; } else { return FALSE; @@ -8191,120 +6726,134 @@ int StopLoadGameTimer() } void -LoadGameTimerCallback(arg, id) - XtPointer arg; - XtIntervalId *id; +LoadGameTimerCallback(data) + gpointer data; { - loadGameTimerXID = 0; - AutoPlayGameLoop(); + /* remove timer */ + g_source_remove(loadGameTimerTag); + loadGameTimerTag = 0; + + AutoPlayGameLoop(); + return; } void StartLoadGameTimer(millisec) long millisec; { - loadGameTimerXID = - XtAppAddTimeOut(appContext, millisec, - (XtTimerCallbackProc) LoadGameTimerCallback, - (XtPointer) 0); + loadGameTimerTag = + g_timeout_add( millisec, (GSourceFunc) LoadGameTimerCallback, NULL); + return; } -XtIntervalId analysisClockXID = 0; +guint analysisClockTag = 0; -void -AnalysisClockCallback(arg, id) - XtPointer arg; - XtIntervalId *id; +gboolean +AnalysisClockCallback(data) + gpointer data; { if (gameMode == AnalyzeMode || gameMode == AnalyzeFile - || appData.icsEngineAnalyze) { // [DM] + || appData.icsEngineAnalyze) + { AnalysisPeriodicEvent(0); - StartAnalysisClock(); - } + return 1; /* keep on going */ + } + return 0; /* stop timer */ } void StartAnalysisClock() { - analysisClockXID = - XtAppAddTimeOut(appContext, 2000, - (XtTimerCallbackProc) AnalysisClockCallback, - (XtPointer) 0); + analysisClockTag = + g_timeout_add( 2000,(GSourceFunc) AnalysisClockCallback, NULL); + return; } -XtIntervalId clockTimerXID = 0; +guint clockTimerTag = 0; int ClockTimerRunning() { - return clockTimerXID != 0; + return clockTimerTag != 0; } int StopClockTimer() { - if (clockTimerXID != 0) { - XtRemoveTimeOut(clockTimerXID); - clockTimerXID = 0; + if (clockTimerTag != 0) + { + g_source_remove(clockTimerTag); + clockTimerTag = 0; return TRUE; - } else { + } + else + { return FALSE; - } + } } void -ClockTimerCallback(arg, id) - XtPointer arg; - XtIntervalId *id; +ClockTimerCallback(data) + gpointer data; { - clockTimerXID = 0; - DecrementClocks(); + /* remove timer */ + g_source_remove(clockTimerTag); + clockTimerTag = 0; + + DecrementClocks(); + return; } void StartClockTimer(millisec) long millisec; { - clockTimerXID = - XtAppAddTimeOut(appContext, millisec, - (XtTimerCallbackProc) ClockTimerCallback, - (XtPointer) 0); + clockTimerTag = g_timeout_add(millisec,(GSourceFunc) ClockTimerCallback,NULL); + return; } void DisplayTimerLabel(w, color, timer, highlight) - Widget w; + GtkWidget *w; char *color; long timer; int highlight; { - char buf[MSG_SIZ]; - Arg args[16]; - - /* check for low time warning */ - Pixel foregroundOrWarningColor = timerForegroundPixel; - - if (timer > 0 && - appData.lowTimeWarning && - (timer / 1000) < appData.icsAlarmTime) - foregroundOrWarningColor = lowTimeWarningColor; - - if (appData.clockMode) { - sprintf(buf, "%s: %s", color, TimeString(timer)); - XtSetArg(args[0], XtNlabel, buf); - } else { - sprintf(buf, "%s ", color); - XtSetArg(args[0], XtNlabel, buf); - } + gchar buf[MSG_SIZ]; - if (highlight) { - XtSetArg(args[1], XtNbackground, foregroundOrWarningColor); - XtSetArg(args[2], XtNforeground, timerBackgroundPixel); - } else { - XtSetArg(args[1], XtNbackground, timerBackgroundPixel); - XtSetArg(args[2], XtNforeground, foregroundOrWarningColor); - } - - XtSetValues(w, args, 3); + if (appData.clockMode) { + sprintf(buf, "%s: %s", color, TimeString(timer)); + } else { + sprintf(buf, "%s ", color); + } + gtk_label_set_text(GTK_LABEL(w),buf); + + /* check for low time warning */ +// Pixel foregroundOrWarningColor = timerForegroundPixel; + +// if (timer > 0 && +// appData.lowTimeWarning && +// (timer / 1000) < appData.icsAlarmTime) +// foregroundOrWarningColor = lowTimeWarningColor; +// +// if (appData.clockMode) { +// sprintf(buf, "%s: %s", color, TimeString(timer)); +// XtSetArg(args[0], XtNlabel, buf); +// } else { +// sprintf(buf, "%s ", color); +// XtSetArg(args[0], XtNlabel, buf); +// } +// +// if (highlight) { +// +// XtSetArg(args[1], XtNbackground, foregroundOrWarningColor); +// XtSetArg(args[2], XtNforeground, timerBackgroundPixel); +// } else { +// XtSetArg(args[1], XtNbackground, timerBackgroundPixel); +// XtSetArg(args[2], XtNforeground, foregroundOrWarningColor); +// } +// +// XtSetValues(w, args, 3); +// } void @@ -8312,14 +6861,13 @@ DisplayWhiteClock(timeRemaining, highlight) long timeRemaining; int highlight; { - Arg args[16]; + if(appData.noGUI) return; - if(appData.noGUI) return; - DisplayTimerLabel(whiteTimerWidget, _("White"), timeRemaining, highlight); - if (highlight && iconPixmap == bIconPixmap) { - iconPixmap = wIconPixmap; - XtSetArg(args[0], XtNiconPixmap, iconPixmap); - XtSetValues(shellWidget, args, 1); + DisplayTimerLabel(GUI_Whiteclock, _("White"), timeRemaining, highlight); + if (highlight && WindowIcon == BlackIcon) + { + WindowIcon = WhiteIcon; + gtk_window_set_icon(GTK_WINDOW(GUI_Window),WindowIcon); } } @@ -8328,15 +6876,14 @@ DisplayBlackClock(timeRemaining, highlight) long timeRemaining; int highlight; { - Arg args[16]; - if(appData.noGUI) return; - DisplayTimerLabel(blackTimerWidget, _("Black"), timeRemaining, highlight); - if (highlight && iconPixmap == wIconPixmap) { - iconPixmap = bIconPixmap; - XtSetArg(args[0], XtNiconPixmap, iconPixmap); - XtSetValues(shellWidget, args, 1); - } + + DisplayTimerLabel(GUI_Blackclock, _("Black"), timeRemaining, highlight); + if (highlight && WindowIcon == WhiteIcon) + { + WindowIcon = BlackIcon; + gtk_window_set_icon(GTK_WINDOW(GUI_Window),WindowIcon); + } } #define CPNone 0 @@ -8604,51 +7151,75 @@ typedef struct { int lineByLine; char *unused; InputCallback func; - XtInputId xid; + guint sid; char buf[INPUT_SOURCE_BUF_SIZE]; VOIDSTAR closure; } InputSource; void -DoInputCallback(closure, source, xid) - caddr_t closure; - int *source; - XtInputId *xid; +DoInputCallback(io,cond,data) + GIOChannel *io; + GIOCondition cond; + gpointer *data; { - InputSource *is = (InputSource *) closure; - int count; - int error; - char *p, *q; + /* read input from one of the input source (for example a chess program, ICS, etc). + * and call a function that will handle the input + */ - if (is->lineByLine) { - count = read(is->fd, is->unused, - INPUT_SOURCE_BUF_SIZE - (is->unused - is->buf)); - if (count <= 0) { - (is->func)(is, is->closure, is->buf, count, count ? errno : 0); - return; + int count; /* how many bytes did we read */ + int error; + char *p, *q; + + /* All information (callback function, file descriptor, etc) is + * saved in an InputSource structure + */ + InputSource *is = (InputSource *) data; + + if (is->lineByLine) + { + count = read(is->fd, is->unused, + INPUT_SOURCE_BUF_SIZE - (is->unused - is->buf)); + + if (count <= 0) + { + (is->func)(is, is->closure, is->buf, count, count ? errno : 0); + return; } - is->unused += count; - p = is->buf; - while (p < is->unused) { - q = memchr(p, '\n', is->unused - p); - if (q == NULL) break; - q++; - (is->func)(is, is->closure, p, q - p, 0); - p = q; + is->unused += count; + p = is->buf; + /* break input into lines and call the callback function on each + * line + */ + while (p < is->unused) + { + q = memchr(p, '\n', is->unused - p); + if (q == NULL) break; + q++; + (is->func)(is, is->closure, p, q - p, 0); + p = q; } - q = is->buf; - while (p < is->unused) { - *q++ = *p++; + /* remember not yet used part of the buffer */ + q = is->buf; + while (p < is->unused) + { + *q++ = *p++; } - is->unused = q; - } else { - count = read(is->fd, is->buf, INPUT_SOURCE_BUF_SIZE); - if (count == -1) - error = errno; - else - error = 0; - (is->func)(is, is->closure, is->buf, count, error); + is->unused = q; + } + else + { + /* read maximum length of input buffer and send the whole buffer + * to the callback function + */ + count = read(is->fd, is->buf, INPUT_SOURCE_BUF_SIZE); + if (count == -1) + error = errno; + else + error = 0; + (is->func)(is, is->closure, is->buf, count, error); } + + return; } InputSourceRef AddInputSource(pr, lineByLine, func, closure) @@ -8658,6 +7229,7 @@ InputSourceRef AddInputSource(pr, lineByLine, func, closure) VOIDSTAR closure; { InputSource *is; + GIOChannel *channel; ChildProc *cp = (ChildProc *) pr; is = (InputSource *) calloc(1, sizeof(InputSource)); @@ -8670,14 +7242,23 @@ InputSourceRef AddInputSource(pr, lineByLine, func, closure) is->kind = cp->kind; is->fd = cp->fdFrom; } - if (lineByLine) { - is->unused = is->buf; - } + if (lineByLine) + is->unused = is->buf; + else + is->unused = NULL; + +// is->xid = XtAppAddInput(appContext, is->fd, +// (XtPointer) (XtInputReadMask), +// (XtInputCallbackProc) DoInputCallback, +// (XtPointer) is); +// - is->xid = XtAppAddInput(appContext, is->fd, - (XtPointer) (XtInputReadMask), - (XtInputCallbackProc) DoInputCallback, - (XtPointer) is); + /* TODO: will this work on windows?*/ + printf("DEBUG: fd=%d %d\n",is->fd,is); + + channel = g_io_channel_unix_new(is->fd); + g_io_channel_set_close_on_unref (channel, TRUE); + is->sid = g_io_add_watch(channel, G_IO_IN,(GIOFunc) DoInputCallback, is); is->closure = closure; return (InputSourceRef) is; } @@ -8688,9 +7269,10 @@ RemoveInputSource(isr) { InputSource *is = (InputSource *) isr; - if (is->xid == 0) return; - XtRemoveInput(is->xid); - is->xid = 0; + if (is->sid == 0) return; + g_source_remove(is->sid); + is->sid = 0; + return; } int OutputToProcess(pr, message, count, outError) @@ -8776,6 +7358,9 @@ CreateAnimMasks (pieceDepth) unsigned long plane; XGCValues values; + /* just return for gtk at the moment */ + return; + /* Need a bitmap just to get a GC with right depth */ buf = XCreatePixmap(xDisplay, xBoardWindow, 8, 8, 1); @@ -8853,27 +7438,27 @@ InitAnimState (anim, info) XGCValues values; /* Each buffer is square size, same depth as window */ - anim->saveBuf = XCreatePixmap(xDisplay, xBoardWindow, - squareSize, squareSize, info->depth); - anim->newBuf = XCreatePixmap(xDisplay, xBoardWindow, - squareSize, squareSize, info->depth); - - /* Create a plain GC for blitting */ - mask = GCForeground | GCBackground | GCFunction | - GCPlaneMask | GCGraphicsExposures; - values.foreground = XBlackPixel(xDisplay, xScreen); - values.background = XWhitePixel(xDisplay, xScreen); - values.function = GXcopy; - values.plane_mask = AllPlanes; - values.graphics_exposures = False; - anim->blitGC = XCreateGC(xDisplay, xBoardWindow, mask, &values); - - /* Piece will be copied from an existing context at - the start of each new animation/drag. */ - anim->pieceGC = XCreateGC(xDisplay, xBoardWindow, 0, &values); - - /* Outline will be a read-only copy of an existing */ - anim->outlineGC = None; +// anim->saveBuf = XCreatePixmap(xDisplay, xBoardWindow, +// squareSize, squareSize, info->depth); +// anim->newBuf = XCreatePixmap(xDisplay, xBoardWindow, +// squareSize, squareSize, info->depth); +// +// /* Create a plain GC for blitting */ +// mask = GCForeground | GCBackground | GCFunction | +// GCPlaneMask | GCGraphicsExposures; +// values.foreground = XBlackPixel(xDisplay, xScreen); +// values.background = XWhitePixel(xDisplay, xScreen); +// values.function = GXcopy; +// values.plane_mask = AllPlanes; +// values.graphics_exposures = False; +// anim->blitGC = XCreateGC(xDisplay, xBoardWindow, mask, &values); +// +// /* Piece will be copied from an existing context at +// the start of each new animation/drag. */ +// anim->pieceGC = XCreateGC(xDisplay, xBoardWindow, 0, &values); +// +// /* Outline will be a read-only copy of an existing */ +// anim->outlineGC = None; } static void @@ -8882,16 +7467,19 @@ CreateAnimVars () static VariantClass old = (VariantClass) -1; // [HGM] pieces: redo every time variant changes XWindowAttributes info; + /* for gtk at the moment just ... */ + return; + if (xpmDone && gameInfo.variant == old) return; if(xpmDone) old = gameInfo.variant; // first time pieces might not be created yet - XGetWindowAttributes(xDisplay, xBoardWindow, &info); + // XGetWindowAttributes(xDisplay, xBoardWindow, &info); - InitAnimState(&game, &info); - InitAnimState(&player, &info); + // InitAnimState(&game, &info); + // InitAnimState(&player, &info); /* For XPM pieces, we need bitmaps to use as masks. */ - if (useImages) - CreateAnimMasks(info.depth); + // if (useImages) + // CreateAnimMasks(info.depth); xpmDone = 1; } @@ -8941,7 +7529,7 @@ static void FrameDelay (time) int time; { - XSync(xDisplay, False); + // XSync(xDisplay, False); if (time > 0) usleep(time * 1000); } @@ -9137,7 +7725,7 @@ SelectGCMask(piece, clip, outline, mask) else source = blPieceGC; } - XCopyGC(xDisplay, source, 0xFFFFFFFF, *clip); + // XCopyGC(xDisplay, source, 0xFFFFFFFF, *clip); /* Outline only used in mono mode and is not modified */ if (White(piece)) @@ -9154,23 +7742,25 @@ OverlayPiece(piece, clip, outline, dest) if (!useImages) { /* Draw solid rectangle which will be clipped to shape of piece */ - XFillRectangle(xDisplay, dest, clip, - 0, 0, squareSize, squareSize); +// XFillRectangle(xDisplay, dest, clip, +// 0, 0, squareSize, squareSize) +; if (appData.monoMode) /* Also draw outline in contrasting color for black on black / white on white cases */ - XCopyPlane(xDisplay, *pieceToOutline(piece), dest, outline, - 0, 0, squareSize, squareSize, 0, 0, 1); +// XCopyPlane(xDisplay, *pieceToOutline(piece), dest, outline, +// 0, 0, squareSize, squareSize, 0, 0, 1) +; } else { /* Copy the piece */ if (White(piece)) kind = 0; else kind = 2; - XCopyArea(xDisplay, xpmPieceBitmap[kind][piece], - dest, clip, - 0, 0, squareSize, squareSize, - 0, 0); +// XCopyArea(xDisplay, xpmPieceBitmap[kind][piece], +// dest, clip, +// 0, 0, squareSize, squareSize, +// 0, 0); } } @@ -9190,8 +7780,8 @@ BeginAnimation(anim, piece, startColor, start) anim->prevFrame = *start; /* The piece will be drawn using its own bitmap as a matte */ - SelectGCMask(piece, &anim->pieceGC, &anim->outlineGC, &mask); - XSetClipMask(xDisplay, anim->pieceGC, mask); +// SelectGCMask(piece, &anim->pieceGC, &anim->outlineGC, &mask); +// XSetClipMask(xDisplay, anim->pieceGC, mask); } static void @@ -9206,45 +7796,46 @@ AnimationFrame(anim, frame, piece) int count, i; /* Save what we are about to draw into the new buffer */ - XCopyArea(xDisplay, xBoardWindow, anim->newBuf, anim->blitGC, - frame->x, frame->y, squareSize, squareSize, - 0, 0); +// XCopyArea(xDisplay, xBoardWindow, anim->newBuf, anim->blitGC, +// frame->x, frame->y, squareSize, squareSize, +// 0, 0); /* Erase bits of the previous frame */ if (Intersect(&anim->prevFrame, frame, squareSize, &overlap, &pt)) { /* Where the new frame overlapped the previous, the contents in newBuf are wrong. */ - XCopyArea(xDisplay, anim->saveBuf, anim->newBuf, anim->blitGC, - overlap.x, overlap.y, - overlap.width, overlap.height, - pt.x, pt.y); +// XCopyArea(xDisplay, anim->saveBuf, anim->newBuf, anim->blitGC, +// overlap.x, overlap.y, +// overlap.width, overlap.height, +// pt.x, pt.y); /* Repaint the areas in the old that don't overlap new */ CalcUpdateRects(&anim->prevFrame, frame, squareSize, updates, &count); for (i = 0; i < count; i++) - XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC, - updates[i].x - anim->prevFrame.x, - updates[i].y - anim->prevFrame.y, - updates[i].width, updates[i].height, - updates[i].x, updates[i].y); +// XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC, +// updates[i].x - anim->prevFrame.x, +// updates[i].y - anim->prevFrame.y, +// updates[i].width, updates[i].height, +// updates[i].x, updates[i].y) +; } else { /* Easy when no overlap */ - XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC, - 0, 0, squareSize, squareSize, - anim->prevFrame.x, anim->prevFrame.y); +// XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC, +// 0, 0, squareSize, squareSize, +// anim->prevFrame.x, anim->prevFrame.y); } /* Save this frame for next time round */ - XCopyArea(xDisplay, anim->newBuf, anim->saveBuf, anim->blitGC, - 0, 0, squareSize, squareSize, - 0, 0); +// XCopyArea(xDisplay, anim->newBuf, anim->saveBuf, anim->blitGC, +// 0, 0, squareSize, squareSize, +// 0, 0); anim->prevFrame = *frame; /* Draw piece over original screen contents, not current, and copy entire rect. Wipes out overlapping piece images. */ OverlayPiece(piece, anim->pieceGC, anim->outlineGC, anim->newBuf); - XCopyArea(xDisplay, anim->newBuf, xBoardWindow, anim->blitGC, - 0, 0, squareSize, squareSize, - frame->x, frame->y); +// XCopyArea(xDisplay, anim->newBuf, xBoardWindow, anim->blitGC, +// 0, 0, squareSize, squareSize, +// frame->x, frame->y); } static void @@ -9262,15 +7853,16 @@ EndAnimation (anim, finish) if (Intersect(&anim->prevFrame, finish, squareSize, &overlap, &pt)) { CalcUpdateRects(&anim->prevFrame, finish, squareSize, updates, &count); for (i = 0; i < count; i++) - XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC, - updates[i].x - anim->prevFrame.x, - updates[i].y - anim->prevFrame.y, - updates[i].width, updates[i].height, - updates[i].x, updates[i].y); +// XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC, +// updates[i].x - anim->prevFrame.x, +// updates[i].y - anim->prevFrame.y, +// updates[i].width, updates[i].height, +// updates[i].x, updates[i].y) +; } else { - XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC, - 0, 0, squareSize, squareSize, - anim->prevFrame.x, anim->prevFrame.y); +// XCopyArea(xDisplay, anim->saveBuf, xBoardWindow, anim->blitGC, +// 0, 0, squareSize, squareSize, +// anim->prevFrame.x, anim->prevFrame.y); } } @@ -9311,8 +7903,8 @@ AnimateMove(board, fromX, fromY, toX, toY) if (!appData.animate || appData.blindfold) return; - if(board[toY][toX] == WhiteRook && board[fromY][fromX] == WhiteKing || - board[toY][toX] == BlackRook && board[fromY][fromX] == BlackKing) + if(board[toY][toX] == WhiteRook && board[fromY][fromX] == WhiteKing || + board[toY][toX] == BlackRook && board[fromY][fromX] == BlackKing) return; // [HGM] FRC: no animtion of FRC castlings, as to-square is not true to-square if (fromY < 0 || fromX < 0 || toX < 0 || toY < 0) return; @@ -9358,7 +7950,7 @@ AnimateMove(board, fromX, fromY, toX, toY) damage[toY][toX] = True; } -static void +void DragPieceBegin(x, y) int x; int y; { @@ -9401,9 +7993,9 @@ DragPieceBegin(x, y) as seen by opponent) the move hasn't been made yet. */ if(boardX == BOARD_RGHT+1 && PieceForSquare(boardX-1, boardY) > 1 || boardX == BOARD_LEFT-2 && PieceForSquare(boardX+1, boardY) > 1) - XCopyArea(xDisplay, xBoardWindow, player.saveBuf, player.blitGC, - corner.x, corner.y, squareSize, squareSize, - 0, 0); // [HGM] zh: unstack in stead of grab +// XCopyArea(xDisplay, xBoardWindow, player.saveBuf, player.blitGC, +// corner.x, corner.y, squareSize, squareSize, +// 0, 0); // [HGM] zh: unstack in stead of grab damage[boardY][boardX] = True; } else { player.dragActive = False; @@ -9437,7 +8029,7 @@ DragPieceMove(x, y) #endif } -static void +void DragPieceEnd(x, y) int x; int y; { diff --git a/xengineoutput.c b/xengineoutput.c index 6c640ea..1393711 100644 --- a/xengineoutput.c +++ b/xengineoutput.c @@ -144,7 +144,7 @@ extern int opponentKibitzes; /* Imports from winboard.c */ //extern HWND engineOutputDialog; -extern Arg layoutArgs[2], formArgs[2], messageArgs[4]; +extern Arg layoutArgs[2], formArgs[2]; //extern WindowPlacement wpEngineOutput;