X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=eabebbe94f56fff7f51d4e3f399c778311062e5e;hb=1f070c3ba500547459ad3df71fbdbad1e5b4b4a0;hp=9612b1f765a74627b21661c42e7fc53edf3a3367;hpb=8e75200591104332de2a6272fa910f9ab30f3431;p=xboard.git

diff --git a/xoptions.c b/xoptions.c
index 9612b1f..eabebbe 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -98,384 +98,12 @@ void SetFocus(Widget w, XtPointer data, XEvent *event, Boolean *b)
     XtGetValues(w, args, 1);
     j = 1;
     XtSetArg(args[0], XtNdisplayCaret, True);
-    if(!strchr(s, '\n')) XtSetArg(args[1], XtNinsertPosition, strlen(s)), j++;
+    if(!strchr(s, '\n') && strlen(s) < 80) XtSetArg(args[1], XtNinsertPosition, strlen(s)), j++;
     XtSetValues(w, args, j);
     XtSetKeyboardFocus((Widget) data, w);
     previous = w;
 }
 
-//--------------------------- Time-Control Menu Popup ----------------------------------
-int TimeControlUp;
-Widget TimeControlShell;
-int tcInc;
-Widget tcMess1, tcMess2, tcData, tcTime, tcOdds1, tcOdds2;
-int tcIncrement, tcMoves;
-
-void TimeControlPopDown()
-{
-    if (!TimeControlUp) return;
-    previous = NULL;
-    XtPopdown(TimeControlShell);
-    XtDestroyWidget(TimeControlShell);
-    TimeControlUp = False;
-    ModeHighlight();
-}
-
-void TimeControlCallback(w, client_data, call_data)
-     Widget w;
-     XtPointer client_data, call_data;
-{
-    String name, txt;
-    Arg args[16];
-    char buf[MSG_SIZ];
-    int j;
-
-    XtSetArg(args[0], XtNlabel, &name);
-    XtGetValues(w, args, 1);
-
-    if (strcmp(name, _("classical")) == 0) {
-	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);
-	if(tcInc == 1) {
-	    j=0;
-	    XtSetArg(args[j], XtNstring, &name); j++;
-	    XtGetValues(tcData, args, j);
-	    tcIncrement = 0; sscanf(name, "%d", &tcIncrement);
-	}
-	snprintf(buf, MSG_SIZ,  "%d", tcMoves);
-	j=0;
-	XtSetArg(args[j], XtNstring, buf); j++;
-	XtSetValues(tcData, args, j);
-	tcInc = 0;
-        return;
-    }
-    if (strcmp(name, _("incremental")) == 0) {
-	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);
-	if(tcInc == 0) {
-	    j=0;
-	    XtSetArg(args[j], XtNstring, &name); j++;
-	    XtGetValues(tcData, args, j);
-	    tcMoves = appData.movesPerSession; sscanf(name, "%d", &tcMoves);
-	}
-	snprintf(buf, MSG_SIZ,  "%d", tcIncrement);
-	j=0;
-	XtSetArg(args[j], XtNstring, buf); j++;
-	XtSetValues(tcData, args, j);
-	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, ok=0;
-	XtSetArg(args[0], XtNstring, &txt);
-	XtGetValues(tcData, args, 1);
-	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);
-	    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
-	    XtSetValues(tcData, args, 1);
-	    return;
-	}
-	XtSetArg(args[0], XtNstring, &txt);
-	XtGetValues(tcTime, args, 1);
-	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);
-	}
-	XtSetArg(args[0], XtNstring, &txt);
-	XtGetValues(tcOdds1, args, 1);
-	appData.firstTimeOdds = first.timeOdds
-		= (sscanf(txt, "%d", &j) == 1 && j > 0) ? j : 1;
-	XtGetValues(tcOdds2, args, 1);
-	appData.secondTimeOdds = second.timeOdds
-		= (sscanf(txt, "%d", &j) == 1 && j > 0) ? j : 1;
-
-	Reset(True, True);
-        TimeControlPopDown();
-        return;
-    }
-}
-
-void TimeControlPopUp()
-{
-    Arg args[16];
-    Widget popup, layout, form,  b_ok, b_cancel, b_clas, b_inc, mess;
-    Window root, child;
-    int x, y, i, j;
-    int win_x, win_y;
-    unsigned int mask;
-    char def[MSG_SIZ];
-
-    tcInc = searchTime > 0 ? 2 : (appData.timeIncrement >= 0);
-    tcMoves = appData.movesPerSession; tcIncrement = appData.timeIncrement;
-    if(!tcInc) tcIncrement = 0;
-    snprintf(def, MSG_SIZ,  "%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));
-
-    j = 0;
-//    XtSetArg(args[j], XtNwidth,     (XtArgVal) 300); j++;
-//    XtSetArg(args[j], XtNheight,    (XtArgVal) 85); j++;
-    XtSetValues(popup, args, j);
-
-    j= 0;
-    XtSetArg(args[j], XtNborderWidth, 1); j++;
-    XtSetArg(args[j], XtNeditType, XawtextEdit);  j++;
-    XtSetArg(args[j], XtNuseStringInPlace, False);  j++;
-    XtSetArg(args[j], XtNstring, appData.timeControl);  j++;
-    XtSetArg(args[j], XtNdisplayCaret, False);  j++;
-    XtSetArg(args[j], XtNtop, XtChainTop);  j++;
-    XtSetArg(args[j], XtNbottom, XtChainTop);  j++;
-    XtSetArg(args[j], XtNleft, XtChainLeft);  j++;
-    XtSetArg(args[j], XtNright, XtChainRight);  j++;
-    XtSetArg(args[j], XtNresizable, True);  j++;
-    XtSetArg(args[j], XtNwidth,  85);  j++;
-    XtSetArg(args[j], XtNinsertPosition, 9999);  j++;
-    tcTime = XtCreateManagedWidget("TC", asciiTextWidgetClass, form, args, j);
-    XtAddEventHandler(tcTime, ButtonPressMask, False, SetFocus, (XtPointer) popup);
-
-    j= 0;
-    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++;
-    XtSetArg(args[j], XtNbottom, XtChainTop);  j++;
-    XtSetArg(args[j], XtNleft, XtChainRight);  j++;
-    XtSetArg(args[j], XtNright, XtChainRight);  j++;
-  //  XtSetArg(args[j], XtNwidth,  100);  j++;
-  //  XtSetArg(args[j], XtNheight, 20);  j++;
-    tcMess1 = XtCreateManagedWidget("TCtext", labelWidgetClass, form, args, j);
-
-    j= 0;
-    XtSetArg(args[j], XtNborderWidth, 1); j++;
-    XtSetArg(args[j], XtNfromHoriz, tcMess1); j++;
-    XtSetArg(args[j], XtNeditType, XawtextEdit);  j++;
-    XtSetArg(args[j], XtNuseStringInPlace, False);  j++;
-    XtSetArg(args[j], XtNstring, def);  j++;
-    XtSetArg(args[j], XtNdisplayCaret, False);  j++;
-    XtSetArg(args[j], XtNtop, XtChainTop);  j++;
-    XtSetArg(args[j], XtNbottom, XtChainTop);  j++;
-    XtSetArg(args[j], XtNleft, XtChainRight);  j++;
-    XtSetArg(args[j], XtNright, XtChainRight);  j++;
-    XtSetArg(args[j], XtNresizable, True);  j++;
-    XtSetArg(args[j], XtNwidth,  40);  j++;
-//    XtSetArg(args[j], XtNheight, 20);  j++;
-    tcData = XtCreateManagedWidget("MPS", asciiTextWidgetClass, form, args, j);
-    XtAddEventHandler(tcData, ButtonPressMask, False, SetFocus, (XtPointer) popup);
-
-    j= 0;
-    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, XtChainTop);  j++;
-    XtSetArg(args[j], XtNbottom, XtChainTop);  j++;
-    XtSetArg(args[j], XtNleft, XtChainRight);  j++;
-    XtSetArg(args[j], XtNright, XtChainRight);  j++;
-//    XtSetArg(args[j], XtNwidth,  80);  j++;
-//    XtSetArg(args[j], XtNheight, 20);  j++;
-    tcMess2 = XtCreateManagedWidget("MPStext", labelWidgetClass,
-				   form, args, j);
-
-    j= 0;
-    XtSetArg(args[j], XtNborderWidth, 1); j++;
-    XtSetArg(args[j], XtNfromVert, tcTime); j++;
-    XtSetArg(args[j], XtNeditType, XawtextEdit);  j++;
-    XtSetArg(args[j], XtNuseStringInPlace, False);  j++;
-    XtSetArg(args[j], XtNstring, "1");  j++;
-    XtSetArg(args[j], XtNdisplayCaret, False);  j++;
-    XtSetArg(args[j], XtNtop, XtChainTop);  j++;
-    XtSetArg(args[j], XtNbottom, XtChainTop);  j++;
-    XtSetArg(args[j], XtNleft, XtChainLeft);  j++;
-    XtSetArg(args[j], XtNright, XtChainLeft);  j++;
-    XtSetArg(args[j], XtNresizable, True);  j++;
-    XtSetArg(args[j], XtNwidth,  40);  j++;
-//    XtSetArg(args[j], XtNheight, 20);  j++;
-    tcOdds1 = XtCreateManagedWidget("Odds1", asciiTextWidgetClass, form, args, j);
-    XtAddEventHandler(tcOdds1, ButtonPressMask, False, SetFocus, (XtPointer) popup);
-
-    j= 0;
-    XtSetArg(args[j], XtNborderWidth, 1); j++;
-    XtSetArg(args[j], XtNfromVert, tcTime); j++;
-    XtSetArg(args[j], XtNfromHoriz, tcOdds1); j++;
-    XtSetArg(args[j], XtNeditType, XawtextEdit);  j++;
-    XtSetArg(args[j], XtNuseStringInPlace, False);  j++;
-    XtSetArg(args[j], XtNstring, "1");  j++;
-    XtSetArg(args[j], XtNdisplayCaret, False);  j++;
-    XtSetArg(args[j], XtNtop, XtChainTop);  j++;
-    XtSetArg(args[j], XtNbottom, XtChainTop);  j++;
-    XtSetArg(args[j], XtNleft, XtChainLeft);  j++;
-    XtSetArg(args[j], XtNright, XtChainLeft);  j++;
-    XtSetArg(args[j], XtNresizable, True);  j++;
-    XtSetArg(args[j], XtNwidth,  40);  j++;
-//    XtSetArg(args[j], XtNheight, 20);  j++;
-    tcOdds2 = XtCreateManagedWidget("Odds2", asciiTextWidgetClass, form, args, j);
-    XtAddEventHandler(tcOdds2, ButtonPressMask, False, SetFocus, (XtPointer) popup);
-
-    j= 0;
-    XtSetArg(args[j], XtNlabel, _("Engine #1 and #2 Time-Odds Factors")); j++;
-    XtSetArg(args[j], XtNjustify, XtJustifyLeft); j++;
-    XtSetArg(args[j], XtNborderWidth, 0); j++;
-    XtSetArg(args[j], XtNfromVert, tcTime); j++;
-    XtSetArg(args[j], XtNfromHoriz, tcOdds2); j++;
-    XtSetArg(args[j], XtNtop, XtChainTop);  j++;
-    XtSetArg(args[j], XtNbottom, XtChainTop);  j++;
-    XtSetArg(args[j], XtNleft, XtChainLeft);  j++;
-    XtSetArg(args[j], XtNright, XtChainRight);  j++;
-//    XtSetArg(args[j], XtNwidth,  200);  j++;
-//    XtSetArg(args[j], XtNheight, 20);  j++;
-    mess = XtCreateManagedWidget("Oddstext", labelWidgetClass,
-				   form, args, j);
-    j=0;
-    XtSetArg(args[j], XtNfromVert, tcOdds1);  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==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++;
-    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);
-
-    j=0;
-    XtSetArg(args[j], XtNfromVert, tcOdds1);  j++;
-    XtSetArg(args[j], XtNfromHoriz, tcData);  j++;
-    XtSetArg(args[j], XtNbottom, XtChainBottom);  j++;
-    XtSetArg(args[j], XtNtop, XtChainBottom);  j++;
-    XtSetArg(args[j], XtNleft, XtChainRight);  j++;
-    XtSetArg(args[j], XtNright, XtChainRight);  j++;
-    b_ok= XtCreateManagedWidget(_(" OK "), commandWidgetClass,
-				   form, args, j);
-    XtAddCallback(b_ok, XtNcallback, TimeControlCallback, (XtPointer) 0);
-
-    j=0;
-    XtSetArg(args[j], XtNfromVert, tcOdds1);  j++;
-    XtSetArg(args[j], XtNfromHoriz, b_ok);  j++;
-    XtSetArg(args[j], XtNbottom, XtChainBottom);  j++;
-    XtSetArg(args[j], XtNtop, XtChainBottom);  j++;
-    XtSetArg(args[j], XtNleft, XtChainRight);  j++;
-    XtSetArg(args[j], XtNright, XtChainRight);  j++;
-    b_cancel= XtCreateManagedWidget(_("cancel"), commandWidgetClass,
-				   form, args, j);
-    XtAddCallback(b_cancel, XtNcallback, TimeControlPopDown, (XtPointer) 0);
-
-    XtRealizeWidget(popup);
-    CatchDeleteWindow(popup, "TimeControlPopDown");
-
-    XQueryPointer(xDisplay, xBoardWindow, &root, &child,
-		  &x, &y, &win_x, &win_y, &mask);
-
-    XtSetArg(args[0], XtNx, x - 10);
-    XtSetArg(args[1], XtNy, y - 30);
-    XtSetValues(popup, args, 2);
-
-    XtPopup(popup, XtGrabExclusive);
-    TimeControlUp = True;
-
-    previous = NULL;
-    SetFocus(tcTime, popup, (XEvent*) NULL, False);
-//    XtSetKeyboardFocus(popup, tcTime);
-}
-
-void TimeControlProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-   TimeControlPopUp();
-}
-
 //--------------------------- Engine-specific options menu ----------------------------------
 
 typedef void ButtonCallback(int n);
@@ -487,6 +115,28 @@ static Option *currentOption;
 static Boolean browserUp;
 ButtonCallback *comboCallback;
 
+void GetWidgetText(Option *opt, char **buf)
+{
+    Arg arg;
+    XtSetArg(arg, XtNstring, buf);
+    XtGetValues(opt->handle, &arg, 1);
+}
+
+void SetWidgetText(Option *opt, char *buf, int n)
+{
+    Arg arg;
+    XtSetArg(arg, XtNstring, buf);
+    XtSetValues(opt->handle, &arg, 1);
+    SetFocus(opt->handle, shells[n], NULL, False);
+}
+
+void SetWidgetState(Option *opt, int state)
+{
+    Arg arg;
+    XtSetArg(arg, XtNstate, state);
+    XtSetValues(opt->handle, &arg, 1);
+}
+
 void CheckCallback(Widget ww, XtPointer data, XEvent *event, Boolean *b)
 {
     Widget w = currentOption[(int)(intptr_t)data].handle;
@@ -495,8 +145,7 @@ void CheckCallback(Widget ww, XtPointer data, XEvent *event, Boolean *b)
 
     XtSetArg(args[0], XtNstate, &s);
     XtGetValues(w, args, 1);
-    XtSetArg(args[0], XtNstate, !s);
-    XtSetValues(w, args, 1);
+    SetWidgetState(&currentOption[(int)(intptr_t)data], !s);
 }
 
 void SpinCallback(w, client_data, call_data)
@@ -512,14 +161,10 @@ void SpinCallback(w, client_data, call_data)
     XtSetArg(args[0], XtNlabel, &name);
     XtGetValues(w, args, 1);
 
-    j = 0;
-    XtSetArg(args[0], XtNstring, &val);
-    XtGetValues(currentOption[data].handle, args, 1);
+    GetWidgetText(&currentOption[data], &val);
     sscanf(val, "%d", &j);
     if (strcmp(name, "browse") == 0) {
-	char *q, *r;
-	XtSetArg(args[0], XtNstring, &q);
-	XtGetValues(currentOption[data].handle, args, 1);
+	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)
 		r = currentOption[data].textValue;
@@ -542,9 +187,7 @@ void SpinCallback(w, client_data, call_data)
 	if(--j < currentOption[data].min) return;
     } else return;
     snprintf(buf, MSG_SIZ,  "%d", j);
-    XtSetArg(args[0], XtNstring, buf);
-    XtSetValues(currentOption[data].handle, args, 1);
-    SetFocus(currentOption[data].handle, shells[0], NULL, False);
+    SetWidgetText(&currentOption[data], buf, 0);
 }
 
 void ComboSelect(w, addr, index) // callback for all combo items
@@ -594,7 +237,7 @@ void CreateComboPopup(parent, name, n, mb)
 
 // cloned from Engine Settings dialog (and later merged with it)
 
-extern WindowPlacement wpComment, wpTags;
+extern WindowPlacement wpComment, wpTags, wpMoveHistory;
 char *trialSound;
 static int oldCores, oldPonder;
 int MakeColors P((void));
@@ -604,7 +247,7 @@ int GenericReadout P((int selected));
 Widget shells[10];
 Widget marked[10];
 Boolean shellUp[10];
-WindowPlacement *wp[10] = { NULL, &wpComment, &wpTags };
+WindowPlacement *wp[10] = { NULL, &wpComment, &wpTags, NULL, NULL, NULL, NULL, &wpMoveHistory };
 Option *dialogOptions[10];
 
 void MarkMenu(char *item, int dlgNr)
@@ -660,29 +303,51 @@ extern Option installOptions[], matchOptions[];
 char *engineNr[] = { N_("First Engine"), N_("Second Engine"), NULL };
 char *engineList[100] = {" "}, *engineMnemonic[100] = {""};
 
-void AddToTourney(int n)
+int AppendText(Option *opt, char *s)
 {
-    Arg args[2];
-    char *p, *val, buf[10000];
     XawTextBlock t;
+    char *v;
+    int len;
+    GetWidgetText(opt, &v);
+    len = strlen(v);
+    t.ptr = s; t.firstPos = 0; t.length = strlen(s); t.format = XawFmt8Bit;
+    XawTextReplace(opt->handle, len, len, &t);
+    return len;
+}
+
+void AddLine(Option *opt, char *s)
+{
+    AppendText(opt, s);
+    AppendText(opt, "\n");
+}
 
+void AddToTourney(int n)
+{
     GenericReadout(4);  // selected engine
-    t.ptr = engineChoice; t.firstPos = 0; t.length = strlen(engineChoice); t.format = XawFmt8Bit;
-    XawTextReplace(matchOptions[3].handle, 9999, 9999, &t);
-    t.ptr = "\n"; t.length = 1;
-    XawTextReplace(matchOptions[3].handle, 9999, 9999, &t);
+    AddLine(&matchOptions[3], engineChoice);
 }
 
 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") },
@@ -699,7 +364,10 @@ Option matchOptions[] = {
 { 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)
@@ -711,6 +379,7 @@ int GeneralOptionsOK(int n)
 }
 
 Option generalOptions[] = {
+{ 0,  0, 0, NULL, (void*) &appData.whitePOV, "", NULL, CheckBox, N_("Absolute Analysis Scores") },
 { 0,  0, 0, NULL, (void*) &appData.sweepSelect, "", NULL, CheckBox, N_("Almost Always Queen (Detour Under-Promote)") },
 { 0,  0, 0, NULL, (void*) &appData.animateDragging, "", NULL, CheckBox, N_("Animate Dragging") },
 { 0,  0, 0, NULL, (void*) &appData.animate, "", NULL, CheckBox, N_("Animate Moving") },
@@ -728,12 +397,14 @@ Option generalOptions[] = {
 { 0,  0, 0, NULL, (void*) &appData.ponderNextMove, "", NULL, CheckBox, N_("Ponder Next Move") },
 { 0,  0, 0, NULL, (void*) &appData.popupExitMessage, "", NULL, CheckBox, N_("Popup Exit Messages") },
 { 0,  0, 0, NULL, (void*) &appData.popupMoveErrors, "", NULL, CheckBox, N_("Popup Move Errors") },
+{ 0,  0, 0, NULL, (void*) &appData.showEvalInMoveHistory, "", NULL, CheckBox, N_("Scores in Move List") },
 { 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.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, 5, 100,NULL, (void*) &appData.animSpeed, "", NULL, Spin, N_("Animation Speed (high = slow):") },
+{ 0,  1, 5, NULL, (void*) &appData.zoom, "", NULL, Spin, N_("Zoom factor in Evaluation Graph:") },
 { 0,  0, 0, NULL, (void*) &GeneralOptionsOK, "", NULL, EndMark , "" }
 };
 
@@ -789,16 +460,18 @@ Option variantDescriptors[] = {
 { 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")},
-{ VariantSpartan, 1, 135, NULL, (void*) &Pick, "#FF0000", NULL, Button, N_("Spartan")},
+{ VariantCapaRandom, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("CRC (10x8)")},
 { VariantLosers, 0, 135, NULL, (void*) &Pick, "#FFFFBF", NULL, Button, N_("losers")},
+{ 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:") },
@@ -896,12 +569,31 @@ Option icsOptions[] = {
 { 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_("\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[] = {
@@ -981,7 +673,7 @@ Option soundOptions[] = {
 { 0, 1, 0, NULL, NULL, "", NULL, EndMark , "" }
 };
 
-void SetColor(char *colorName, Widget box)
+void SetColor(char *colorName, Option *box)
 {
 	Arg args[5];
 	Pixel buttonColor;
@@ -997,16 +689,13 @@ void SetColor(char *colorName, Widget box)
 	    }
 	} else buttonColor = (Pixel) 0;
 	XtSetArg(args[0], XtNbackground, buttonColor);;
-	XtSetValues(box, args, 1);
+	XtSetValues(box->handle, args, 1);
 }
 
 void SetColorText(int n, char *buf)
 {
-    Arg args[5];
-    XtSetArg(args[0], XtNstring, buf);
-    XtSetValues(currentOption[n-1].handle, args, 1);
-    SetFocus(currentOption[n-1].handle, shells[0], NULL, False);
-    SetColor(buf, currentOption[n].handle);
+    SetWidgetText(&currentOption[n-1], buf, 0);
+    SetColor(buf, &currentOption[n]);
 }
 
 void DefColor(int n)
@@ -1018,9 +707,7 @@ void RefreshColor(int source, int n)
 {
     int col, j, r, g, b, step = 10;
     char *s, buf[MSG_SIZ]; // color string
-    Arg args[5];
-    XtSetArg(args[0], XtNstring, &s);
-    XtGetValues(currentOption[source].handle, args, 1);
+    GetWidgetText(&currentOption[source], &s);
     if(sscanf(s, "#%x", &col) != 1) return;   // malformed
     b = col & 0xFF; g = col & 0xFF00; r = col & 0xFF0000;
     switch(n) {
@@ -1102,6 +789,7 @@ 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.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:") },
@@ -1253,7 +941,7 @@ GenericPopUp(Option *option, char *title, int 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
@@ -1409,12 +1097,12 @@ GenericPopUp(Option *option, char *title, int dlgNr)
 	    option[i].handle = (void*)
 		(dialog = last = XtCreateManagedWidget(option[i].name, commandWidgetClass, form, args, j));
 	    if(option[i].choice && ((char*)option[i].choice)[0] == '#' && !currentCps) {
-		SetColor( *(char**) option[i-1].target, last);
+		SetColor( *(char**) option[i-1].target, &option[i]);
 		XtAddEventHandler(option[i-1].handle, KeyReleaseMask, False, ColorChanged, (XtPointer)(intptr_t) i-1);
 	    }
 	    XtAddCallback(last, XtNcallback, GenericCallback,
 			  (XtPointer)(intptr_t) i + (dlgNr<<16));
-	    if(option[i].textValue) SetColor( option[i].textValue, last);
+	    if(option[i].textValue) SetColor( option[i].textValue, &option[i]);
 	    forelast = lastrow; // next button can go on same row
 	    break;
 	  case ComboBox:
@@ -1566,6 +1254,7 @@ void LoadOptionsProc(w, event, prms, nprms)
      String *prms;
      Cardinal *nprms;
 {
+   ASSIGN(searchMode, modeValues[appData.searchMode-1]);
    GenericPopUp(loadOptions, _("Load Game Options"), 0);
 }
 
@@ -1646,6 +1335,7 @@ void MatchOptionsProc(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);
 }
 
@@ -1742,9 +1432,7 @@ int NewComCallback(int n)
 
 void SaveChanges(int n)
 {
-    Arg args[16];
-    XtSetArg(args[0], XtNstring, &commentText);
-    XtGetValues(currentOption[0].handle, args, 1);
+    GenericReadout(0);
     ReplaceComment(commentIndex, commentText);
 }
 
@@ -1755,22 +1443,28 @@ Option commentOptions[] = {
 {   0,  1,    0, NULL, (void*) &NewComCallback, "", NULL, EndMark , "" }
 };
 
+void ClearTextWidget(Option *opt)
+{
+//    XtCallActionProc(opt->handle, "select-all", NULL, NULL, 0);
+//    XtCallActionProc(opt->handle, "kill-selection", NULL, NULL, 0);
+    Arg arg;
+    XtSetArg(arg, XtNstring, ""); // clear without disturbing selection!
+    XtSetValues(opt->handle, &arg, 1);
+}
+
 void ClearComment(int n)
 {
-    XtCallActionProc(commentOptions[0].handle, "select-all", NULL, NULL, 0);
-    XtCallActionProc(commentOptions[0].handle, "kill-selection", NULL, NULL, 0);
+    ClearTextWidget(&commentOptions[0]);
 }
 
 void NewCommentPopup(char *title, char *text, int index)
 {
-    Widget edit;
     Arg args[16];
 
     if(shells[1]) { // if already exists, alter title and content
 	XtSetArg(args[0], XtNtitle, title);
 	XtSetValues(shells[1], args, 1);
-	XtSetArg(args[0], XtNstring, text);
-	XtSetValues(commentOptions[0].handle, args, 1);
+	SetWidgetText(&commentOptions[0], text, 1);
     }
     if(commentText) free(commentText); commentText = strdup(text);
     commentIndex = index;
@@ -1779,7 +1473,7 @@ void NewCommentPopup(char *title, char *text, int index)
 	XtOverrideTranslations(commentOptions[0].handle, XtParseTranslationTable(commentTranslations));
 }
 
-static char *tagsText, *msgText;
+static char *tagsText;
 
 int NewTagsCallback(int n)
 {
@@ -1789,10 +1483,8 @@ int NewTagsCallback(int n)
 
 void changeTags(int n)
 {
-    Arg args[16];
-    XtSetArg(args[0], XtNstring, &tagsText);
-    XtGetValues(currentOption[1].handle, args, 1);
-    if(bookUp) SaveToBook(tagsText); else
+    GenericReadout(1);
+    if(bookUp) SaveToBook(tagsText); else
     ReplaceTags(tagsText, &gameInfo);
 }
 
@@ -1805,13 +1497,11 @@ Option tagsOptions[] = {
 
 void NewTagsPopup(char *text, char *msg)
 {
-    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);
+	SetWidgetText(&tagsOptions[1], text, 2);
 	XtSetArg(args[0], XtNtitle, title);
 	XtSetValues(shells[2], args, 1);
     }
@@ -1834,13 +1524,11 @@ void PutText(char *text, int pos)
     char buf[MSG_SIZ], *p;
 
     if(strstr(text, "$add ") == text) {
-	XtSetArg(args[0], XtNstring, &p);
-	XtGetValues(boxOptions[0].handle, args, 1);
+	GetWidgetText(&boxOptions[0], &p);
 	snprintf(buf, MSG_SIZ, "%s%s", p, text+5); text = buf;
 	pos += strlen(p) - 5;
     }
-    XtSetArg(args[0], XtNstring, text);
-    XtSetValues(boxOptions[0].handle, args, 1);
+    SetWidgetText(&boxOptions[0], text, 4);
     XtSetArg(args[0], XtNinsertPosition, pos);
     XtSetValues(boxOptions[0].handle, args, 1);
 //    SetFocus(boxOptions[0].handle, shells[4], NULL, False); // No idea why this does not work, and the following is needed:
@@ -1860,15 +1548,13 @@ void TypeInProc(w, event, prms, nprms)
      String *prms;
      Cardinal *nprms;
 {
-    Arg args[2];
-    String val;
+    char *val;
 
     if(prms[0][0] == '1') {
-	XtSetArg(args[0], XtNstring, &val);
-	XtGetValues(boxOptions[0].handle, args, 1);
-	TypeInDoneEvent((char*)val);
+	GetWidgetText(&boxOptions[0], &val);
+	TypeInDoneEvent(val);
     }
-    PopDown(0);
+    PopDown(0);
 }
 
 char moveTypeInTranslations[] =
@@ -1892,9 +1578,18 @@ void MoveTypeInProc(Widget widget, caddr_t unused, XEvent *event)
     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);
-
+    if ( n == 1 && *buf >= 32 && !(keys[metaL>>3]&1<<(metaL&7)) && !(keys[metaR>>3]&1<<(metaR&7))) { // printable, no alt
+	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
@@ -1982,7 +1677,7 @@ int ShuffleOK(int n)
 
 Option shuffleOptions[] = {
 {   0,  0,   50, NULL, (void*) &shuffleOpenings, NULL, NULL, CheckBox, "shuffle" },
-{ 0,-1,1000000000, NULL, (void*) &appData.defaultFrcPosition, "", NULL, Spin, N_("Start-position number:") },
+{ 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 , "" }
@@ -1990,14 +1685,11 @@ Option shuffleOptions[] = {
 
 void SetRandom(int n)
 {
-    int r = n==2 ? -1 : rand();
+    int r = n==2 ? -1 : random() & (1<<30)-1;
     char buf[MSG_SIZ];
-    Arg args[2];
     snprintf(buf, MSG_SIZ,  "%d", r);
-    XtSetArg(args[0],XtNstring, buf);
-    XtSetValues(shuffleOptions[1].handle, args, 1);
-    XtSetArg(args[0],XtNstate, True);
-    XtSetValues(shuffleOptions[0].handle, args, 1);
+    SetWidgetText(&shuffleOptions[1], buf, 0);
+    SetWidgetState(&shuffleOptions[0], True);
 }
 
 void ShuffleMenuProc(w, event, prms, nprms)
@@ -2009,6 +1701,95 @@ void ShuffleMenuProc(w, event, prms, nprms)
     GenericPopUp(shuffleOptions, _("New Shuffle Game"), 0);
 }
 
+int tmpMoves, tmpTc, tmpInc, tmpOdds1, tmpOdds2, tcType;
+
+void ShowTC(int n)
+{
+}
+
+void SetTcType P((int n));
+
+char *Value(int n)
+{
+	static char buf[MSG_SIZ];
+	snprintf(buf, MSG_SIZ, "%d", n);
+	return buf;
+}
+
+int TcOK(int n)
+{
+    char *tc;
+    if(tcType == 0 && tmpMoves <= 0) return 0;
+    if(tcType == 2 && tmpInc <= 0) return 0;
+    GetWidgetText(&currentOption[4], &tc); // get original text, in case it is min:sec
+    searchTime = 0;
+    switch(tcType) {
+      case 0:
+	if(!ParseTimeControl(tc, -1, tmpMoves)) return 0;
+	appData.movesPerSession = tmpMoves;
+	ASSIGN(appData.timeControl, tc);
+	appData.timeIncrement = -1;
+	break;
+      case 1:
+	if(!ParseTimeControl(tc, tmpInc, 0)) return 0;
+	ASSIGN(appData.timeControl, tc);
+	appData.timeIncrement = tmpInc;
+	break;
+      case 2:
+	searchTime = tmpInc;
+    }
+    appData.firstTimeOdds = first.timeOdds = tmpOdds1;
+    appData.secondTimeOdds = second.timeOdds = tmpOdds2;
+    Reset(True, True);
+    return 1;
+}
+
+Option tcOptions[] = {
+{   0,  0,    0, NULL, (void*) &SetTcType, NULL, NULL, Button, N_("classical") },
+{   0,  1,    0, NULL, (void*) &SetTcType, NULL, NULL, Button, N_("incremental") },
+{   0,  1,    0, NULL, (void*) &SetTcType, NULL, NULL, Button, N_("fixed max") },
+{   0,  0,  200, NULL, (void*) &tmpMoves, NULL, NULL, Spin, N_("Moves per session:") },
+{   0,  0,10000, NULL, (void*) &tmpTc, NULL, NULL, Spin, N_("Initial time (min):") },
+{   0, 0, 10000, NULL, (void*) &tmpInc, NULL, NULL, Spin, N_("Increment or max (sec/move):") },
+{   0,  0,    0, NULL, NULL, NULL, NULL, Label, N_("Time-Odds factors:") },
+{   0,  1, 1000, NULL, (void*) &tmpOdds1, NULL, NULL, Spin, N_("Engine #1") },
+{   0,  1, 1000, NULL, (void*) &tmpOdds2, NULL, NULL, Spin, N_("Engine #2 / Human") },
+{   0,  0,    0, NULL, (void*) &TcOK, "", NULL, EndMark , "" }
+};
+
+void SetTcType(int n)
+{
+    switch(tcType = n) {
+      case 0:
+	SetWidgetText(&tcOptions[3], Value(tmpMoves), 0);
+	SetWidgetText(&tcOptions[4], Value(tmpTc), 0);
+	SetWidgetText(&tcOptions[5], _("Unused"), 0);
+	break;
+      case 1:
+	SetWidgetText(&tcOptions[3], _("Unused"), 0);
+	SetWidgetText(&tcOptions[4], Value(tmpTc), 0);
+	SetWidgetText(&tcOptions[5], Value(tmpInc), 0);
+	break;
+      case 2:
+	SetWidgetText(&tcOptions[3], _("Unused"), 0);
+	SetWidgetText(&tcOptions[4], _("Unused"), 0);
+	SetWidgetText(&tcOptions[5], Value(tmpInc), 0);
+    }
+}
+
+void TimeControlProc(w, event, prms, nprms)
+     Widget w;
+     XEvent *event;
+     String *prms;
+     Cardinal *nprms;
+{
+   tmpMoves = appData.movesPerSession;
+   tmpInc = appData.timeIncrement; if(tmpInc < 0) tmpInc = 0;
+   tmpOdds1 = tmpOdds2 = 1; tcType = 0;
+   tmpTc = atoi(appData.timeControl);
+   GenericPopUp(tcOptions, _("Time Control"), 0);
+}
+
 //---------------------------- Chat Windows ----------------------------------------------
 
 void OutputChatMessage(int partner, char *mess)