static Option matchOptions[] = {
{ 0, 0, 0, NULL, (void*) &tfName, ".trn", NULL, FileName, N_("Tournament file:") },
-{ 0, 0, 0, NULL, (void*) &appData.roundSync, "", NULL, CheckBox, N_("Sync after round (for concurrent playing of a single") },
-{ 0, 0, 0, NULL, (void*) &appData.cycleSync, "", NULL, CheckBox, N_("Sync after cycle tourney with multiple XBoards)") },
+{ 0, 0, 0, NULL, (void*) &appData.roundSync, "", NULL, CheckBox, N_("Sync after round") },
+{ 0, SAME_ROW|LL, 0, NULL, NULL, "", NULL, Label, N_(" (for concurrent playing of a single") },
+{ 0, 0, 0, NULL, (void*) &appData.cycleSync, "", NULL, CheckBox, N_("Sync after cycle") },
+{ 0, SAME_ROW|LL, 0, NULL, NULL, "", NULL, Label, N_(" tourney with multiple XBoards)") },
{ 150, T_VSCRL | T_FILL | T_WRAP,
0, NULL, (void*) &engineName, "", NULL, TextBox, N_("Tourney participants:") },
{ 0, COMBO_CALLBACK | NO_GETTEXT,
static void
ReplaceParticipant ()
{
- GenericReadout(matchOptions, 3);
+ GenericReadout(matchOptions, 5);
Substitute(strdup(engineName), True);
}
static void
UpgradeParticipant ()
{
- GenericReadout(matchOptions, 3);
+ GenericReadout(matchOptions, 5);
Substitute(strdup(engineName), False);
}
static void
AddToTourney (int n)
{
- AddLine(&matchOptions[3], engineMnemonic[values[4]+1]);
+ AddLine(&matchOptions[5], engineMnemonic[values[6]+1]);
}
void
MatchOptionsProc ()
{
NamesToList(firstChessProgramNames, engineList, engineMnemonic, "all");
- matchOptions[5].min = -(appData.pairingEngine[0] != NULLCHAR); // with pairing engine, allow Swiss
+ matchOptions[7].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"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(matchOptions, _("Match Options"), TransientDlg, BoardWindow, MODAL, 0);
}
// ------------------------------------------- General Options --------------------------------------------------
{ 0, 0, 0, NULL, (void*) &appData.markers, "", NULL, CheckBox, N_("Show Target Squares") },
{ 0, 0, 0, NULL, (void*) &appData.useStickyWindows, "", NULL, CheckBox, N_("Sticky Windows") },
{ 0, 0, 0, NULL, (void*) &appData.testLegality, "", NULL, CheckBox, N_("Test Legality") },
+{ 0, 0, 0, NULL, (void*) &appData.topLevel, "", NULL, CheckBox, N_("Top-Level Dialogs") },
{ 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):") },
{
oldPonder = appData.ponderNextMove;
oldShow = appData.showCoords; oldBlind = appData.blindfold;
- GenericPopUp(generalOptions, _("General Options"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(generalOptions, _("General Options"), TransientDlg, BoardWindow, MODAL, 0);
}
//---------------------------------------------- New Variant ------------------------------------------------
void
NewVariantProc ()
{
- GenericPopUp(variantDescriptors, _("New Variant"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(variantDescriptors, _("New Variant"), TransientDlg, BoardWindow, MODAL, 0);
}
//------------------------------------------- Common Engine Options -------------------------------------
{
oldCores = appData.smpCores;
oldPonder = appData.ponderNextMove;
- GenericPopUp(commonEngineOptions, _("Common Engine Settings"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(commonEngineOptions, _("Common Engine Settings"), TransientDlg, BoardWindow, MODAL, 0);
}
//------------------------------------------ Adjudication Options --------------------------------------
void
EngineMenuProc ()
{
- GenericPopUp(adjudicationOptions, _("Adjudicate non-ICS Games"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(adjudicationOptions, _("Adjudicate non-ICS Games"), TransientDlg, BoardWindow, MODAL, 0);
}
//--------------------------------------------- ICS Options ---------------------------------------------
void
IcsOptionsProc ()
{
- GenericPopUp(icsOptions, _("ICS Options"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(icsOptions, _("ICS Options"), TransientDlg, BoardWindow, MODAL, 0);
}
//-------------------------------------------- Load Game Options ---------------------------------
};
void
-LoadOptionsProc ()
+LoadOptionsPopUp (DialogClass parent)
{
ASSIGN(searchMode, modeValues[appData.searchMode-1]);
- GenericPopUp(loadOptions, _("Load Game Options"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(loadOptions, _("Load Game Options"), TransientDlg, parent, MODAL, 0);
+}
+
+void
+LoadOptionsProc ()
+{ // called from menu
+ LoadOptionsPopUp(BoardWindow);
}
//------------------------------------------- Save Game Options --------------------------------------------
void
SaveOptionsProc ()
{
- GenericPopUp(saveOptions, _("Save Game Options"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(saveOptions, _("Save Game Options"), TransientDlg, BoardWindow, MODAL, 0);
}
//----------------------------------------------- Sound Options ---------------------------------------------
{
free(soundFiles[2]);
soundFiles[2] = strdup("*");
- GenericPopUp(soundOptions, _("Sound Options"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(soundOptions, _("Sound Options"), TransientDlg, BoardWindow, MODAL, 0);
}
//--------------------------------------------- Board Options --------------------------------------
void
BoardOptionsProc ()
{
- GenericPopUp(boardOptions, _("Board Options"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(boardOptions, _("Board Options"), TransientDlg, BoardWindow, MODAL, 0);
}
//-------------------------------------------- ICS Text Menu Options ------------------------------
textOptions[i].target = NULL;
textOptions[i].min = 2;
MarkMenu("ICStex", TextMenuDlg);
- GenericPopUp(textOptions, _("ICS text menu"), TextMenuDlg, BoardWindow, NONMODAL);
+ GenericPopUp(textOptions, _("ICS text menu"), TextMenuDlg, BoardWindow, NONMODAL, 1);
}
//---------------------------------------------------- Edit Comment -----------------------------------
if(commentText) free(commentText); commentText = strdup(text);
commentIndex = index;
MarkMenu("Show Comments", CommentDlg);
- if(GenericPopUp(commentOptions, title, CommentDlg, BoardWindow, NONMODAL))
+ if(GenericPopUp(commentOptions, title, CommentDlg, BoardWindow, NONMODAL, 1))
AddHandler(&commentOptions[0], 1);
}
if(tagsText) free(tagsText); tagsText = strdup(text);
tagsOptions[0].name = msg;
MarkMenu("Show Tags", TagsDlg);
- GenericPopUp(tagsOptions, title, TagsDlg, BoardWindow, NONMODAL);
+ GenericPopUp(tagsOptions, title, TagsDlg, BoardWindow, NONMODAL, 1);
}
//---------------------------------------------- ICS Input Box ----------------------------------
ICSInputBoxPopUp ()
{
MarkMenu("ICS Input Box", InputBoxDlg);
- if(GenericPopUp(boxOptions, _("ICS input box"), InputBoxDlg, BoardWindow, NONMODAL))
+ if(GenericPopUp(boxOptions, _("ICS input box"), InputBoxDlg, BoardWindow, NONMODAL, 0))
AddHandler(&boxOptions[0], 3);
}
{
static char buf[2];
buf[0] = firstchar; ASSIGN(icsText, buf);
- if(GenericPopUp(typeOptions, _("Type a move"), TransientDlg, BoardWindow, MODAL))
+ if(GenericPopUp(typeOptions, _("Type a move"), TransientDlg, BoardWindow, MODAL, 0))
AddHandler(&typeOptions[0], 2);
}
SettingsPopUp (ChessProgramState *cps)
{
currentCps = cps;
- GenericPopUp(cps->option, _("Engine Settings"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(cps->option, _("Engine Settings"), TransientDlg, BoardWindow, MODAL, 0);
}
void
if(nickName) free(nickName); nickName = strdup("");
if(params) free(params); params = strdup("");
NamesToList(firstChessProgramNames, engineList, engineMnemonic, "all");
- GenericPopUp(installOptions, _("Load engine"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(installOptions, _("Load engine"), TransientDlg, BoardWindow, MODAL, 0);
}
//----------------------------------------------------- Edit Book -----------------------------------------
void
ShuffleMenuProc ()
{
- GenericPopUp(shuffleOptions, _("New Shuffle Game"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(shuffleOptions, _("New Shuffle Game"), TransientDlg, BoardWindow, MODAL, 0);
}
//------------------------------------------------------ Time Control -----------------------------------
tmpInc = appData.timeIncrement; if(tmpInc < 0) tmpInc = 0;
tmpOdds1 = tmpOdds2 = 1; tcType = 0;
tmpTc = atoi(appData.timeControl);
- GenericPopUp(tcOptions, _("Time Control"), TransientDlg, BoardWindow, MODAL);
+ GenericPopUp(tcOptions, _("Time Control"), TransientDlg, BoardWindow, MODAL, 0);
}
//------------------------------- Ask Question -----------------------------------------
pendingReplyPR = pr;
ASSIGN(answer, "");
askOptions[0].name = question;
- if(GenericPopUp(askOptions, title, AskDlg, BoardWindow, MODAL))
+ if(GenericPopUp(askOptions, title, AskDlg, BoardWindow, MODAL, 0))
AddHandler(&askOptions[1], 2);
}
SetPromo(_("Defer"), --count, '=');
SetPromo(_("Promote"), --count, '+');
}
- GenericPopUp(promoOptions + count, "Promotion", PromoDlg, BoardWindow, NONMODAL);
+ GenericPopUp(promoOptions + count, "Promotion", PromoDlg, BoardWindow, NONMODAL, 0);
}
//---------------------------- Chat Windows ----------------------------------------------
return; // dummy
}
-//----------------------------- Various display boxes -----------------------------
+//--------------------------------- Game-List options dialog ------------------------------------------
+
+char *strings[LPUSERGLT_SIZE];
+int stringPtr;
+
+void
+GLT_ClearList ()
+{
+ strings[0] = NULL;
+ stringPtr = 0;
+}
+
+void
+GLT_AddToList (char *name)
+{
+ strings[stringPtr++] = name;
+ strings[stringPtr] = NULL;
+}
+
+Boolean
+GLT_GetFromList (int index, char *name)
+{
+ safeStrCpy(name, strings[index], MSG_SIZ);
+ return TRUE;
+}
+
+void
+GLT_DeSelectList ()
+{
+}
+
+static void GLT_Button P((int n));
+static int GLT_OK P((int n));
+
+static Option listOptions[] = {
+{ 0, LR|TB, 200, NULL, (void*) strings, "", NULL, ListBox, "" },
+{ 0, 0, 0, NULL, (void*) &GLT_Button, NULL, NULL, Button, N_("factory") },
+{ 0, SAME_ROW, 0, NULL, (void*) &GLT_Button, NULL, NULL, Button, N_("up") },
+{ 0, SAME_ROW, 0, NULL, (void*) &GLT_Button, NULL, NULL, Button, N_("down") },
+{ 0, SAME_ROW, 0, NULL, (void*) &GLT_OK, "", NULL, EndMark , "" }
+};
+
+static int
+GLT_OK (int n)
+{
+ GLT_ParseList();
+ appData.gameListTags = strdup(lpUserGLT);
+ return 1;
+}
+
+static void
+GLT_Button (int n)
+{
+ int index = SelectedListBoxItem (&listOptions[0]);
+ char *p;
+ if (index < 0) {
+ DisplayError(_("No tag selected"), 0);
+ return;
+ }
+ p = strings[index];
+ if (n == 3) {
+ if(index >= strlen(GLT_ALL_TAGS)) return;
+ strings[index] = strings[index+1];
+ strings[++index] = p;
+ } else
+ if (n == 2) {
+ if(index == 0) return;
+ strings[index] = strings[index-1];
+ strings[--index] = p;
+ } else
+ if (n == 1) {
+ safeStrCpy(lpUserGLT, GLT_DEFAULT_TAGS, LPUSERGLT_SIZE);
+ GLT_TagsToList(lpUserGLT);
+ index = 0;
+ LoadListBox(&listOptions[0], "?"); // Note: the others don't need this, as the highlight switching redraws the change items
+ }
+ HighlightListBoxItem(&listOptions[0], index);
+}
+
+void
+GameListOptionsPopUp (DialogClass parent)
+{
+ safeStrCpy(lpUserGLT, appData.gameListTags, LPUSERGLT_SIZE);
+ GLT_TagsToList(lpUserGLT);
+
+ GenericPopUp(listOptions, _("Game-list options"), TransientDlg, parent, MODAL, 0);
+}
+
+void
+GameListOptionsProc ()
+{
+ GameListOptionsPopUp(BoardWindow);
+}
+
+//----------------------------- Error popup in various uses -----------------------------
+
+/*
+ * [HGM] Note:
+ * XBoard has always had some pathologic behavior with multiple simultaneous error popups,
+ * (which can occur even for modal popups when asynchrounous events, e.g. caused by engine, request a popup),
+ * and this new implementation reproduces that as well:
+ * Only the shell of the last instance is remembered in shells[ErrorDlg] (which replaces errorShell),
+ * so that PopDowns ordered from the code always refer to that instance, and once that is down,
+ * have no clue as to how to reach the others. For the Delete Window button calling PopDown this
+ * has now been repaired, as the action routine assigned to it gets the shell passed as argument.
+ */
+
+int errorUp = False;
+
+void
+ErrorPopDown ()
+{
+ if (!errorUp) return;
+ dialogError = errorUp = False;
+ PopDown(ErrorDlg); PopDown(FatalDlg); // on explicit request we pop down any error dialog
+ if (errorExitStatus != -1) ExitEvent(errorExitStatus);
+}
+
+static int
+ErrorOK (int n)
+{
+ dialogError = errorUp = False;
+ PopDown(n == 1 ? FatalDlg : ErrorDlg); // kludge: non-modal dialogs have one less (dummy) option
+ if (errorExitStatus != -1) ExitEvent(errorExitStatus);
+ return FALSE; // prevent second Popdown !
+}
+
+static Option errorOptions[] = {
+{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, NULL }, // dummy option: will never be displayed
+{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, NULL }, // textValue field will be set before popup
+{ 0,NO_CANCEL,0, NULL, (void*) &ErrorOK, "", NULL, EndMark , "" }
+};
+
+void
+ErrorPopUp (char *title, char *label, int modal)
+{
+ errorUp = True;
+ errorOptions[1].name = label;
+ if(dialogError = shellUp[TransientDlg])
+ GenericPopUp(errorOptions+1, title, FatalDlg, TransientDlg, MODAL, 0); // pop up as daughter of the transient dialog
+ else
+ GenericPopUp(errorOptions+modal, title, modal ? FatalDlg: ErrorDlg, BoardWindow, modal, 0); // kludge: option start address indicates modality
+}
void
DisplayError (String message, int error)
projects / xboard.git / blobdiff