String name, val;
Arg args[16];
char buf[MSG_SIZ], *p;
- int j;
+ int j = 0; // Initialiasation is necessary because the text value may be non-numeric causing the scanf conversion to fail
int data = (intptr_t) client_data;
XtSetArg(args[0], XtNlabel, &name);
GetWidgetText(¤tOption[data], &val);
sscanf(val, "%d", &j);
- if (strcmp(name, "browse") == 0) {
+ if (strcmp(name, _("browse")) == 0) {
char *q=val, *r;
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)
int j = 255 & (intptr_t) addr;
values[i] = j; // store in temporary, for transfer at OK
- XtSetArg(args[0], XtNlabel, _(((char**)currentOption[i].textValue)[j]));
+
+ if(currentOption[i].min & NO_GETTEXT)
+ XtSetArg(args[0], XtNlabel, ((char**)currentOption[i].textValue)[j]);
+ else
+ XtSetArg(args[0], XtNlabel, _(((char**)currentOption[i].textValue)[j]));
+
XtSetValues(currentOption[i].handle, args, 1);
- if(currentOption[i].min & 1 && !currentCps && comboCallback) (comboCallback)(i);
+ if(currentOption[i].min & COMBO_CALLBACK && !currentCps && comboCallback) (comboCallback)(i);
}
-void CreateComboPopup(parent, name, n, mb)
+void CreateComboPopup(parent, option, n)
Widget parent;
- String name;
+ Option *option;
int n;
- char *mb[];
{
int i=0, j;
Widget menu, entry;
Arg args[16];
- menu = XtCreatePopupShell(name, simpleMenuWidgetClass,
+ menu = XtCreatePopupShell(option->name, simpleMenuWidgetClass,
parent, NULL, 0);
j = 0;
XtSetArg(args[j], XtNwidth, 100); 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+1);
- XtAddCallback(entry, XtNcallback,
- (XtCallbackProc) ComboSelect,
- (caddr_t)(intptr_t) (256*n+i));
+ char **mb = (char **) option->textValue;
+ while (mb[i] != NULL)
+ {
+ if (option->min & NO_GETTEXT)
+ XtSetArg(args[j], XtNlabel, mb[i]);
+ else
+ XtSetArg(args[j], XtNlabel, _(mb[i]));
+ entry = XtCreateManagedWidget((String) mb[i], smeBSBObjectClass,
+ menu, args, j+1);
+ XtAddCallback(entry, XtNcallback,
+ (XtCallbackProc) ComboSelect,
+ (caddr_t)(intptr_t) (256*n+i));
i++;
- }
+ }
}
int MatchOK(int n)
{
- if(appData.participants && appData.participants[0]) free(appData.participants);
- appData.participants = strdup(engineName);
- if(!CreateTourney(tfName)) return !appData.participants[0];
+ ASSIGN(appData.participants, engineName);
+ if(!CreateTourney(tfName) || matchMode) return matchMode || !appData.participants[0];
PopDown(0); // early popdown to prevent FreezeUI called through MatchEvent from causing XtGrab warning
MatchEvent(2); // start tourney
return 1;
}
+void ReplaceParticipant()
+{
+ GenericReadout(3);
+ Substitute(strdup(engineName), True);
+}
+
+void UpgradeParticipant()
+{
+ GenericReadout(3);
+ Substitute(strdup(engineName), False);
+}
+
Option matchOptions[] = {
{ 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:") },
+{ 0xD, 150, 0, NULL, (void*) &engineName, "", NULL, TextBox, N_("Tourney participants:") },
+{ 0, COMBO_CALLBACK | NO_GETTEXT,
+ 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 (or Swiss rounds):") },
{ 0, 1, 1000000000, NULL, (void*) &appData.defaultMatchGames, "", NULL, Spin, N_("Default Number of Games in Match (or Pairing):") },
{ 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 , "" }
+{ 0, 0, 0, NULL, (void*) &appData.defNoBook, "", NULL, CheckBox, N_("Disable own engine books by default") },
+{ 0, 0, 0, NULL, (void*) &ReplaceParticipant, NULL, NULL, Button, N_("Replace Engine") },
+{ 0, 1, 0, NULL, (void*) &UpgradeParticipant, NULL, NULL, Button, N_("Upgrade Engine") },
+{ 0, 1, 0, NULL, (void*) &MatchOK, "", NULL, EndMark , "" }
};
int GeneralOptionsOK(int n)
{ VariantMakruk, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Button, N_("makruk")},
{ VariantGreat, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("Great Shatranj (10x8)")},
{ VariantAtomic, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Button, N_("atomic")},
-{ VariantCapablanca, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("Capablanca (10x8)")},
+{ VariantFalcon, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("falcon (10x8)")},
{ VariantTwoKings, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Button, N_("two kings")},
-{ VariantGothic, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("Gothic (10x8)")},
+{ VariantCapablanca, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("Capablanca (10x8)")},
{ Variant3Check, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Button, N_("3-checks")},
-{ VariantJanus, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("janus (10x8)")},
+{ VariantGothic, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("Gothic (10x8)")},
{ VariantSuicide, 0, 135, NULL, (void*) &Pick, "#FFFFBF", NULL, Button, N_("suicide")},
-{ VariantCapaRandom, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("CRC (10x8)")},
+{ VariantJanus, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("janus (10x8)")},
{ VariantGiveaway, 0, 135, NULL, (void*) &Pick, "#FFFFBF", NULL, Button, N_("give-away")},
-{ VariantGrand, 1, 135, NULL, (void*) &Pick, "#5070FF", NULL, Button, N_("grand (10x10)")},
+{ VariantCapaRandom, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("CRC (10x8)")},
{ VariantLosers, 0, 135, NULL, (void*) &Pick, "#FFFFBF", NULL, Button, N_("losers")},
-{ VariantSpartan, 1, 135, NULL, (void*) &Pick, "#FF0000", NULL, Button, N_("Spartan")},
+{ VariantGrand, 1, 135, NULL, (void*) &Pick, "#5070FF", NULL, Button, N_("grand (10x10)")},
+{ VariantSpartan, 0, 135, NULL, (void*) &Pick, "#FF0000", NULL, Button, N_("Spartan")},
{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("Board size ( -1 = default for selected variant):")},
{ 0, -1, BOARD_RANKS-1, NULL, (void*) &appData.NrRanks, "", NULL, Spin, N_("Number of Board Ranks:") },
{ 0, -1, BOARD_FILES, NULL, (void*) &appData.NrFiles, "", NULL, Spin, N_("Number of Board Files:") },
{ 0, 0, 0, NULL, (void*) &IcsOptionsOK, "", NULL, EndMark , "" }
};
+char *modeNames[] = { N_("Exact position match"), N_("Shown position is subset"), N_("Same material with exactly same Pawn chain"),
+ N_("Same material"), N_("Material range (top board half optional)"), N_("Material difference (optional stuff balanced)"), NULL };
+char *modeValues[] = { "1", "2", "3", "4", "5", "6" };
+char *searchMode;
+
+int LoadOptionsOK()
+{
+ appData.searchMode = atoi(searchMode);
+ return 1;
+}
+
Option loadOptions[] = {
{ 0, 0, 0, NULL, (void*) &appData.autoDisplayTags, "", NULL, CheckBox, N_("Auto-Display Tags") },
{ 0, 0, 0, NULL, (void*) &appData.autoDisplayComment, "", NULL, CheckBox, N_("Auto-Display Comment") },
{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("Auto-Play speed of loaded games\n(0 = instant, -1 = off):") },
{ 0, -1, 10000000, NULL, (void*) &appData.timeDelay, "", NULL, Fractional, N_("Seconds per Move:") },
-{ 0, 0, 0, NULL, NULL, "", NULL, EndMark , "" }
+{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("\noptions to use in game-viewer mode:") },
+{ 0, 0, 300, NULL, (void*) &appData.viewerOptions, "", NULL, TextBox, "" },
+{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("\nThresholds for position filtering in game list:") },
+{ 0, 0, 5000, NULL, (void*) &appData.eloThreshold1, "", NULL, Spin, N_("Elo of strongest player at least:") },
+{ 0, 0, 5000, NULL, (void*) &appData.eloThreshold2, "", NULL, Spin, N_("Elo of weakest player at least:") },
+{ 0, 0, 5000, NULL, (void*) &appData.dateThreshold, "", NULL, Spin, N_("No games before year:") },
+{ 0, 1, 50, NULL, (void*) &appData.stretch, "", NULL, Spin, N_("Minimum nr consecutive positions:") },
+{ 1, 0, 180, NULL, (void*) &searchMode, (char*) modeNames, modeValues, ComboBox, N_("Seach mode:") },
+{ 0, 0, 0, NULL, (void*) &appData.ignoreColors, "", NULL, CheckBox, N_("Also match reversed colors") },
+{ 0, 0, 0, NULL, (void*) &appData.findMirror, "", NULL, CheckBox, N_("Also match left-right flipped position") },
+{ 0, 0, 0, NULL, (void*) &LoadOptionsOK, "", NULL, EndMark , "" }
};
Option saveOptions[] = {
char *soundFiles[] = { // sound files corresponding to above names
"",
"$",
- "*", // kludge alert: as first thing in the dialog readout this is replaced with the user-given .WAV filename
+ NULL, // kludge alert: as first thing in the dialog readout this is replaced with the user-given .WAV filename
"honkhonk.wav",
"cymbal.wav",
"ding1.wav",
Option boardOptions[] = {
{ 0, 0, 70, NULL, (void*) &appData.whitePieceColor, "", NULL, TextBox, N_("White Piece Color:") },
{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#FFFFCC", Button, " " },
-{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
-{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
-{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
+{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("R") },
+{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("G") },
+{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("B") },
+{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("D") },
{ 0, 0, 70, NULL, (void*) &appData.blackPieceColor, "", NULL, TextBox, N_("Black Piece Color:") },
{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#202020", Button, " " },
-{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
-{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
-{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
+{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("R") },
+{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("G") },
+{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("B") },
+{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("D") },
{ 0, 0, 70, NULL, (void*) &appData.lightSquareColor, "", NULL, TextBox, N_("Light Square Color:") },
{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#C8C365", Button, " " },
-{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
-{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
-{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
+{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("R") },
+{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("G") },
+{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("B") },
+{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("D") },
{ 0, 0, 70, NULL, (void*) &appData.darkSquareColor, "", NULL, TextBox, N_("Dark Square Color:") },
{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#77A26D", Button, " " },
-{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
-{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
-{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
+{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("R") },
+{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("G") },
+{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("B") },
+{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("D") },
{ 0, 0, 70, NULL, (void*) &appData.highlightSquareColor, "", NULL, TextBox, N_("Highlight Color:") },
{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#FFFF00", Button, " " },
-{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
-{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
-{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
+{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("R") },
+{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("G") },
+{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("B") },
+{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("D") },
{ 0, 0, 70, NULL, (void*) &appData.premoveHighlightColor, "", NULL, TextBox, N_("Premove Highlight Color:") },
{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#FF0000", Button, " " },
-{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
-{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
-{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
+{ 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("R") },
+{ 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("G") },
+{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("B") },
+{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("D") },
{ 0, 0, 0, NULL, (void*) &appData.upsideDown, "", NULL, CheckBox, N_("Flip Pieces Shogi Style (Colored buttons restore default)") },
//{ 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.useBitmaps, "", NULL, CheckBox, N_("Use Board Textures") },
{ 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:") },
case Fractional:
XtSetArg(args[0], XtNstring, &val);
XtGetValues(currentOption[i].handle, args, 1);
+ x = 0.0; // Initialise because sscanf() will fail if non-numeric text is entered
sscanf(val, "%f", &x);
if(x > currentOption[i].max) x = currentOption[i].max;
if(x < currentOption[i].min) x = currentOption[i].min;
unsigned int mask;
char def[MSG_SIZ], *msg;
static char pane[6] = "paneX";
- Widget texts[100], forelast = NULL, anchor, widest, lastrow = NULL;
+ Widget texts[100], forelast = NULL, anchor, widest, lastrow = NULL, browse = NULL;
+ Dimension bWidth = 50;
if(shellUp[dlgNr]) return 0; // already up
if(dlgNr && shells[dlgNr]) {
if(currentCps) { // Settings popup for engine: format through heuristic
int n = currentCps->nrOptions;
- if(!n) { DisplayNote(_("Engine has no options")); return 0; }
+ if(!n) { DisplayNote(_("Engine has no options")); currentCps = NULL; return 0; }
if(n > 50) width = 4; else if(n>24) width = 2; else width = 1;
height = n / width + 1;
- if(n && (currentOption[n-1].type == Button || currentOption[n-1].type == SaveButton)) currentOption[n].min = 1; // OK on same line
+ if(n && (currentOption[n-1].type == Button || currentOption[n-1].type == SaveButton)) currentOption[n].min = SAME_ROW; // OK on same line
currentOption[n].type = EndMark; currentOption[n].target = NULL; // delimit list by callback-less end mark
}
i = 0;
XtSetArg(args[j], XtNleft, XtChainRight); j++;
XtSetArg(args[j], XtNright, XtChainRight); j++;
if(option[i].type == FileName || option[i].type == PathName) {
- w = 50; msg = _("browse");
+ msg = _("browse"); w = 0;
+ /* automatically scale to width of text */
+ XtSetArg(args[j], XtNwidth, (XtArgVal) NULL ); j++;
} else {
- XtSetArg(args[j], XtNheight, 10); j++;
w = 20; msg = "+";
+ XtSetArg(args[j], XtNheight, 10); j++;
+ XtSetArg(args[j], XtNwidth, w); j++;
}
- XtSetArg(args[j], XtNwidth, w); j++;
edit = XtCreateManagedWidget(msg, commandWidgetClass, form, args, j);
XtAddCallback(edit, XtNcallback, SpinCallback, (XtPointer)(intptr_t) i);
+ if(w == 0) browse = edit;
if(option[i].type != Spin) break;
case SaveButton:
case Button:
j=0;
- XtSetArg(args[j], XtNfromVert, option[i].min & 1 ? lastrow : last); j++;
+ if(option[i].min & SAME_ROW) {
+ XtSetArg(args[j], XtNfromVert, lastrow); j++;
+ XtSetArg(args[j], XtNfromHoriz, last); j++;
+ } else {
+ XtSetArg(args[j], XtNfromVert, last); j++;
+ XtSetArg(args[j], XtNfromHoriz, NULL); j++; lastrow = forelast;
+ }
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].textValue) { // special for buttons of New Variant dialog
XtSetArg(args[j], XtNsensitive, appData.noChessProgram || option[i].value < 0
XtSetArg(args[j], XtNlabel, _(((char**)option[i].textValue)[option[i].value])); j++;
option[i].handle = (void*)
(last = XtCreateManagedWidget(" ", menuButtonWidgetClass, form, args, j));
- CreateComboPopup(last, option[i].name, i, (char **) option[i].textValue);
+ CreateComboPopup(last, option + i, i);
values[i] = option[i].value;
break;
case Break:
// make an attempt to align all spins and textbox controls
maxWidth = maxTextWidth = 0;
+ if(browse != NULL) {
+ j=0;
+ XtSetArg(args[j], XtNwidth, &bWidth); j++;
+ XtGetValues(browse, args, j);
+ }
for(h=0; h<height; h++) {
i = h + c*height;
if(option[i].type == EndMark) break;
for(h=0; h<height; h++) {
i = h + c*height;
if(option[i].type == EndMark) break;
- if(!texts[h]) continue;
+ if(!texts[h]) continue; // Note: texts[h] can be undefined (giving errors in valgrind), but then both if's below will be false.
j=0;
if(option[i].type == Spin) {
XtSetArg(args[j], XtNwidth, maxWidth); j++;
if(option[i].type == TextBox || option[i].type == ComboBox || option[i].type == PathName || option[i].type == FileName) {
XtSetArg(args[j], XtNwidth, maxTextWidth); j++;
XtSetValues(texts[h], args, j);
+ if(bWidth != 50 && (option[i].type == FileName || option[i].type == PathName)) {
+ int tWidth = (option[i].max ? option[i].max : 205) - 5 - bWidth;
+ j = 0;
+ XtSetArg(args[j], XtNwidth, tWidth); j++;
+ XtSetValues(option[i].handle, args, j);
+ }
}
}
}
- if(!(option[i].min & 2)) {
+ if(!(option[i].min & NO_OK)) {
j=0;
- if(option[i].min & 1) {
- for(j=i-1; option[j+1].min&1 && option[j].type == Button; j--) {
+ if(option[i].min & SAME_ROW) {
+ for(j=i-1; option[j+1].min & SAME_ROW && option[j].type == Button; j--) {
XtSetArg(args[0], XtNtop, XtChainBottom);
XtSetArg(args[1], XtNbottom, XtChainBottom);
XtSetValues(option[j].handle, args, 2);
String *prms;
Cardinal *nprms;
{
+ ASSIGN(searchMode, modeValues[appData.searchMode-1]);
GenericPopUp(loadOptions, _("Load Game Options"), 0);
}
String *prms;
Cardinal *nprms;
{
- soundFiles[2] = "*";
+ free(soundFiles[2]);
+ soundFiles[2] = strdup("*");
GenericPopUp(soundOptions, _("Sound Options"), 0);
}
String *prms;
Cardinal *nprms;
{
- GenericPopUp(adjudicationOptions, "Adjudicate non-ICS Games", 0);
+ GenericPopUp(adjudicationOptions, _("Adjudicate non-ICS Games"), 0);
}
void UciMenuProc(w, event, prms, nprms)
comboCallback = &AddToTourney;
matchOptions[5].min = -(appData.pairingEngine[0] != NULLCHAR); // with pairing engine, allow Swiss
ASSIGN(tfName, appData.tourneyFile[0] ? appData.tourneyFile : MakeName(appData.defName));
+ ASSIGN(engineName, appData.participants);
GenericPopUp(matchOptions, _("Match Options"), 0);
}
void SaveChanges(int n)
{
- GetWidgetText(¤tOption[0], &commentText);
+ GenericReadout(0);
ReplaceComment(commentIndex, commentText);
}
Option commentOptions[] = {
{ 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, 0, 50, NULL, (void*) &ClearComment, NULL, NULL, Button, N_("clear") },
+{ 0, 1, 100, NULL, (void*) &SaveChanges, NULL, NULL, Button, N_("save changes") },
{ 0, 1, 0, NULL, (void*) &NewComCallback, "", NULL, EndMark , "" }
};
void changeTags(int n)
{
- GetWidgetText(¤tOption[1], &tagsText);
+ GenericReadout(1);
if(bookUp) SaveToBook(tagsText); else
ReplaceTags(tagsText, &gameInfo);
}
Option tagsOptions[] = {
{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, "" },
{ 0xD, 200, 200, NULL, (void*) &tagsText, "", NULL, TextBox, "" },
-{ 0, 0, 100, NULL, (void*) &changeTags, NULL, NULL, Button, "save changes" },
+{ 0, 0, 100, NULL, (void*) &changeTags, NULL, NULL, Button, N_("save changes") },
{ 0, 1, 0, NULL, (void*) &NewTagsCallback, "", NULL, EndMark , "" }
};
{
char buf[10], keys[32];
KeySym sym;
- KeyCode metaL, metaR;
+ KeyCode metaL, metaR; //, ctrlL, ctrlR;
int n = XLookupString(&(event->xkey), buf, 10, &sym, NULL);
XQueryKeymap(xDisplay,keys);
metaL = XKeysymToKeycode(xDisplay, XK_Meta_L);
metaR = XKeysymToKeycode(xDisplay, XK_Meta_R);
- if ( n == 1 && *buf > 32 && !(keys[metaL>>3]&1<<(metaL&7)) && !(keys[metaR>>3]&1<<(metaR&7))) // printable, no alt
- PopUpMoveDialog(*buf);
-
+// ctrlL = XKeysymToKeycode(xDisplay, XK_Control_L);
+// ctrlR = XKeysymToKeycode(xDisplay, XK_Control_R);
+ if ( n == 1 && *buf >= 32 // printable
+ && !(keys[metaL>>3]&1<<(metaL&7)) && !(keys[metaR>>3]&1<<(metaR&7)) // no alt key pressed
+// && !(keys[ctrlL>>3]&1<<(ctrlL&7)) && !(keys[ctrlR>>3]&1<<(ctrlR&7)) // no ctrl key pressed
+ )
+ {
+ if(appData.icsActive) { // text typed to board in ICS mode: divert to ICS input box
+ if(shells[4]) { // box already exists: append to current contents
+ char *p, newText[MSG_SIZ];
+ GetWidgetText(&boxOptions[0], &p);
+ snprintf(newText, MSG_SIZ, "%s%c", p, *buf);
+ SetWidgetText(&boxOptions[0], newText, 4);
+ if(shellUp[4]) XSetInputFocus(xDisplay, XtWindow(boxOptions[0].handle), RevertToPointerRoot, CurrentTime); //why???
+ } else icsText = buf; // box did not exist: make sure it pops up with char in it
+ InputBoxPopup();
+ } else PopUpMoveDialog(*buf);
+ }
}
void
}
Option installOptions[] = {
-{ 0, 0, 0, NULL, (void*) &engineLine, (char*) engineMnemonic, engineList, ComboBox, N_("Select engine from list:") },
+{ 0, NO_GETTEXT, 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") },
}
Option shuffleOptions[] = {
-{ 0, 0, 50, NULL, (void*) &shuffleOpenings, NULL, NULL, CheckBox, "shuffle" },
-{ 0,-1,2000000000, NULL, (void*) &appData.defaultFrcPosition, "", NULL, Spin, N_("Start-position number:") },
-{ 0, 0, 0, NULL, (void*) &SetRandom, NULL, NULL, Button, "randomize" },
-{ 0, 1, 0, NULL, (void*) &SetRandom, NULL, NULL, Button, "pick fixed" },
-{ 0, 1, 0, NULL, (void*) &ShuffleOK, "", NULL, EndMark , "" }
+ { 0, 0, 50, NULL, (void*) &shuffleOpenings, NULL, NULL, CheckBox, N_("shuffle") },
+ { 0,-1,2000000000, NULL, (void*) &appData.defaultFrcPosition, "", NULL, Spin, N_("Start-position number:") },
+ { 0, 0, 0, NULL, (void*) &SetRandom, NULL, NULL, Button, N_("randomize") },
+ { 0, 1, 0, NULL, (void*) &SetRandom, NULL, NULL, Button, N_("pick fixed") },
+ { 0, 1, 0, NULL, (void*) &ShuffleOK, "", NULL, EndMark , "" }
};
void SetRandom(int n)
{
- int r = n==2 ? -1 : rand() & (1<<30)-1;
+ int r = n==2 ? -1 : random() & (1<<30)-1;
char buf[MSG_SIZ];
snprintf(buf, MSG_SIZ, "%d", r);
SetWidgetText(&shuffleOptions[1], buf, 0);
projects / xboard.git / blobdiff