{
Arg args[2];
char *s;
+ int j;
if(previous) {
XtSetArg(args[0], XtNdisplayCaret, False);
}
XtSetArg(args[0], XtNstring, &s);
XtGetValues(w, args, 1);
+ j = 1;
XtSetArg(args[0], XtNdisplayCaret, True);
- XtSetArg(args[1], XtNinsertPosition, strlen(s));
- XtSetValues(w, args, 2);
+ if(!strchr(s, '\n')) XtSetArg(args[1], XtNinsertPosition, strlen(s)), j++;
+ XtSetValues(w, args, j);
XtSetKeyboardFocus((Widget) data, w);
previous = w;
}
XtSetArg(args[j], XtNlabel, _("sec/move (max)")); j++;
XtSetValues(tcMess1, args, j);
j=0;
- XtSetArg(args[j], XtNlabel, _("")); j++;
+ XtSetArg(args[j], XtNlabel, ""); j++;
XtSetValues(tcMess2, args, j);
j=0;
XtSetArg(args[j], XtNstring, ""); j++;
//--------------------------- Engine-specific options menu ----------------------------------
typedef void ButtonCallback(int n);
+typedef int OKCallback(int n);
int values[MAX_OPTIONS];
ChessProgramState *currentCps;
XtSetArg(args[0], XtNstring, &q);
XtGetValues(currentOption[data].handle, args, 1);
for(r = ""; *q; q++) if(*q == '.') r = q; else if(*q == '/') r = ""; // last dot after last slash
+ if(!strcmp(r, "") && !currentCps && currentOption[data].type == FileName && currentOption[data].textValue)
+ r = currentOption[data].textValue;
browserUp = True;
if(XsraSelFile(shells[0], currentOption[data].name, NULL, NULL, "", "", r,
currentOption[data].type == PathName ? "p" : "f", NULL, &p)) {
parent, NULL, 0);
j = 0;
XtSetArg(args[j], XtNwidth, 100); j++;
- XtSetArg(args[j], XtNlabel, _(mb[i])); j++;
// XtSetArg(args[j], XtNright, XtChainRight); j++;
while (mb[i] != NULL) {
+ XtSetArg(args[j], XtNlabel, _(mb[i]));
entry = XtCreateManagedWidget(mb[i], smeBSBObjectClass,
- menu, args, j);
+ menu, args, j+1);
XtAddCallback(entry, XtNcallback,
(XtCallbackProc) ComboSelect,
(caddr_t)(intptr_t) (256*n+i));
int MakeColors P((void));
void CreateGCs P((int redo));
void CreateAnyPieces P((void));
-void GenericReadout P((int selected));
+int GenericReadout P((int selected));
Widget shells[10];
Widget marked[10];
Boolean shellUp[10];
PopDown(prms[0][0] - '0');
}
-char *engineName, *engineDir, *engineChoice, *engineLine, *nickName, *params;
-Boolean isUCI, hasBook, storeVariant, v1, addToList;
+char *engineName, *engineDir, *engineChoice, *engineLine, *nickName, *params, *tfName;
+Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick;
extern Option installOptions[], matchOptions[];
char *engineNr[] = { N_("First Engine"), N_("Second Engine"), NULL };
char *engineList[100] = {" "}, *engineMnemonic[100] = {""};
XawTextReplace(matchOptions[3].handle, 9999, 9999, &t);
}
-void MatchOK(int n)
+int MatchOK(int n)
{
if(appData.participants && appData.participants[0]) free(appData.participants);
appData.participants = strdup(engineName);
+ if(!CreateTourney(tfName)) return !appData.participants[0];
PopDown(0); // early popdown to prevent FreezeUI called through MatchEvent from causing XtGrab warning
- if(CreateTourney(appData.tourneyFile)) MatchEvent(2); // start tourney
+ MatchEvent(2); // start tourney
+ return 1;
}
Option matchOptions[] = {
-{ 0, 0, 0, NULL, (void*) &appData.tourneyFile, "", NULL, FileName, N_("Tournament file:") },
+{ 0, 0, 0, NULL, (void*) &tfName, ".trn", NULL, FileName, N_("Tournament file:") },
{ 0, 0, 0, NULL, (void*) &appData.roundSync, "", NULL, CheckBox, N_("Sync after round (for concurrent playing of a single") },
{ 0, 0, 0, NULL, (void*) &appData.cycleSync, "", NULL, CheckBox, N_("Sync after cycle tourney with multiple XBoards)") },
{ 0xD, 150, 0, NULL, (void*) &engineName, "", NULL, TextBox, "Tourney participants:" },
{ 0, 1, 0, NULL, (void*) &engineChoice, (char*) (engineMnemonic+1), (engineMnemonic+1), ComboBox, N_("Select Engine:") },
{ 0, 0, 10, NULL, (void*) &appData.tourneyType, "", NULL, Spin, N_("Tourney type (0 = round-robin, 1 = gauntlet):") },
-{ 0, 1, 1000000000, NULL, (void*) &appData.tourneyCycles, "", NULL, Spin, N_("Number of tourney cycles:") },
+{ 0, 1, 1000000000, NULL, (void*) &appData.tourneyCycles, "", NULL, Spin, N_("Number of tourney cycles (or Swiss rounds):") },
{ 0, 1, 1000000000, NULL, (void*) &appData.defaultMatchGames, "", NULL, Spin, N_("Default Number of Games in Match (or Pairing):") },
{ 0, 0, 1000000000, NULL, (void*) &appData.matchPause, "", NULL, Spin, N_("Pause between Match Games (msec):") },
-{ 0, 0, 0, NULL, (void*) &appData.loadGameFile, "", NULL, FileName, N_("Game File with Opening Lines:") },
+{ 0, 0, 0, NULL, (void*) &appData.saveGameFile, ".pgn", NULL, FileName, N_("Save Tourney Games on:") },
+{ 0, 0, 0, NULL, (void*) &appData.loadGameFile, ".pgn", NULL, FileName, N_("Game File with Opening Lines:") },
{ 0, -2, 1000000000, NULL, (void*) &appData.loadGameIndex, "", NULL, Spin, N_("Game Number (-1 or -2 = Auto-Increment):") },
-{ 0, 0, 0, NULL, (void*) &appData.loadPositionFile, "", NULL, FileName, N_("File with Start Positions:") },
+{ 0, 0, 0, NULL, (void*) &appData.loadPositionFile, ".fen", NULL, FileName, N_("File with Start Positions:") },
{ 0, -2, 1000000000, NULL, (void*) &appData.loadPositionIndex, "", NULL, Spin, N_("Position Number (-1 or -2 = Auto-Increment):") },
{ 0, 0, 1000000000, NULL, (void*) &appData.rewindIndex, "", NULL, Spin, N_("Rewind Index after this many Games (0 = never):") },
{ 0, 0, 0, NULL, (void*) &MatchOK, "", NULL, EndMark , "" }
};
-void GeneralOptionsOK(int n)
+int GeneralOptionsOK(int n)
{
int newPonder = appData.ponderNextMove;
appData.ponderNextMove = oldPonder;
PonderNextMoveEvent(newPonder);
+ return 1;
}
Option generalOptions[] = {
{ 0, 0, 0, NULL, (void*) &appData.autoFlipView, "", NULL, CheckBox, N_("Auto Flip View") },
{ 0, 0, 0, NULL, (void*) &appData.blindfold, "", NULL, CheckBox, N_("Blindfold") },
{ 0, 0, 0, NULL, (void*) &appData.dropMenu, "", NULL, CheckBox, N_("Drop Menu") },
+{ 0, 0, 0, NULL, (void*) &appData.hideThinkingFromHuman, "", NULL, CheckBox, N_("Hide Thinking from Human") },
{ 0, 0, 0, NULL, (void*) &appData.highlightDragging, "", NULL, CheckBox, N_("Highlight Dragging (Show Move Targets)") },
{ 0, 0, 0, NULL, (void*) &appData.highlightLastMove, "", NULL, CheckBox, N_("Highlight Last Move") },
{ 0, 0, 0, NULL, (void*) &appData.highlightMoveWithArrow, "", NULL, CheckBox, N_("Highlight with Arrow") },
{ 0, 0, 0, NULL, (void*) &appData.popupMoveErrors, "", NULL, CheckBox, N_("Popup Move Errors") },
{ 0, 0, 0, NULL, (void*) &appData.showCoords, "", NULL, CheckBox, N_("Show Coordinates") },
{ 0, 0, 0, NULL, (void*) &appData.markers, "", NULL, CheckBox, N_("Show Target Squares") },
-{ 0, 0, 0, NULL, (void*) &appData.hideThinkingFromHuman, "", NULL, CheckBox, N_("Hide Thinking from Human") },
{ 0, 0, 0, NULL, (void*) &appData.testLegality, "", NULL, CheckBox, N_("Test Legality") },
{ 0, 0, 10, NULL, (void*) &appData.flashCount, "", NULL, Spin, N_("Flash Moves (0 = no flashing):") },
{ 0, 1, 10, NULL, (void*) &appData.flashRate, "", NULL, Spin, N_("Flash Rate (high = fast):") },
{ 0, 2, 0, NULL, NULL, "", NULL, EndMark , "" }
};
-void CommonOptionsOK(int n)
+int CommonOptionsOK(int n)
{
int newPonder = appData.ponderNextMove;
// make sure changes are sent to first engine by re-initializing it
appData.ponderNextMove = oldPonder;
PonderNextMoveEvent(newPonder);
}
+ return 1;
}
Option commonEngineOptions[] = {
{ 0, 0, 0, NULL, (void*) &appData.defaultPathEGTB, "", NULL, PathName, N_("Nalimov 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, "", NULL, FileName, N_("Opening-Book Filename:") },
+{ 0, 0, 0, NULL, (void*) &appData.polyglotBook, ".bin", NULL, FileName, N_("Opening-Book Filename:") },
{ 0, 0, 100, NULL, (void*) &appData.bookDepth, "", NULL, Spin, N_("Book Depth (moves):") },
{ 0, 0, 100, NULL, (void*) &appData.bookStrength, "", NULL, Spin, N_("Book Variety (0) vs. Strength (100):") },
{ 0, 0, 0, NULL, (void*) &appData.firstHasOwnBookUCI, "", NULL, CheckBox, N_("Engine #1 Has Own Book") },
{ 0, 1, 0, NULL, NULL, "", NULL, EndMark , "" }
};
-void IcsOptionsOK(int n)
+int IcsOptionsOK(int n)
{
ParseIcsTextColors();
+ return 1;
}
Option icsOptions[] = {
Option saveOptions[] = {
{ 0, 0, 0, NULL, (void*) &appData.autoSaveGames, "", NULL, CheckBox, N_("Auto-Save Games") },
-{ 0, 0, 0, NULL, (void*) &appData.saveGameFile, "", NULL, FileName, N_("Save Games on File:") },
-{ 0, 0, 0, NULL, (void*) &appData.savePositionFile, "", NULL, FileName, N_("Save Final Positions on File:") },
+{ 0, 0, 0, NULL, (void*) &appData.saveGameFile, ".pgn", NULL, FileName, N_("Save Games on File:") },
+{ 0, 0, 0, NULL, (void*) &appData.savePositionFile, ".fen", NULL, FileName, N_("Save Final Positions on File:") },
{ 0, 0, 0, NULL, (void*) &appData.pgnEventHeader, "", NULL, TextBox, N_("PGN Event Header:") },
{ 0, 0, 0, NULL, (void*) &appData.oldSaveStyle, "", NULL, CheckBox, N_("Old Save Style (as opposed to PGN)") },
{ 0, 0, 0, NULL, (void*) &appData.saveExtendedInfoInPGN, "", NULL, CheckBox, N_("Save Score/Depth Info in PGN") },
Option soundOptions[] = {
{ 0, 0, 0, NULL, (void*) &appData.soundProgram, "", NULL, TextBox, N_("Sound Program:") },
{ 0, 0, 0, NULL, (void*) &appData.soundDirectory, "", NULL, PathName, N_("Sounds Directory:") },
-{ 0, 0, 0, NULL, (void*) (soundFiles+2) /* kludge! */, "", NULL, FileName, N_("User WAV File:") },
+{ 0, 0, 0, NULL, (void*) (soundFiles+2) /* kludge! */, ".wav", NULL, FileName, N_("User WAV File:") },
{ 0, 0, 0, NULL, (void*) &trialSound, (char*) soundNames, soundFiles, ComboBox, N_("Try-Out Sound:") },
{ 0, 1, 0, NULL, (void*) &Test, NULL, NULL, Button, N_("Play") },
{ 0, 0, 0, NULL, (void*) &appData.soundMove, (char*) soundNames, soundFiles, ComboBox, N_("Move:") },
RefreshColor(i-n-1, n);
}
-void BoardOptionsOK(int n)
+int BoardOptionsOK(int n)
{
if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap;
useImages = useImageSqs = 0;
CreateAnyPieces();
InitDrawingSizes(-1, 0);
DrawPosition(True, NULL);
+ return 1;
}
Option boardOptions[] = {
//{ 0, 0, 0, NULL, (void*) &appData.allWhite, "", NULL, CheckBox, N_("Use Outline Pieces for Black") },
{ 0, 0, 0, NULL, (void*) &appData.monoMode, "", NULL, CheckBox, N_("Mono Mode") },
{ 0,-1, 5, NULL, (void*) &appData.overrideLineGap, "", NULL, Spin, N_("Line Gap ( -1 = default for board size):") },
-{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, "", NULL, FileName, N_("Light-Squares Texture File:") },
-{ 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, "", NULL, FileName, N_("Dark-Squares Texture File:") },
+{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".xpm", NULL, FileName, N_("Light-Squares Texture File:") },
+{ 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, ".xpm", NULL, FileName, N_("Dark-Squares Texture File:") },
{ 0, 0, 0, NULL, (void*) &appData.bitmapDirectory, "", NULL, PathName, N_("Directory with Bitmap Pieces:") },
{ 0, 0, 0, NULL, (void*) &appData.pixmapDirectory, "", NULL, PathName, N_("Directory with Pixmap Pieces:") },
{ 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" }
};
-void GenericReadout(int selected)
+int GenericReadout(int selected)
{
- int i, j;
+ int i, j, res=1;
String val;
Arg args[16];
char buf[MSG_SIZ], **dest;
break;
case EndMark:
if(currentOption[i].target) // callback for implementing necessary actions on OK (like redraw)
- ((ButtonCallback*) currentOption[i].target)(i);
+ res = ((OKCallback*) currentOption[i].target)(i);
break;
default:
printf("GenericReadout: unexpected case in switch.\n");
}
if(currentOption[i].type == EndMark) break;
}
+ return res;
}
void GenericCallback(w, client_data, call_data)
return;
}
if (strcmp(name, _("OK")) == 0) { // save buttons imply OK
- GenericReadout(-1);
- PopDown(data);
+ if(GenericReadout(-1)) PopDown(data);
return;
}
if(currentCps) {
XtSetArg(args[j], XtNlabel, _(option[i].name)); j++;
if(option[i].min & 1) { XtSetArg(args[j], XtNfromHoriz, last); j++; }
else { XtSetArg(args[j], XtNfromHoriz, NULL); j++; lastrow = forelast; }
- if(option[i].max) XtSetArg(args[j], XtNwidth, option[i].max); j++;
+ if(option[i].max) { XtSetArg(args[j], XtNwidth, option[i].max); j++; }
if(option[i].textValue) { // special for buttons of New Variant dialog
XtSetArg(args[j], XtNsensitive, appData.noChessProgram || option[i].value < 0
|| strstr(first.variants, VariantName(option[i].value))); j++;
{
NamesToList(firstChessProgramNames, engineList, engineMnemonic);
comboCallback = &AddToTourney;
+ matchOptions[5].min = -(appData.pairingEngine[0] != NULLCHAR); // with pairing engine, allow Swiss
+ ASSIGN(tfName, appData.tourneyFile[0] ? appData.tourneyFile : MakeName(appData.defName));
GenericPopUp(matchOptions, _("Match Options"), 0);
}
void ClearComment P((int n));
extern char commentTranslations[];
-void NewComCallback(int n)
+int NewComCallback(int n)
{
ReplaceComment(commentIndex, commentText);
+ return 1;
}
void SaveChanges(int n)
}
Option commentOptions[] = {
-{ 0xD, 200, 300, NULL, (void*) &commentText, "", NULL, TextBox, "" },
-{ 0, 0, 0, NULL, (void*) &ClearComment, NULL, NULL, Button, "clear" },
-{ 0, 1, 0, NULL, (void*) &SaveChanges, NULL, NULL, Button, "save changes" },
+{ 0xD, 200, 250, NULL, (void*) &commentText, "", NULL, TextBox, "" },
+{ 0, 0, 50, NULL, (void*) &ClearComment, NULL, NULL, Button, "clear" },
+{ 0, 1, 100, NULL, (void*) &SaveChanges, NULL, NULL, Button, "save changes" },
{ 0, 1, 0, NULL, (void*) &NewComCallback, "", NULL, EndMark , "" }
};
static char *tagsText, *msgText;
-void NewTagsCallback(int n)
+int NewTagsCallback(int n)
{
ReplaceTags(tagsText, &gameInfo);
+ return 1;
}
void changeTags(int n)
Arg args[16];
XtSetArg(args[0], XtNstring, &tagsText);
XtGetValues(currentOption[1].handle, args, 1);
+ if(bookUp) SaveToBook(tagsText); else\r
ReplaceTags(tagsText, &gameInfo);
}
Option tagsOptions[] = {
{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, "" },
-{ 0xD, 200, 250, NULL, (void*) &tagsText, "", NULL, TextBox, "" },
-{ 0, 0, 0, NULL, (void*) &changeTags, NULL, NULL, Button, "save changes" },
+{ 0xD, 200, 200, NULL, (void*) &tagsText, "", NULL, TextBox, "" },
+{ 0, 0, 100, NULL, (void*) &changeTags, NULL, NULL, Button, "save changes" },
{ 0, 1, 0, NULL, (void*) &NewTagsCallback, "", NULL, EndMark , "" }
};
{
Widget edit;
Arg args[16];
+ char *title = bookUp ? _("Edit book") : _("Tags");
if(shells[2]) { // if already exists, alter title and content
XtSetArg(args[0], XtNstring, text);
XtSetValues(tagsOptions[1].handle, args, 1);
+ XtSetArg(args[0], XtNtitle, title);
+ XtSetValues(shells[2], args, 1);
}
if(tagsText) free(tagsText); tagsText = strdup(text);
tagsOptions[0].textValue = msg;
MarkMenu("menuView.Show Tags", 2);
- GenericPopUp(tagsOptions, _("Tags"), 2);
+ GenericPopUp(tagsOptions, title, 2);
}
char *icsText;
SettingsPopUp(&second);
}
-void InstallOK(int n)
+int InstallOK(int n)
{
PopDown(0); // early popdown, to allow FreezeUI to instate grab
if(engineChoice[0] == engineNr[0][0]) Load(&first, 0); else Load(&second, 1);
+ return 1;
}
Option installOptions[] = {
{ 0, 0, 0, NULL, (void*) &engineLine, (char*) engineMnemonic, engineList, ComboBox, N_("Select engine from list:") },
{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("or specify one below:") },
{ 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, 0, 0, NULL, NULL, NULL, NULL, Label, N_("(Directory will be derived from engine path when empty)") },
String *prms;
Cardinal *nprms;
{
- isUCI = addToList = storeVariant = v1 = False; hasBook = True; // defaults
+ isUCI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults
if(engineChoice) free(engineChoice); engineChoice = strdup(engineNr[0]);
if(engineLine) free(engineLine); engineLine = strdup("");
if(engineDir) free(engineDir); engineDir = strdup("");
GenericPopUp(installOptions, _("Load engine"), 0);
}
+void EditBookProc(w, event, prms, nprms)
+ Widget w;
+ XEvent *event;
+ String *prms;
+ Cardinal *nprms;
+{
+ EditBookEvent();
+}
+
//---------------------------- Chat Windows ----------------------------------------------
void OutputChatMessage(int partner, char *mess)
projects / xboard.git / blobdiff