X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=6e995ea4b25fd90c12af0f981ba649658bfbdd91;hb=b382d988c6f886f3a49483df9e3e36de0b6b0824;hp=514c9d6c3b9e24e83751c88a7ba9bddf6bd1da6c;hpb=a58df46e1b619e6d5be974896e5b457ed4b37b23;p=xboard.git diff --git a/xoptions.c b/xoptions.c index 514c9d6..6e995ea 100644 --- a/xoptions.c +++ b/xoptions.c @@ -1,7 +1,7 @@ /* * xoptions.c -- Move list window, part of X front end for XBoard * - * Copyright 2000,2009 Free Software Foundation, Inc. + * Copyright 2000, 2009, 2010, 2011 Free Software Foundation, Inc. * ------------------------------------------------------------------------ * * GNU XBoard is free software: you can redistribute it and/or modify @@ -45,6 +45,7 @@ extern char *getenv(); #if HAVE_UNISTD_H # include #endif +#include #include #include @@ -88,6 +89,7 @@ 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 @@ -129,11 +131,11 @@ void ShuffleCallback(w, client_data, call_data) String name; Widget w2; Arg args[16]; - char buf[80]; - + char buf[MSG_SIZ]; + XtSetArg(args[0], XtNlabel, &name); XtGetValues(w, args, 1); - + if (strcmp(name, _("cancel")) == 0) { ShufflePopDown(); return; @@ -142,11 +144,10 @@ void ShuffleCallback(w, client_data, call_data) ShufflePopDown(); shuffleOpenings = False; // [HGM] should be moved to New Variant menu, once we have it! ResetGameEvent(); - EngineOutputPopDown(); return; } if (strcmp(name, _("random")) == 0) { - sprintf(buf, "%d", rand()); + snprintf(buf, MSG_SIZ, "%d", rand()); XtSetArg(args[0],XtNvalue, buf); // erase bad (non-numeric) value XtSetValues(XtParent(w), args, 1); return; @@ -155,7 +156,7 @@ void ShuffleCallback(w, client_data, call_data) int nr; String name; name = XawDialogGetValueString(w2 = XtParent(w)); if(sscanf(name ,"%d",&nr) != 1) { - sprintf(buf, "%d", appData.defaultFrcPosition); + snprintf(buf, MSG_SIZ, "%d", appData.defaultFrcPosition); XtSetArg(args[0],XtNvalue, buf); // erase bad (non-numeric) value XtSetValues(w2, args, 1); return; @@ -164,7 +165,6 @@ void ShuffleCallback(w, client_data, call_data) shuffleOpenings = True; ShufflePopDown(); ResetGameEvent(); - EngineOutputPopDown(); return; } } @@ -177,27 +177,27 @@ void ShufflePopUp() int x, y, i; int win_x, win_y; unsigned int mask; - char def[80]; - + char def[MSG_SIZ]; + 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)); - - sprintf(def, "%d\n", appData.defaultFrcPosition); + + snprintf(def, MSG_SIZ, "%d\n", appData.defaultFrcPosition); i = 0; XtSetArg(args[i], XtNlabel, _("Start-position number:")); i++; XtSetArg(args[i], XtNvalue, def); i++; XtSetArg(args[i], XtNborderWidth, 0); i++; dialog = XtCreateManagedWidget(_("Shuffle"), dialogWidgetClass, layout, args, i); - + // XtSetArg(args[0], XtNeditType, XawtextEdit); // [HGM] can't get edit to work decently // XtSetArg(args[1], XtNuseStringInPlace, False); // XtSetValues(dialog, args, 2); @@ -206,20 +206,20 @@ void ShufflePopUp() XawDialogAddButton(dialog, _("cancel"), ShuffleCallback, (XtPointer) dialog); XawDialogAddButton(dialog, _("random"), ShuffleCallback, (XtPointer) dialog); XawDialogAddButton(dialog, _("off"), ShuffleCallback, (XtPointer) dialog); - + XtRealizeWidget(popup); CatchDeleteWindow(popup, "ShufflePopDown"); - + 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); shuffleUp = True; - + edit = XtNameToWidget(dialog, "*value"); XtSetKeyboardFocus(popup, edit); @@ -247,6 +247,7 @@ int tcIncrement, tcMoves; void TimeControlPopDown() { if (!TimeControlUp) return; + previous = NULL; XtPopdown(TimeControlShell); XtDestroyWidget(TimeControlShell); TimeControlUp = False; @@ -258,63 +259,85 @@ void TimeControlCallback(w, client_data, call_data) XtPointer client_data, call_data; { String name, txt; - Widget w2; Arg args[16]; - char buf[80]; + char buf[MSG_SIZ]; int j; XtSetArg(args[0], XtNlabel, &name); 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); - sprintf(buf, "%d", tcMoves); + 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 = 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); - sprintf(buf, "%d", tcIncrement); + 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 = 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; + int inc, mps, 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 @@ -323,21 +346,32 @@ void TimeControlCallback(w, client_data, call_data) } 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 + appData.firstTimeOdds = first.timeOdds = (sscanf(txt, "%d", &j) == 1 && j > 0) ? j : 1; XtGetValues(tcOdds2, args, 1); - appData.secondTimeOdds = second.timeOdds + appData.secondTimeOdds = second.timeOdds = (sscanf(txt, "%d", &j) == 1 && j > 0) ? j : 1; Reset(True, True); @@ -349,17 +383,17 @@ void TimeControlCallback(w, client_data, call_data) void TimeControlPopUp() { Arg args[16]; - Widget popup, layout, form, edit, b_ok, b_cancel, b_clas, b_inc, mess; + 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[80]; - - tcInc = (appData.timeIncrement >= 0); + char def[MSG_SIZ]; + + tcInc = searchTime > 0 ? 2 : (appData.timeIncrement >= 0); tcMoves = appData.movesPerSession; tcIncrement = appData.timeIncrement; if(!tcInc) tcIncrement = 0; - sprintf(def, "%d", tcInc ? tcIncrement : tcMoves); + snprintf(def, MSG_SIZ, "%d", tcInc ? tcIncrement : tcMoves); i = 0; XtSetArg(args[i], XtNresizable, True); i++; @@ -367,15 +401,15 @@ void TimeControlPopUp() 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++; @@ -393,12 +427,12 @@ void TimeControlPopUp() XtSetArg(args[j], XtNright, XtChainRight); j++; XtSetArg(args[j], XtNresizable, True); j++; XtSetArg(args[j], XtNwidth, 85); j++; -// XtSetArg(args[j], XtNheight, 20); 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 ? _(" 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++; @@ -427,7 +461,7 @@ void TimeControlPopUp() 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++; @@ -495,19 +529,35 @@ void TimeControlPopUp() XtSetArg(args[j], XtNtop, XtChainBottom); j++; XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNright, XtChainLeft); j++; - b_clas= XtCreateManagedWidget(_("classical"), commandWidgetClass, - form, args, 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++; - b_inc = XtCreateManagedWidget(_("incremental"), commandWidgetClass, - form, args, 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; @@ -518,7 +568,7 @@ void TimeControlPopUp() XtSetArg(args[j], XtNleft, XtChainRight); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; b_ok= XtCreateManagedWidget(_(" OK "), commandWidgetClass, - form, args, j); + form, args, j); XtAddCallback(b_ok, XtNcallback, TimeControlCallback, (XtPointer) 0); j=0; @@ -529,22 +579,22 @@ void TimeControlPopUp() XtSetArg(args[j], XtNleft, XtChainRight); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; b_cancel= XtCreateManagedWidget(_("cancel"), commandWidgetClass, - form, args, j); + 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); @@ -569,6 +619,7 @@ Widget engDrawMoves, engThreshold, engRule, engRepeat; void EnginePopDown() { if (!EngineUp) return; + previous = NULL; XtPopdown(EngineShell); XtDestroyWidget(EngineShell); EngineUp = False; @@ -592,26 +643,24 @@ void EngineCallback(w, client_data, call_data) XtPointer client_data, call_data; { String name; - Widget s2; Arg args[16]; - char buf[80]; int j; - + XtSetArg(args[0], XtNlabel, &name); XtGetValues(w, args, 1); - + if (strcmp(name, _("OK")) == 0) { // read all switches appData.periodicUpdates = ReadToggle(w1); // appData.hideThinkingFromHuman = ReadToggle(w2); - appData.firstScoreIsAbsolute = ReadToggle(w3); - appData.secondScoreIsAbsolute = ReadToggle(w4); + first.scoreIsAbsolute = appData.firstScoreIsAbsolute = ReadToggle(w3); + second.scoreIsAbsolute = appData.secondScoreIsAbsolute = ReadToggle(w4); appData.testClaims = ReadToggle(w5); appData.checkMates = ReadToggle(w6); appData.materialDraws = ReadToggle(w7); appData.trivialDraws = ReadToggle(w8); - // adjust setting in other menu for duplicates + // adjust setting in other menu for duplicates // (perhaps duplicates should be removed from general Option Menu?) // XtSetArg(args[0], XtNleftBitmap, appData.showThinking ? xMarkPixmap : None); // XtSetValues(XtNameToWidget(menuBarWidget, @@ -622,7 +671,7 @@ void EngineCallback(w, client_data, call_data) XtGetValues(engDrawMoves, args, 1); if(sscanf(name, "%d", &j) == 1) appData.adjudicateDrawMoves = j; XtGetValues(engThreshold, args, 1); - if(sscanf(name, "%d", &j) == 1) + if(sscanf(name, "%d", &j) == 1) adjudicateLossThreshold = appData.adjudicateLossThreshold = -j; // inverted! XtGetValues(engRule, args, 1); if(sscanf(name, "%d", &j) == 1) appData.ruleMoves = j; @@ -638,17 +687,17 @@ void EngineCallback(w, client_data, call_data) void EnginePopUp() { Arg args[16]; - Widget popup, layout, form, edit, b_ok, b_cancel, b_clas, b_inc, s1; + Widget popup, layout, form, b_ok, b_cancel, s1; Window root, child; int x, y, i, j, width; int win_x, win_y; unsigned int mask; - char def[80]; - + char def[MSG_SIZ]; + tcInc = (appData.timeIncrement >= 0); tcMoves = appData.movesPerSession; tcIncrement = appData.timeIncrement; if(!tcInc) tcIncrement = 0; - sprintf(def, "%d", tcInc ? tcIncrement : tcMoves); + snprintf(def, MSG_SIZ, "%d", tcInc ? tcIncrement : tcMoves); i = 0; XtSetArg(args[i], XtNresizable, True); i++; @@ -656,15 +705,15 @@ void EnginePopUp() 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++; @@ -695,7 +744,7 @@ void EnginePopUp() 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); @@ -717,7 +766,7 @@ void EnginePopUp() XtSetArg(args[1], XtNborderWidth, (XtArgVal) 0); XtSetValues(s1, args, 2); - sprintf(def, "%d", appData.adjudicateDrawMoves); + snprintf(def, MSG_SIZ, "%d", appData.adjudicateDrawMoves); j= 0; XtSetArg(args[j], XtNborderWidth, 1); j++; XtSetArg(args[j], XtNfromVert, w8); j++; @@ -749,7 +798,7 @@ void EnginePopUp() // XtSetArg(args[j], XtNheight, 20); j++; tcMess1 = XtCreateManagedWidget("TCtext", labelWidgetClass, form, args, j); - sprintf(def, "%d", -appData.adjudicateLossThreshold); // inverted! + snprintf(def, MSG_SIZ, "%d", -appData.adjudicateLossThreshold); // inverted! j= 0; XtSetArg(args[j], XtNborderWidth, 1); j++; XtSetArg(args[j], XtNfromVert, engDrawMoves); j++; @@ -763,7 +812,7 @@ void EnginePopUp() XtSetArg(args[j], XtNright, XtChainLeft); j++; XtSetArg(args[j], XtNresizable, True); j++; XtSetArg(args[j], XtNwidth, 60); j++; -// XtSetArg(args[j], XtNheight, 20); j++; + XtSetArg(args[j], XtNinsertPosition, 9999); j++; engThreshold = XtCreateManagedWidget("Threshold", asciiTextWidgetClass, form, args, j); XtAddEventHandler(engThreshold, ButtonPressMask, False, SetFocus, (XtPointer) popup); @@ -781,7 +830,7 @@ void EnginePopUp() // XtSetArg(args[j], XtNheight, 20); j++; tcMess2 = XtCreateManagedWidget("MPStext", labelWidgetClass, form, args, j); - sprintf(def, "%d", appData.ruleMoves); + snprintf(def, MSG_SIZ, "%d", appData.ruleMoves); j= 0; XtSetArg(args[j], XtNborderWidth, 1); j++; XtSetArg(args[j], XtNfromVert, engThreshold); j++; @@ -813,7 +862,7 @@ void EnginePopUp() // XtSetArg(args[j], XtNheight, 20); j++; tcMess1 = XtCreateManagedWidget("TCtext", labelWidgetClass, form, args, j); - sprintf(def, "%d", appData.drawRepeats); + snprintf(def, MSG_SIZ, "%d", appData.drawRepeats); j= 0; XtSetArg(args[j], XtNborderWidth, 1); j++; XtSetArg(args[j], XtNfromVert, engRule); j++; @@ -852,7 +901,7 @@ void EnginePopUp() 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); + b_ok= XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j); XtAddCallback(b_ok, XtNcallback, EngineCallback, (XtPointer) 0); j=0; @@ -863,22 +912,22 @@ void EnginePopUp() XtSetArg(args[j], XtNleft, XtChainRight); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; b_cancel= XtCreateManagedWidget(_("cancel"), commandWidgetClass, - form, args, j); + form, args, j); XtAddCallback(b_cancel, XtNcallback, EnginePopDown, (XtPointer) 0); XtRealizeWidget(popup); 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); XtSetValues(popup, args, 2); - + XtPopup(popup, XtGrabExclusive); EngineUp = True; - + previous = NULL; SetFocus(engThreshold, popup, (XEvent*) NULL, False); } @@ -909,6 +958,7 @@ struct NewVarButton buttonDesc[] = { {N_("berolina"), "#FFFFFF", 0, VariantBerolina}, {N_("cylinder"), "#FFFFFF", 0, VariantCylinder}, {N_("shatranj"), "#FFFFFF", 0, VariantShatranj}, + {N_("makruk"), "#FFFFFF", 0, VariantMakruk}, {N_("atomic"), "#FFFFFF", 0, VariantAtomic}, {N_("two kings"), "#FFFFFF", 0, VariantTwoKings}, {N_("3-checks"), "#FFFFFF", 0, Variant3Check}, @@ -916,21 +966,23 @@ struct NewVarButton buttonDesc[] = { {N_("give-away"), "#FFFFBF", 0, VariantGiveaway}, {N_("losers"), "#FFFFBF", 0, VariantLosers}, {N_("fairy"), "#BFBFBF", 0, VariantFairy}, + {N_("Seirawan"), "#FFBFBF", 0, VariantSChess}, {N_("Superchess"), "#FFBFBF", 0, VariantSuper}, {N_("crazyhouse"), "#FFBFBF", 0, VariantCrazyhouse}, {N_("bughouse"), "#FFBFBF", 0, VariantBughouse}, {N_("shogi (9x9)"), "#BFFFFF", 0, VariantShogi}, {N_("xiangqi (9x10)"), "#BFFFFF", 0, VariantXiangqi}, {N_("courier (12x8)"), "#BFFFBF", 0, VariantCourier}, - {N_("janus (10x8)"), "#BFBFFF", 0, VariantJanus}, {N_("Capablanca (10x8)"), "#BFBFFF", 0, VariantCapablanca}, - {N_("CRC (10x8)"), "#BFBFFF", 0, VariantCapaRandom}, #ifdef GOTHIC {N_("Gothic (10x8)"), "#BFBFFF", 0, VariantGothic}, #endif + {N_("janus (10x8)"), "#BFBFFF", 0, VariantJanus}, + {N_("CRC (10x8)"), "#BFBFFF", 0, VariantCapaRandom}, #ifdef FALCON {N_("Falcon (10x8)"), "#BFBFFF", 0, VariantFalcon}, #endif + {N_("Spartan"), "#FF0000", 0, VariantSpartan}, {NULL, 0, 0, (VariantClass) 0} }; @@ -951,29 +1003,27 @@ void NewVariantCallback(w, client_data, call_data) XtPointer client_data, call_data; { String name; - Widget w2; Arg args[16]; - char buf[80]; VariantClass v; - + XtSetArg(args[0], XtNlabel, &name); XtGetValues(w, args, 1); - + if (strcmp(name, _(" OK ")) == 0) { - int nr = (int) XawToggleGetCurrent(buttonDesc[0].handle) - 1; + int nr = (intptr_t) XawToggleGetCurrent(buttonDesc[0].handle) - 1; if(nr < 0) return; v = buttonDesc[nr].variant; - if(!appData.noChessProgram) { + if(!appData.noChessProgram) { char *name = VariantName(v), buf[MSG_SIZ]; if (first.protocolVersion > 1 && StrStr(first.variants, name) == NULL) { /* [HGM] in protocol 2 we check if variant is suported by engine */ - sprintf(buf, _("Variant %s not supported by %s"), name, first.tidy); + snprintf(buf, MSG_SIZ, _("Variant %s not supported by %s"), name, first.tidy); DisplayError(buf, 0); // NewVariantPopDown(); return; /* ignore OK if first engine does not support it */ } else if (second.initDone && second.protocolVersion > 1 && StrStr(second.variants, name) == NULL) { - sprintf(buf, _("Warning: second engine (%s) does not support this!"), second.tidy); + snprintf(buf, MSG_SIZ, _("Warning: second engine (%s) does not support this!"), second.tidy); DisplayError(buf, 0); /* use of second engine is optional; only warn user */ } } @@ -993,12 +1043,11 @@ void NewVariantCallback(w, client_data, call_data) void NewVariantPopUp() { Arg args[16]; - Widget popup, layout, dialog, edit, form, last = NULL, b_ok, b_cancel; + Widget popup, layout, form, last = NULL, b_ok, b_cancel; Window root, child; int x, y, i, j; int win_x, win_y; unsigned int mask; - char def[80]; XrmValue vFrom, vTo; i = 0; @@ -1008,15 +1057,15 @@ void NewVariantPopUp() 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) { @@ -1029,7 +1078,7 @@ void NewVariantPopUp() buttonColor = *(Pixel *) vTo.addr; } } - + j = 0; XtSetArg(args[j], XtNradioGroup, last); j++; XtSetArg(args[j], XtNwidth, 125); j++; @@ -1039,6 +1088,7 @@ void NewVariantPopUp() XtSetArg(args[j], XtNradioData, i+1); j++; XtSetArg(args[j], XtNbackground, buttonColor); j++; XtSetArg(args[j], XtNstate, gameInfo.variant == buttonDesc[i].variant); j++; + XtSetArg(args[j], XtNsensitive, appData.noChessProgram || strstr(first.variants, VariantName(buttonDesc[i].variant))); j++; buttonDesc[i].handle = last = XtCreateManagedWidget(buttonDesc[i].name, toggleWidgetClass, form, args, j); } @@ -1052,7 +1102,7 @@ void NewVariantPopUp() 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); + b_cancel= XtCreateManagedWidget(_("CANCEL"), commandWidgetClass, form, args, j); XtAddCallback(b_cancel, XtNcallback, NewVariantPopDown, (XtPointer) 0); j=0; @@ -1064,7 +1114,7 @@ void NewVariantPopUp() 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); + b_ok= XtCreateManagedWidget(_(" OK "), commandWidgetClass, form, args, j); XtAddCallback(b_ok, XtNcallback, NewVariantCallback, (XtPointer) 0); j=0; @@ -1083,14 +1133,14 @@ void NewVariantPopUp() XtRealizeWidget(popup); 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); XtSetValues(popup, args, 2); - + XtPopup(popup, XtGrabExclusive); NewVariantUp = True; } @@ -1127,6 +1177,7 @@ struct UciControl controlDesc[] = { void UciPopDown() { if (!UciUp) return; + previous = NULL; XtPopdown(UciShell); XtDestroyWidget(UciShell); UciUp = False; @@ -1139,14 +1190,13 @@ void UciCallback(w, client_data, call_data) { String name; Arg args[16]; - char buf[80]; int oldCores = appData.smpCores, ponder = 0; - + XtSetArg(args[0], XtNlabel, &name); XtGetValues(w, args, 1); - + if (strcmp(name, _("OK")) == 0) { - int nr, i, j; String name; + int i, j; String name; for(i=0; i<6; i++) { XtSetArg(args[0], XtNstring, &name); XtGetValues(controlDesc[i].handle, args, 1); @@ -1154,7 +1204,7 @@ void UciCallback(w, client_data, call_data) if(name) *(char**) controlDesc[i].ptr = strdup(name); } else { - if(sscanf(name, "%d", &j) == 1) + if(sscanf(name, "%d", &j) == 1) *(int*) controlDesc[i].ptr = j; } } @@ -1167,7 +1217,7 @@ void UciCallback(w, client_data, call_data) XtSetArg(args[0], XtNstate, &ponder); XtGetValues(w4, args, 1); - // adjust setting in other menu for duplicates + // adjust setting in other menu for duplicates // (perhaps duplicates should be removed from general Option Menu?) XtSetArg(args[0], XtNleftBitmap, ponder ? xMarkPixmap : None); XtSetValues(XtNameToWidget(menuBarWidget, @@ -1179,7 +1229,7 @@ void UciCallback(w, client_data, call_data) // Some changed setting need immediate sending always. PonderNextMoveEvent(ponder); if(oldCores != appData.smpCores) - NewSettingEvent(False, "cores", appData.smpCores); + NewSettingEvent(False, &(first.maxCores), "cores", appData.smpCores); } UciPopDown(); return; @@ -1189,29 +1239,29 @@ void UciCallback(w, client_data, call_data) void UciPopUp() { Arg args[16]; - Widget popup, layout, dialog, edit, form, b_ok, b_cancel, last = NULL, new, upperLeft; + Widget popup, layout, form, b_ok, b_cancel, last = NULL, new, upperLeft; Window root, child; int x, y, i, j; int win_x, win_y; unsigned int mask; - char def[80]; - + char def[MSG_SIZ]; + 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)); - + j = 0; XtSetArg(args[j], XtNtop, XtChainTop); j++; XtSetArg(args[j], XtNbottom, XtChainTop); j++; @@ -1235,11 +1285,12 @@ void UciPopUp() XtSetArg(args[j], XtNright, XtChainRight); j++; XtSetArg(args[j], XtNresizable, True); j++; XtSetArg(args[j], XtNwidth, i&1 ? 245 : 50); j++; + XtSetArg(args[j], XtNinsertPosition, 9999); j++; if(i&1) { - XtSetArg(args[j], XtNstring, * (char**) controlDesc[i].ptr ? + XtSetArg(args[j], XtNstring, * (char**) controlDesc[i].ptr ? * (char**) controlDesc[i].ptr : ""); j++; } else { - sprintf(def, "%d", * (int*) controlDesc[i].ptr); + snprintf(def, MSG_SIZ, "%d", * (int*) controlDesc[i].ptr); XtSetArg(args[j], XtNstring, def); j++; } XtSetArg(args[j], XtNfromHoriz, upperLeft); j++; @@ -1255,7 +1306,7 @@ void UciPopUp() XtSetArg(args[j], XtNleft, XtChainRight); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; XtSetArg(args[j], XtNstate, appData.ponderNextMove); j++; - w4 = XtCreateManagedWidget(_("Ponder"), toggleWidgetClass, form, args, j); + w4 = XtCreateManagedWidget(_("Ponder"), toggleWidgetClass, form, args, j); j=0; XtSetArg(args[j], XtNfromVert, last); j++; @@ -1263,41 +1314,41 @@ void UciPopUp() XtSetArg(args[j], XtNtop, XtChainBottom); j++; XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNright, XtChainLeft); j++; - b_ok = XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j); + b_ok = XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j); XtAddCallback(b_ok, XtNcallback, UciCallback, (XtPointer) 0); XtSetArg(args[j], XtNfromHoriz, b_ok); j++; - b_cancel = XtCreateManagedWidget(_("cancel"), commandWidgetClass, form, args, j); + b_cancel = XtCreateManagedWidget(_("cancel"), commandWidgetClass, form, args, j); XtAddCallback(b_cancel, XtNcallback, UciPopDown, (XtPointer) 0); j = 5; XtSetArg(args[j], XtNfromHoriz, upperLeft); j++; XtSetArg(args[j], XtNstate, appData.usePolyglotBook); j++; - w1 = XtCreateManagedWidget(_(" use book "), toggleWidgetClass, form, args, j); + w1 = XtCreateManagedWidget(_(" use book "), toggleWidgetClass, form, args, j); // XtAddCallback(w1, XtNcallback, UciCallback, (XtPointer) 0); j = 5; XtSetArg(args[j], XtNfromHoriz, w1); j++; XtSetArg(args[j], XtNstate, appData.firstHasOwnBookUCI); j++; - w2 = XtCreateManagedWidget(_("own book 1"), toggleWidgetClass, form, args, j); + w2 = XtCreateManagedWidget(_("own book 1"), toggleWidgetClass, form, args, j); // XtAddCallback(w2, XtNcallback, UciCallback, (XtPointer) 0); j = 5; XtSetArg(args[j], XtNfromHoriz, w2); j++; XtSetArg(args[j], XtNstate, appData.secondHasOwnBookUCI); j++; - w3 = XtCreateManagedWidget(_("own book 2"), toggleWidgetClass, form, args, j); + w3 = XtCreateManagedWidget(_("own book 2"), toggleWidgetClass, form, args, j); // XtAddCallback(w3, XtNcallback, UciCallback, (XtPointer) 0); XtRealizeWidget(popup); 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); XtSetValues(popup, args, 2); - + XtPopup(popup, XtGrabExclusive); UciUp = True; @@ -1325,6 +1376,7 @@ ChessProgramState *currentCps; void SettingsPopDown() { if (!SettingsUp) return; + previous = NULL; XtPopdown(SettingsShell); XtDestroyWidget(SettingsShell); SettingsUp = False; @@ -1336,27 +1388,27 @@ void SpinCallback(w, client_data, call_data) XtPointer client_data, call_data; { String name, val; - Widget w2; Arg args[16]; char buf[MSG_SIZ]; - int i, j; - + int j; + int data = (intptr_t) client_data; + XtSetArg(args[0], XtNlabel, &name); XtGetValues(w, args, 1); - + j = 0; XtSetArg(args[0], XtNstring, &val); - XtGetValues(currentCps->option[(int)client_data].handle, args, 1); + XtGetValues(currentCps->option[data].handle, args, 1); sscanf(val, "%d", &j); if (strcmp(name, "+") == 0) { - if(++j > currentCps->option[(int)client_data].max) return; + if(++j > currentCps->option[data].max) return; } else if (strcmp(name, "-") == 0) { - if(--j < currentCps->option[(int)client_data].min) return; + if(--j < currentCps->option[data].min) return; } else return; - sprintf(buf, "%d", j); + snprintf(buf, MSG_SIZ, "%d", j); XtSetArg(args[0], XtNstring, buf); - XtSetValues(currentCps->option[(int)client_data].handle, args, 1); + XtSetValues(currentCps->option[data].handle, args, 1); } void SettingsCallback(w, client_data, call_data) @@ -1364,30 +1416,28 @@ void SettingsCallback(w, client_data, call_data) XtPointer client_data, call_data; { String name, val; - Widget w2; Arg args[16]; char buf[MSG_SIZ]; int i, j; - + int data = (intptr_t) client_data; + XtSetArg(args[0], XtNlabel, &name); XtGetValues(w, args, 1); - + if (strcmp(name, _("cancel")) == 0) { SettingsPopDown(); return; } - if (strcmp(name, _("OK")) == 0 || (int)client_data) { // save buttons imply OK - int nr; - + if (strcmp(name, _("OK")) == 0 || data) { // save buttons imply OK for(i=0; inrOptions; i++) { // send all options that had to be OK-ed to engine switch(currentCps->option[i].type) { case TextBox: XtSetArg(args[0], XtNstring, &val); XtGetValues(currentCps->option[i].handle, args, 1); if(strcmp(currentCps->option[i].textValue, val)) { - strcpy(currentCps->option[i].textValue, val); - sprintf(buf, "option %s=%s\n", currentCps->option[i].name, val); - SendToProgram(buf, currentCps); + safeStrCpy(currentCps->option[i].textValue, val, MSG_SIZ - (currentCps->option[i].textValue - currentCps->option[i].name) ); + snprintf(buf, MSG_SIZ, "option %s=%s\n", currentCps->option[i].name, val); + SendToProgram(buf, currentCps); } break; case Spin: @@ -1398,7 +1448,7 @@ void SettingsCallback(w, client_data, call_data) if(j < currentCps->option[i].min) j = currentCps->option[i].min; if(currentCps->option[i].value != j) { currentCps->option[i].value = j; - sprintf(buf, "option %s=%d\n", currentCps->option[i].name, j); + snprintf(buf, MSG_SIZ, "option %s=%d\n", currentCps->option[i].name, j); SendToProgram(buf, currentCps); } break; @@ -1408,28 +1458,32 @@ void SettingsCallback(w, client_data, call_data) XtGetValues(currentCps->option[i].handle, args, 1); if(currentCps->option[i].value != j) { currentCps->option[i].value = j; - sprintf(buf, "option %s=%d\n", currentCps->option[i].name, j); + snprintf(buf, MSG_SIZ, "option %s=%d\n", currentCps->option[i].name, j); SendToProgram(buf, currentCps); } break; case ComboBox: if(currentCps->option[i].value != values[i]) { currentCps->option[i].value = values[i]; - sprintf(buf, "option %s=%s\n", currentCps->option[i].name, + snprintf(buf, MSG_SIZ, "option %s=%s\n", currentCps->option[i].name, ((char**)currentCps->option[i].textValue)[values[i]]); SendToProgram(buf, currentCps); } break; + default: + if( appData.debugMode ) + fprintf(debugFP, "SettingsPopUp: unexpected case in switch.\n"); + break; } } - if((int)client_data) { // send save-button command to engine - sprintf(buf, "option %s\n", name); - SendToProgram(buf, currentCps); + if(data) { // send save-button command to engine + snprintf(buf, MSG_SIZ, "option %s\n", name); + SendToProgram(buf, currentCps); } SettingsPopDown(); return; } - sprintf(buf, "option %s\n", name); + snprintf(buf, MSG_SIZ, "option %s\n", name); SendToProgram(buf, currentCps); } @@ -1439,8 +1493,8 @@ void ComboSelect(w, addr, index) // callback for all combo items caddr_t index; { Arg args[16]; - int i = ((int)addr)>>8; - int j = 255 & (int) addr; + int i = ((intptr_t)addr)>>8; + int j = 255 & (intptr_t) addr; values[i] = j; // store in temporary, for transfer at OK XtSetArg(args[0], XtNlabel, ((char**)currentCps->option[i].textValue)[j]); @@ -1467,21 +1521,23 @@ void CreateComboPopup(parent, name, n, mb) menu, args, j); XtAddCallback(entry, XtNcallback, (XtCallbackProc) ComboSelect, - (caddr_t) (256*n+i)); + (caddr_t)(intptr_t) (256*n+i)); i++; } -} +} -void SettingsPopUp(ChessProgramState *cps) +void +SettingsPopUp(ChessProgramState *cps) { Arg args[16]; - Widget popup, layout, dialog, edit=NULL, form, oldform, last, b_ok, b_cancel, leftMargin = NULL; + Widget popup, layout, dialog, edit=NULL, form, last, b_ok, b_cancel, leftMargin = NULL, textField = NULL; Window root, child; int x, y, i, j, height, width, h, c; - int win_x, win_y; + int win_x, win_y, maxWidth, maxTextWidth; unsigned int mask; - char def[80], *p, *q; + char def[MSG_SIZ]; static char pane[6] = "paneX"; + Widget texts[100], forelast = NULL, anchor, widest; // to do: start up second engine if needed if(!cps->initDone || !cps->nrOptions) return; // nothing to be done @@ -1494,7 +1550,7 @@ void SettingsPopUp(ChessProgramState *cps) SettingsShell = popup = XtCreatePopupShell(_("Settings Menu"), transientShellWidgetClass, shellWidget, args, i); - + layout = XtCreateManagedWidget(layoutName, formWidgetClass, popup, layoutArgs, XtNumber(layoutArgs)); @@ -1507,34 +1563,37 @@ void SettingsPopUp(ChessProgramState *cps) XtSetArg(args[j], XtNfromHoriz, leftMargin); j++; XtSetValues(form, args, j); leftMargin = form; - - last = NULL; + + last = widest = NULL; anchor = forelast; for(h=0; h= cps->nrOptions) break; switch(cps->option[i].type) { case Spin: - sprintf(def, "%d", cps->option[i].value); + snprintf(def, MSG_SIZ, "%d", cps->option[i].value); case TextBox: j=0; XtSetArg(args[j], XtNfromVert, last); j++; XtSetArg(args[j], XtNborderWidth, 0); j++; XtSetArg(args[j], XtNjustify, XtJustifyLeft); j++; - dialog = XtCreateManagedWidget(cps->option[i].name, labelWidgetClass, form, args, j); + texts[h] = + dialog = XtCreateManagedWidget(cps->option[i].name, labelWidgetClass, form, args, j); j=0; XtSetArg(args[j], XtNfromVert, last); j++; XtSetArg(args[j], XtNfromHoriz, dialog); j++; XtSetArg(args[j], XtNborderWidth, 1); j++; - XtSetArg(args[j], XtNwidth, cps->option[i].type == Spin ? 40 : 100); j++; + XtSetArg(args[j], XtNwidth, cps->option[i].type == Spin ? 40 : 175); j++; XtSetArg(args[j], XtNeditType, XawtextEdit); j++; XtSetArg(args[j], XtNuseStringInPlace, False); j++; XtSetArg(args[j], XtNdisplayCaret, False); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; XtSetArg(args[j], XtNresizable, True); j++; XtSetArg(args[j], XtNstring, cps->option[i].type==Spin ? def : cps->option[i].textValue); j++; + XtSetArg(args[j], XtNinsertPosition, 9999); j++; edit = last; cps->option[i].handle = (void*) - (last = XtCreateManagedWidget("text", asciiTextWidgetClass, form, args, j)); + (textField = last = XtCreateManagedWidget("text", asciiTextWidgetClass, form, args, j)); XtAddEventHandler(last, ButtonPressMask, False, SetFocus, (XtPointer) popup); if(cps->option[i].type == TextBox) break; @@ -1545,7 +1604,8 @@ void SettingsPopUp(ChessProgramState *cps) XtSetArg(args[j], XtNheight, 10); j++; XtSetArg(args[j], XtNwidth, 20); j++; edit = XtCreateManagedWidget("+", commandWidgetClass, form, args, j); - XtAddCallback(edit, XtNcallback, SpinCallback, (XtPointer) i); + XtAddCallback(edit, XtNcallback, SpinCallback, + (XtPointer)(intptr_t) i); j=0; XtSetArg(args[j], XtNfromVert, edit); j++; @@ -1553,7 +1613,8 @@ void SettingsPopUp(ChessProgramState *cps) XtSetArg(args[j], XtNheight, 10); j++; XtSetArg(args[j], XtNwidth, 20); j++; last = XtCreateManagedWidget("-", commandWidgetClass, form, args, j); - XtAddCallback(last, XtNcallback, SpinCallback, (XtPointer) i); + XtAddCallback(last, XtNcallback, SpinCallback, + (XtPointer)(intptr_t) i); break; case CheckBox: j=0; @@ -1561,8 +1622,8 @@ void SettingsPopUp(ChessProgramState *cps) XtSetArg(args[j], XtNwidth, 10); j++; XtSetArg(args[j], XtNheight, 10); j++; XtSetArg(args[j], XtNstate, cps->option[i].value); j++; - cps->option[i].handle = (void*) - (dialog = XtCreateManagedWidget(" ", toggleWidgetClass, form, args, j)); + cps->option[i].handle = (void*) + (dialog = XtCreateManagedWidget(" ", toggleWidgetClass, form, args, j)); j=0; XtSetArg(args[j], XtNfromVert, last); j++; XtSetArg(args[j], XtNfromHoriz, dialog); j++; @@ -1575,9 +1636,10 @@ void SettingsPopUp(ChessProgramState *cps) j=0; XtSetArg(args[j], XtNfromVert, last); j++; XtSetArg(args[j], XtNstate, cps->option[i].value); j++; - cps->option[i].handle = (void*) - (last = XtCreateManagedWidget(cps->option[i].name, commandWidgetClass, form, args, j)); - XtAddCallback(last, XtNcallback, SettingsCallback, (XtPointer) (cps->option[i].type == SaveButton)); + cps->option[i].handle = (void*) + (dialog = last = XtCreateManagedWidget(cps->option[i].name, commandWidgetClass, form, args, j)); + XtAddCallback(last, XtNcallback, SettingsCallback, + (XtPointer)(intptr_t) (cps->option[i].type == SaveButton)); break; case ComboBox: j=0; @@ -1592,42 +1654,83 @@ void SettingsPopUp(ChessProgramState *cps) XtSetArg(args[j], XtNwidth, 100); j++; XtSetArg(args[j], XtNmenuName, XtNewString(cps->option[i].name)); j++; XtSetArg(args[j], XtNlabel, ((char**)cps->option[i].textValue)[cps->option[i].value]); j++; - cps->option[i].handle = (void*) - (last = XtCreateManagedWidget(" ", menuButtonWidgetClass, form, args, j)); + cps->option[i].handle = (void*) + (last = XtCreateManagedWidget(" ", menuButtonWidgetClass, form, args, j)); CreateComboPopup(last, cps->option[i].name, i, (char **) cps->option[i].textValue); values[i] = cps->option[i].value; break; + default: + if( appData.debugMode ) + fprintf(debugFP, "SettingsPopUp: unexpected case in switch.\n"); + break; + } + } + + // make an attempt to align all spins and textbox controls + maxWidth = maxTextWidth = 0; + for(h=0; h= cps->nrOptions) break; + if(cps->option[i].type == Spin || cps->option[i].type == TextBox) { + Dimension w; + j=0; + XtSetArg(args[j], XtNwidth, &w); j++; + XtGetValues(texts[h], args, j); + if(cps->option[i].type == Spin) { + if(w > maxWidth) maxWidth = w; + widest = texts[h]; + } else { + if(w > maxTextWidth) maxTextWidth = w; + if(!widest) widest = texts[h]; + } + } + } + if(maxTextWidth + 110 < maxWidth) + maxTextWidth = maxWidth - 110; + else maxWidth = maxTextWidth + 110; + for(h=0; h= cps->nrOptions) break; + j=0; + if(cps->option[i].type == Spin) { + XtSetArg(args[j], XtNwidth, maxWidth); j++; + XtSetValues(texts[h], args, j); + } else + if(cps->option[i].type == TextBox) { + XtSetArg(args[j], XtNwidth, maxTextWidth); j++; + XtSetValues(texts[h], args, j); } } } j=0; - XtSetArg(args[j], XtNfromVert, last); j++; + XtSetArg(args[j], XtNfromVert, anchor ? anchor : last); 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_ok = XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j); + XtSetArg(args[j], XtNleft, XtChainRight); j++; + XtSetArg(args[j], XtNright, XtChainRight); j++; + XtSetArg(args[j], XtNfromHoriz, widest ? widest : dialog); j++; + b_ok = XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j); XtAddCallback(b_ok, XtNcallback, SettingsCallback, (XtPointer) 0); - XtSetArg(args[j], XtNfromHoriz, b_ok); j++; - b_cancel = XtCreateManagedWidget(_("cancel"), commandWidgetClass, form, args, j); + XtSetArg(args[j-1], XtNfromHoriz, b_ok); + b_cancel = XtCreateManagedWidget(_("cancel"), commandWidgetClass, form, args, j); XtAddCallback(b_cancel, XtNcallback, SettingsPopDown, (XtPointer) 0); XtRealizeWidget(popup); 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); XtSetValues(popup, args, 2); - + XtPopup(popup, XtGrabExclusive); SettingsUp = True; previous = NULL; - if(edit)SetFocus(edit, popup, (XEvent*) NULL, False); + if(textField)SetFocus(textField, popup, (XEvent*) NULL, False); } void FirstSettingsProc(w, event, prms, nprms) @@ -1645,6 +1748,7 @@ void SecondSettingsProc(w, event, prms, nprms) String *prms; Cardinal *nprms; { + if(WaitForSecond(SettingsMenuIfReady)) return; SettingsPopUp(&second); }