#endif
+int initialSquareSize;
int values[MAX_OPTIONS];
ChessProgramState *currentCps;
char manDir[MSG_SIZ] = MANDIR;
static Option commonEngineOptions[] = {
{ 0, 0, 0, NULL, (void*) &appData.ponderNextMove, "", NULL, CheckBox, N_("Ponder Next Move") },
{ 0, 0, 1000, NULL, (void*) &appData.smpCores, "", NULL, Spin, N_("Maximum Number of CPUs per Engine:") },
-{ 0, 0, 0, NULL, (void*) &appData.polyglotDir, "", NULL, PathName, N_("Polygot Directory:") },
+{ 0, 0, 0, NULL, (void*) &appData.polyglotDir, NULL, NULL, PathName, N_("Polygot Directory:") },
{ 0, 0,16000, NULL, (void*) &appData.defaultHashSize, "", NULL, Spin, N_("Hash-Table Size (MB):") },
-{ 0, 0, 0, NULL, (void*) &egtPath, "", NULL, PathName, N_("EGTB Path:") },
+{ 0, 0, 0, NULL, (void*) &egtPath, NULL, NULL, PathName, N_("EGTB Path:") },
{ 0, 0, 1000, NULL, (void*) &appData.defaultCacheSizeEGTB, "", NULL, Spin, N_("EGTB Cache Size (MB):") },
{ 0, 0, 0, NULL, (void*) &appData.usePolyglotBook, "", NULL, CheckBox, N_("Use GUI Book") },
{ 0, 0, 0, NULL, (void*) &appData.polyglotBook, ".bin", NULL, FileName, N_("Opening-Book Filename:") },
Test (int n)
{
GenericReadout(soundOptions, 1);
+ mute <<= 1; // temporarily enable
if(soundFiles[values[2]]) PlaySoundFile(soundFiles[values[2]]);
+ mute >>= 1;
}
void
{ 0, 0, 200, NULL, (void*) &appData.logoSize, "", NULL, Spin, N_("Logo Size (0=off, requires restart):") },
{ 0,-1, 5, NULL, (void*) &appData.overrideLineGap, "", NULL, Spin, N_("Line Gap (-1 = default for board size):") },
{ 0, 0, 0, NULL, (void*) &appData.useBitmaps, "", NULL, CheckBox, N_("Use Board Textures") },
-{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".png", NULL, FileName, N_("Light-Squares Texture File:") },
-{ 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, ".png", NULL, FileName, N_("Dark-Squares Texture File:") },
+{ 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, ".png", (char**)(intptr_t) 1, FileName, N_("Dark-Squares Texture File:") },
+{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".png", (char**)(intptr_t) 2, FileName, N_("Light-Squares Texture File:") },
{ 0, 0, 0, NULL, (void*) &appData.trueColors, "", NULL, CheckBox, N_("Use external piece bitmaps with their own colors") },
-{ 0, 0, 0, NULL, (void*) &appData.pieceDirectory, "", NULL, PathName, N_("Directory with Pieces Images:") },
+{ 0, 0, 0, NULL, (void*) &appData.pieceDirectory, "", (char**)(intptr_t) 3, PathName, N_("Directory with Pieces Images:") },
{ 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" }
};
SendString (char *p)
{
char buf[MSG_SIZ], buf2[MSG_SIZ], *q;
+
if(q = strstr(p, "$name")) { // in Xaw this is already intercepted
if(!shellUp[TextMenuDlg] || !clickedWord[0]) return;
strncpy(buf2, p, MSG_SIZ);
NewTagsCallback (int n)
{
if(bookUp) SaveToBook(tagsText), DisplayBook(currentMove); else
- if(resPtr) { ASSIGN(*resPtr, tagsText); } else
+ if(resPtr) { ASSIGN(*resPtr, tagsText); if(resPtr == &firstChessProgramNames) SaveEngineList(); } else
ReplaceTags(tagsText, &gameInfo);
return 1;
}
addToBookFlag = !addToBookFlag;
}
-static Option tagsOptions[] = {
+Option tagsOptions[] = {
{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, NULL },
-{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 200, NULL, (void*) &tagsText, NULL, (char **) &TagsClick, TextBox, "", &appData.tagsFont },
+{ 200, T_VSCRL | T_FILL | T_TOP, 200, NULL, (void*) &tagsText, NULL, (char **) &TagsClick, TextBox, "", &appData.tagsFont },
{ 0, 0, 100, NULL, (void*) &NewMove, NULL, NULL, Button, N_("add next move") },
{ 0,SAME_ROW,100,NULL, (void*) &changeTags, NULL, NULL, Button, N_("commit changes") },
{ 0,SAME_ROW, 0, NULL, (void*) &NewTagsCallback, "", NULL, EndMark , "" }
}
void
-EditEnginePopUp (char *tags, char **dest)
+EditAnyPopUp (char *tags, char **dest, char *title)
{ // wrapper to preserve old name used in back-end
TagsPopDown();
resPtr = dest;
- NewTagsPopup(tags, NULL, _("Registered Engines"));
+ NewTagsPopup(tags, NULL, title);
}
void
//----------------------------------------------- Load Engine --------------------------------------
-char *engineDir, *engineLine, *nickName, *params;
+char *engineDir, *engineLine, *nickName, *params, *protocolChoice;
Boolean isUCI, isUSI, hasBook, storeVariant, v1, addToList, useNick, secondEng;
static void EngSel P((int n, int sel));
static int InstallOK P((int n));
+static char *protocols[] = { "autodetect", "WB", "UCI", "USI/UCCI", "WB v1", NULL };
+
static Option installOptions[] = {
{ 0,LR|T2T, 0, NULL, NULL, NULL, NULL, Label, N_("Select engine from list:") },
{ 300,LR|TB,200, NULL, (void*) engineMnemonic, (char*) &EngSel, NULL, ListBox, "" },
{ 0,SAME_ROW, 0, NULL, NULL, NULL, NULL, Break, NULL },
{ 0, LR, 0, NULL, NULL, NULL, NULL, Label, N_("or specify one below:") },
+{ 0, 0, 0, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine Command:") },
+{ 0, LR, 0, NULL, NULL, NULL, NULL, Label, N_("------------- User preferences (optional) ---------------") },
{ 0, 0, 0, NULL, (void*) &nickName, NULL, NULL, TextBox, N_("Nickname (optional):") },
{ 0, 0, 0, NULL, (void*) &useNick, NULL, NULL, CheckBox, N_("Use nickname in PGN player tags of engine-engine games") },
-{ 0, 0, 0, NULL, (void*) &engineDir, NULL, NULL, PathName, N_("Engine Directory:") },
-{ 0, 0, 0, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine Command:") },
-{ 0, LR, 0, NULL, NULL, NULL, NULL, Label, N_("(Directory will be derived from engine path when empty)") },
-{ 0, 0, 0, NULL, (void*) &isUCI, NULL, NULL, CheckBox, N_("UCI") },
-{ 0, 0, 0, NULL, (void*) &isUSI, NULL, NULL, CheckBox, N_("USI/UCCI (uses specified -uxiAdapter)") },
-{ 0, 0, 0, NULL, (void*) &v1, NULL, NULL, CheckBox, N_("WB protocol v1 (do not wait for engine features)") },
+{ 0, 0, 0, NULL, (void*) &storeVariant, NULL, NULL, CheckBox, N_("Force current variant with this engine") },
{ 0, 0, 0, NULL, (void*) &hasBook, NULL, NULL, CheckBox, N_("Must not use GUI book") },
{ 0, 0, 0, NULL, (void*) &addToList, NULL, NULL, CheckBox, N_("Add this engine to the list") },
-{ 0, 0, 0, NULL, (void*) &storeVariant, NULL, NULL, CheckBox, N_("Force current variant with this engine") },
+{ 0, LR, 0, NULL, NULL, NULL, NULL, Label, N_("--------- Advanced (only change in exceptional cases) ----------") },
+{ 0, 0, 5, NULL, (void*) &protocolChoice, (char*) protocols, protocols, ComboBox, N_("Engine Protocol:") },
+{ 0, 0, 0, NULL, (void*) &engineDir, NULL, NULL, PathName, N_("Engine Directory:") },
+{ 0, LR, 0, NULL, NULL, NULL, NULL, Label, N_("(Directory will be derived from engine path when empty)") },
+//{ 0, 0, 0, NULL, (void*) &isUCI, NULL, NULL, CheckBox, N_("UCI") },
+//{ 0, 0, 0, NULL, (void*) &isUSI, NULL, NULL, CheckBox, N_("USI/UCCI (uses specified -uxiAdapter)") },
+//{ 0, 0, 0, NULL, (void*) &v1, NULL, NULL, CheckBox, N_("WB protocol v1 (do not wait for engine features)") },
{ 0, 0, 0, NULL, (void*) &InstallOK, "", NULL, EndMark , "" }
};
{
if(n && (n = SelectedListBoxItem(&installOptions[1])) > 0) { // called by pressing OK, and engine selected
ASSIGN(engineLine, engineList[n]);
+ } else switch(values[12]) {
+ case 0: isUCI = 3; break;
+ case 2: isUCI = 1; break;
+ case 3: isUSI = 1; break;
+ case 4: v1 = 1;
+ case 1: break;
}
PopDown(TransientDlg); // early popdown, to allow FreezeUI to instate grab
if(isUSI) {
static void
LoadEngineProc (int engineNr, char *title)
{
+ int p = appData.defProtocol;
+ if(*engineListFile) ParseSettingsFile(engineListFile, &engineListFile); // contains engine list
+ if(p >= 0 && p < 5) protocolChoice = protocols[p];
isUCI = isUSI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults
secondEng = engineNr;
if(engineLine) free(engineLine); engineLine = strdup("");
- if(engineDir) free(engineDir); engineDir = strdup(".");
+ if(engineDir) free(engineDir); engineDir = strdup(appData.defEngDir);
if(nickName) free(nickName); nickName = strdup("");
if(params) free(params); params = strdup("");
ASSIGN(engineMnemonic[0], "");
static int
FontsOK (int n)
{
- extern Option historyOptions[], engoutOptions[], gamesOptions[], chatOptions[];
int i;
PopDown(TransientDlg); // Early popdown to prevent expose events frommasking each other
LockBoardSize(0);
void
DisplayFatalError (String message, int error, int status)
{
- char buf[MSG_SIZ];
+ char buf[MSG_SIZ], logout = appData.icsActive;
if(status == 666) { // ignore this error when ICS Console window is up
if(shellUp[ChatDlg]) return;
status = 0;
- }
+ } else if(status == 6666) status = logout = 0; // 6666 = kludge that indicates ICS connection already closed
errorExitStatus = status;
if (error == 0) {
}
if(mainOptions[W_BOARD].handle) {
if (appData.popupExitMessage) {
- if(appData.icsActive) SendToICS("logout\n"); // [HGM] make sure no new games will be started
+ if(logout) SendToICS("logout\n"); // [HGM] make sure no new games will be started
ErrorPopUp(status ? _("Fatal Error") : _("Exiting"), message, TRUE);
} else {
ExitEvent(status);
FREE(manText[1]); manText[1] = NULL; // so any currently held text is worthless
safeStrCpy(tidy, buf, MSG_SIZ); // remember current engine
eng = BufferCommandOutput(tidy, MSG_SIZ); // obtain path to its man file
+ if(*eng)
safeStrCpy(engMan, eng, strlen(eng)); // and remember that too
+ else *engMan = NULLCHAR;
FREE(eng);
}
safeStrCpy(buf, engMan, MSG_SIZ); n = 1; // use engine man
void
StartDir (char *filter, char *newName)
{
- static char *gamesDir, *trnDir, *imgDir, *bookDir;
+ static char *gamesDir, *trnDir, *imgDir, *bookDir, *dirDir;
static char curDir[MSG_SIZ];
char **res = NULL;
if(!filter || !*filter) return;
+ if(strstr(filter, "dir")) {
+ res = &dirDir;
+ if(!dirDir) dirDir= strdup(dataDir);
+ } else
if(strstr(filter, "pgn")) res = &gamesDir; else
if(strstr(filter, "bin")) res = &bookDir; else
if(strstr(filter, "png")) res = &imgDir; else
ASSIGN(*res, newName);
for(p=*res; q=strchr(p, '/');) p = q + 1; *p = NULLCHAR;
}
- if(*curDir) chdir(curDir);
+ }
+ if(*curDir) {
+ chdir(curDir);
*curDir = NULLCHAR;
} else {
getcwd(curDir, MSG_SIZ);
DrawPosition(True, NULL);
}
+char *
+Shorten (char *s)
+{
+ static char buf[MSG_SIZ];
+ if(strstr(s, dataDir) != s) return s;
+ snprintf(buf, MSG_SIZ, "~~%s", s + strlen(dataDir));
+ return buf;
+}
projects / xboard.git / blobdiff