extern void SendToProgram P((char *message, ChessProgramState *cps));
-extern Widget formWidget, shellWidget, boardWidget, menuBarWidget;
-extern Display *xDisplay;
+extern Widget formWidget, boardWidget, menuBarWidget;
extern int squareSize;
extern Pixmap xMarkPixmap;
extern char *layoutName;
extern Window xBoardWindow;
extern Arg layoutArgs[2], formArgs[2];
Pixel timerForegroundPixel, timerBackgroundPixel;
+extern int searchTime;
// [HGM] the following code for makng menu popups was cloned from the FileNamePopUp routines
i = 0;
XtSetArg(args[i], XtNresizable, True); i++;
XtSetArg(args[i], XtNwidth, DIALOG_SIZE); i++;
- shuffleShell = popup =
- XtCreatePopupShell(_("New Shuffle Game"), transientShellWidgetClass,
- shellWidget, args, i);
-
- layout =
- XtCreateManagedWidget(layoutName, formWidgetClass, popup,
- layoutArgs, XtNumber(layoutArgs));
-
+// shuffleShell = popup =
+// XtCreatePopupShell(_("New Shuffle Game"), transientShellWidgetClass,
+// shellWidget, args, i);
+//
+// layout =
+// XtCreateManagedWidget(layoutName, formWidgetClass, popup,
+// layoutArgs, XtNumber(layoutArgs));
+//
sprintf(def, "%d\n", appData.defaultFrcPosition);
i = 0;
XtSetArg(args[i], XtNlabel, _("Start-position number:")); i++;
XawDialogAddButton(dialog, _("off"), ShuffleCallback, (XtPointer) dialog);
XtRealizeWidget(popup);
- CatchDeleteWindow(popup, "ShufflePopDown");
+ // CatchDeleteWindow(popup, "ShufflePopDown");
- XQueryPointer(xDisplay, xBoardWindow, &root, &child,
- &x, &y, &win_x, &win_y, &mask);
+// XQueryPointer(xDisplay, xBoardWindow, &root, &child,
+// &x, &y, &win_x, &win_y, &mask);
XtSetArg(args[0], XtNx, x - 10);
XtSetArg(args[1], XtNy, y - 30);
XtGetValues(w, args, 1);
if (strcmp(name, _("classical")) == 0) {
- if(!tcInc) return;
+ if(tcInc == 0) return;
j=0;
XtSetArg(args[j], XtNlabel, _("minutes for each")); j++;
XtSetValues(tcMess1, args, j);
j=0;
XtSetArg(args[j], XtNlabel, _("moves")); j++;
XtSetValues(tcMess2, args, j);
- j=0;
- XtSetArg(args[j], XtNstring, &name); j++;
- XtGetValues(tcData, args, j);
- tcIncrement = 0; sscanf(name, "%d", &tcIncrement);
+ if(tcInc == 1) {
+ j=0;
+ XtSetArg(args[j], XtNstring, &name); j++;
+ XtGetValues(tcData, args, j);
+ tcIncrement = 0; sscanf(name, "%d", &tcIncrement);
+ }
sprintf(buf, "%d", tcMoves);
j=0;
XtSetArg(args[j], XtNstring, buf); j++;
XtSetValues(tcData, args, j);
- tcInc = False;
+ tcInc = 0;
return;
}
if (strcmp(name, _("incremental")) == 0) {
- if(tcInc) return;
+ if(tcInc == 1) return;
j=0;
XtSetArg(args[j], XtNlabel, _("minutes, plus")); j++;
XtSetValues(tcMess1, args, j);
j=0;
XtSetArg(args[j], XtNlabel, _("sec/move")); j++;
XtSetValues(tcMess2, args, j);
- j=0;
- XtSetArg(args[j], XtNstring, &name); j++;
- XtGetValues(tcData, args, j);
- tcMoves = appData.movesPerSession; sscanf(name, "%d", &tcMoves);
+ if(tcInc == 0) {
+ j=0;
+ XtSetArg(args[j], XtNstring, &name); j++;
+ XtGetValues(tcData, args, j);
+ tcMoves = appData.movesPerSession; sscanf(name, "%d", &tcMoves);
+ }
sprintf(buf, "%d", tcIncrement);
j=0;
XtSetArg(args[j], XtNstring, buf); j++;
XtSetValues(tcData, args, j);
- tcInc = True;
+ tcInc = 1;
+ return;
+ }
+ if (strcmp(name, _("fixed time")) == 0) {
+ if(tcInc == 2) return;
+ j=0;
+ XtSetArg(args[j], XtNlabel, _("sec/move (max)")); j++;
+ XtSetValues(tcMess1, args, j);
+ j=0;
+ XtSetArg(args[j], XtNlabel, _("")); j++;
+ XtSetValues(tcMess2, args, j);
+ j=0;
+ XtSetArg(args[j], XtNstring, ""); j++;
+ XtSetValues(tcData, args, j);
+ tcInc = 2;
return;
}
if (strcmp(name, _(" OK ")) == 0) {
int inc, mps, tc, ok;
XtSetArg(args[0], XtNstring, &txt);
XtGetValues(tcData, args, 1);
- if(tcInc) {
+ switch(tcInc) {
+ case 1:
ok = sscanf(txt, "%d", &inc); mps = 0;
if(!ok && txt[0] == 0) { inc = 0; ok = 1; } // accept empty string as zero
ok &= (inc >= 0);
- } else {
+ break;
+ case 0:
ok = sscanf(txt, "%d", &mps); inc = -1;
ok &= (mps > 0);
+ break;
+ case 2:
+ ok = 1; inc = -1; mps = 40;
}
if(ok != 1) {
XtSetArg(args[0], XtNstring, ""); // erase any offending input
}
XtSetArg(args[0], XtNstring, &txt);
XtGetValues(tcTime, args, 1);
- if(!ParseTimeControl(txt, inc, mps)) {
- XtSetArg(args[0], XtNstring, ""); // erase any offending input
- XtSetValues(tcTime, args, 1);
- DisplayError(_("Bad Time-Control String"), 0);
- return;
+ if(tcInc == 2) {
+ if(sscanf(txt, "%d", &inc) != 1) {
+ XtSetArg(args[0], XtNstring, ""); // erase any offending input
+ XtSetValues(tcTime, args, 1);
+ DisplayError(_("Bad Time-Control String"), 0);
+ return;
+ }
+ searchTime = inc;
+ } else {
+ if(!ParseTimeControl(txt, inc, mps)) {
+ XtSetArg(args[0], XtNstring, ""); // erase any offending input
+ XtSetValues(tcTime, args, 1);
+ DisplayError(_("Bad Time-Control String"), 0);
+ return;
+ }
+ searchTime = 0;
+ appData.movesPerSession = mps;
+ appData.timeIncrement = inc;
+ appData.timeControl = strdup(txt);
}
- appData.movesPerSession = mps;
- appData.timeIncrement = inc;
- appData.timeControl = strdup(txt);
XtSetArg(args[0], XtNstring, &txt);
XtGetValues(tcOdds1, args, 1);
appData.firstTimeOdds = first.timeOdds
unsigned int mask;
char def[80];
- tcInc = (appData.timeIncrement >= 0);
+ tcInc = searchTime > 0 ? 2 : (appData.timeIncrement >= 0);
tcMoves = appData.movesPerSession; tcIncrement = appData.timeIncrement;
if(!tcInc) tcIncrement = 0;
sprintf(def, "%d", tcInc ? tcIncrement : tcMoves);
i = 0;
XtSetArg(args[i], XtNresizable, True); i++;
// XtSetArg(args[i], XtNwidth, DIALOG_SIZE); i++;
- TimeControlShell = popup =
- XtCreatePopupShell(_("TimeControl Menu"), transientShellWidgetClass,
- shellWidget, args, i);
-
- layout =
- XtCreateManagedWidget(layoutName, formWidgetClass, popup,
- layoutArgs, XtNumber(layoutArgs));
-
- form =
- XtCreateManagedWidget(layoutName, formWidgetClass, layout,
- formArgs, XtNumber(formArgs));
-
+// TimeControlShell = popup =
+// XtCreatePopupShell(_("TimeControl Menu"), transientShellWidgetClass,
+// shellWidget, args, i);
+//
+// layout =
+// XtCreateManagedWidget(layoutName, formWidgetClass, popup,
+// layoutArgs, XtNumber(layoutArgs));
+//
+// form =
+// XtCreateManagedWidget(layoutName, formWidgetClass, layout,
+// formArgs, XtNumber(formArgs));
+//
j = 0;
// XtSetArg(args[j], XtNwidth, (XtArgVal) 300); j++;
// XtSetArg(args[j], XtNheight, (XtArgVal) 85); j++;
XtAddEventHandler(tcTime, ButtonPressMask, False, SetFocus, (XtPointer) popup);
j= 0;
- XtSetArg(args[j], XtNlabel, tcInc ? _(" minutes, plus ") : _("minutes for each")); j++;
+ XtSetArg(args[j], XtNlabel, tcInc ? tcInc == 2 ? _("sec/move (max) ") : _(" minutes, plus ") : _("minutes for each")); j++;
XtSetArg(args[j], XtNborderWidth, 0); j++;
XtSetArg(args[j], XtNfromHoriz, tcTime); j++;
XtSetArg(args[j], XtNtop, XtChainTop); j++;
XtAddEventHandler(tcData, ButtonPressMask, False, SetFocus, (XtPointer) popup);
j= 0;
- XtSetArg(args[j], XtNlabel, tcInc ? _("sec/move") : _("moves ")); j++;
+ XtSetArg(args[j], XtNlabel, tcInc ? tcInc == 2 ? _(" ") : _("sec/move") : _("moves ")); j++;
XtSetArg(args[j], XtNjustify, XtJustifyLeft); j++;
XtSetArg(args[j], XtNborderWidth, 0); j++;
XtSetArg(args[j], XtNfromHoriz, tcData); j++;
XtSetArg(args[j], XtNtop, XtChainBottom); j++;
XtSetArg(args[j], XtNleft, XtChainLeft); j++;
XtSetArg(args[j], XtNright, XtChainLeft); j++;
- b_clas= XtCreateManagedWidget(_("classical"), commandWidgetClass,
+ XtSetArg(args[j], XtNstate, tcInc==0); j++;
+ b_clas= XtCreateManagedWidget(_("classical"), toggleWidgetClass,
form, args, j);
XtAddCallback(b_clas, XtNcallback, TimeControlCallback, (XtPointer) 0);
j=0;
+ XtSetArg(args[j], XtNradioGroup, b_clas); j++;
XtSetArg(args[j], XtNfromVert, tcOdds1); j++;
XtSetArg(args[j], XtNfromHoriz, b_clas); j++;
XtSetArg(args[j], XtNbottom, XtChainBottom); j++;
XtSetArg(args[j], XtNtop, XtChainBottom); j++;
XtSetArg(args[j], XtNleft, XtChainLeft); j++;
XtSetArg(args[j], XtNright, XtChainLeft); j++;
- b_inc = XtCreateManagedWidget(_("incremental"), commandWidgetClass,
+ XtSetArg(args[j], XtNstate, tcInc==1); j++;
+ b_inc = XtCreateManagedWidget(_("incremental"), toggleWidgetClass,
+ form, args, j);
+ XtAddCallback(b_inc, XtNcallback, TimeControlCallback, (XtPointer) 0);
+
+ j=0;
+ XtSetArg(args[j], XtNradioGroup, b_inc); j++;
+ XtSetArg(args[j], XtNfromVert, tcOdds1); j++;
+ XtSetArg(args[j], XtNfromHoriz, b_inc); j++;
+ XtSetArg(args[j], XtNbottom, XtChainBottom); j++;
+ XtSetArg(args[j], XtNtop, XtChainBottom); j++;
+ XtSetArg(args[j], XtNleft, XtChainLeft); j++;
+ XtSetArg(args[j], XtNright, XtChainLeft); j++;
+ XtSetArg(args[j], XtNstate, tcInc==2); j++;
+ b_inc = XtCreateManagedWidget(_("fixed time"), toggleWidgetClass,
form, args, j);
XtAddCallback(b_inc, XtNcallback, TimeControlCallback, (XtPointer) 0);
XtAddCallback(b_cancel, XtNcallback, TimeControlPopDown, (XtPointer) 0);
XtRealizeWidget(popup);
- CatchDeleteWindow(popup, "TimeControlPopDown");
+ // CatchDeleteWindow(popup, "TimeControlPopDown");
- XQueryPointer(xDisplay, xBoardWindow, &root, &child,
- &x, &y, &win_x, &win_y, &mask);
+// XQueryPointer(xDisplay, xBoardWindow, &root, &child,
+// &x, &y, &win_x, &win_y, &mask);
XtSetArg(args[0], XtNx, x - 10);
XtSetArg(args[1], XtNy, y - 30);
i = 0;
XtSetArg(args[i], XtNresizable, True); i++;
// XtSetArg(args[i], XtNwidth, DIALOG_SIZE); i++;
- EngineShell = popup =
- XtCreatePopupShell(_("Adjudications"), transientShellWidgetClass,
- shellWidget, args, i);
-
- layout =
- XtCreateManagedWidget(layoutName, formWidgetClass, popup,
- layoutArgs, XtNumber(layoutArgs));
-
- form =
- XtCreateManagedWidget(layoutName, formWidgetClass, layout,
- formArgs, XtNumber(formArgs));
-
+// EngineShell = popup =
+// XtCreatePopupShell(_("Adjudications"), transientShellWidgetClass,
+// shellWidget, args, i);
+//
+// layout =
+// XtCreateManagedWidget(layoutName, formWidgetClass, popup,
+// layoutArgs, XtNumber(layoutArgs));
+//
+// form =
+// XtCreateManagedWidget(layoutName, formWidgetClass, layout,
+// formArgs, XtNumber(formArgs));
+//
j = 0;
// XtSetArg(args[j], XtNwidth, (XtArgVal) 250); j++;
// XtSetArg(args[j], XtNheight, (XtArgVal) 400); j++;
XtSetArg(args[j-3], XtNstate, appData.secondScoreIsAbsolute);
w4 = XtCreateManagedWidget(_("Engine #2 Score is Absolute"), toggleWidgetClass, form, args, j);
- s1 = XtCreateManagedWidget(_("\nEngine-Engine Adjudications:"), labelWidgetClass, form, args, 3);
+ s1 = XtCreateManagedWidget(_("\nAdjudications in non-ICS games:"), labelWidgetClass, form, args, 3);
XtSetArg(args[j-1], XtNfromVert, (XtArgVal) s1);
XtSetArg(args[j-3], XtNstate, appData.testClaims);
XtAddCallback(b_cancel, XtNcallback, EnginePopDown, (XtPointer) 0);
XtRealizeWidget(popup);
- CatchDeleteWindow(popup, "EnginePopDown");
-
- XQueryPointer(xDisplay, xBoardWindow, &root, &child,
- &x, &y, &win_x, &win_y, &mask);
+// CatchDeleteWindow(popup, "EnginePopDown");
+//
+// XQueryPointer(xDisplay, xBoardWindow, &root, &child,
+// &x, &y, &win_x, &win_y, &mask);
XtSetArg(args[0], XtNx, x - 10);
XtSetArg(args[1], XtNy, y - 30);
XtSetArg(args[i], XtNresizable, True); i++;
// XtSetArg(args[i], XtNwidth, 250); i++;
// XtSetArg(args[i], XtNheight, 300); i++;
- NewVariantShell = popup =
- XtCreatePopupShell(_("NewVariant Menu"), transientShellWidgetClass,
- shellWidget, args, i);
-
- layout =
- XtCreateManagedWidget(layoutName, formWidgetClass, popup,
- layoutArgs, XtNumber(layoutArgs));
-
- form =
- XtCreateManagedWidget("form", formWidgetClass, layout,
- formArgs, XtNumber(formArgs));
-
+// NewVariantShell = popup =
+// XtCreatePopupShell(_("NewVariant Menu"), transientShellWidgetClass,
+// shellWidget, args, i);
+//
+// layout =
+// XtCreateManagedWidget(layoutName, formWidgetClass, popup,
+// layoutArgs, XtNumber(layoutArgs));
+//
+// form =
+// XtCreateManagedWidget("form", formWidgetClass, layout,
+// formArgs, XtNumber(formArgs));
+//
for(i = 0; buttonDesc[i].name != NULL; i++) {
Pixel buttonColor;
if (!appData.monoMode) {
vFrom.addr = (caddr_t) buttonDesc[i].color;
vFrom.size = strlen(buttonDesc[i].color);
- XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
+ // XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
if (vTo.addr == NULL) {
buttonColor = (Pixel) -1;
} else {
XtCreateManagedWidget("warning", labelWidgetClass, form, args, j);
XtRealizeWidget(popup);
- CatchDeleteWindow(popup, "NewVariantPopDown");
-
- XQueryPointer(xDisplay, xBoardWindow, &root, &child,
- &x, &y, &win_x, &win_y, &mask);
+// CatchDeleteWindow(popup, "NewVariantPopDown");
+//
+// XQueryPointer(xDisplay, xBoardWindow, &root, &child,
+// &x, &y, &win_x, &win_y, &mask);
XtSetArg(args[0], XtNx, x - 10);
XtSetArg(args[1], XtNy, y - 30);
i = 0;
XtSetArg(args[i], XtNresizable, True); i++;
// XtSetArg(args[i], XtNwidth, 300); i++;
- UciShell = popup =
- XtCreatePopupShell(_("Engine Settings"), transientShellWidgetClass,
- shellWidget, args, i);
-
- layout =
- XtCreateManagedWidget(layoutName, formWidgetClass, popup,
- layoutArgs, XtNumber(layoutArgs));
-
-
- form =
- XtCreateManagedWidget("form", formWidgetClass, layout,
- formArgs, XtNumber(formArgs));
-
+// UciShell = popup =
+// XtCreatePopupShell(_("Engine Settings"), transientShellWidgetClass,
+// shellWidget, args, i);
+//
+// layout =
+// XtCreateManagedWidget(layoutName, formWidgetClass, popup,
+// layoutArgs, XtNumber(layoutArgs));
+//
+//
+// form =
+// XtCreateManagedWidget("form", formWidgetClass, layout,
+// formArgs, XtNumber(formArgs));
+//
j = 0;
XtSetArg(args[j], XtNtop, XtChainTop); j++;
XtSetArg(args[j], XtNbottom, XtChainTop); j++;
// XtAddCallback(w3, XtNcallback, UciCallback, (XtPointer) 0);
XtRealizeWidget(popup);
- CatchDeleteWindow(popup, "UciPopDown");
-
- XQueryPointer(xDisplay, xBoardWindow, &root, &child,
- &x, &y, &win_x, &win_y, &mask);
+// CatchDeleteWindow(popup, "UciPopDown");
+//
+// XQueryPointer(xDisplay, xBoardWindow, &root, &child,
+// &x, &y, &win_x, &win_y, &mask);
XtSetArg(args[0], XtNx, x - 10);
XtSetArg(args[1], XtNy, y - 30);
height = cps->nrOptions / width + 1;
i = 0;
XtSetArg(args[i], XtNresizable, True); i++;
- SettingsShell = popup =
- XtCreatePopupShell(_("Settings Menu"), transientShellWidgetClass,
- shellWidget, args, i);
-
- layout =
- XtCreateManagedWidget(layoutName, formWidgetClass, popup,
- layoutArgs, XtNumber(layoutArgs));
+// SettingsShell = popup =
+// XtCreatePopupShell(_("Settings Menu"), transientShellWidgetClass,
+// shellWidget, args, i);
+//
+// layout =
+// XtCreateManagedWidget(layoutName, formWidgetClass, popup,
+// layoutArgs, XtNumber(layoutArgs));
for(c=0; c<width; c++) {
pane[4] = 'A'+c;
form =
XtAddCallback(b_cancel, XtNcallback, SettingsPopDown, (XtPointer) 0);
XtRealizeWidget(popup);
- CatchDeleteWindow(popup, "SettingsPopDown");
-
- XQueryPointer(xDisplay, xBoardWindow, &root, &child,
- &x, &y, &win_x, &win_y, &mask);
+// CatchDeleteWindow(popup, "SettingsPopDown");
+//
+// XQueryPointer(xDisplay, xBoardWindow, &root, &child,
+// &x, &y, &win_x, &win_y, &mask);
XtSetArg(args[0], XtNx, x - 10);
XtSetArg(args[1], XtNy, y - 30);
projects / xboard.git / blobdiff