X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=b6abd82f8e4a07caba4b294419db7a94d90bf224;hb=c0d0ea91773838e5d11c3cd3b407fea251058c34;hp=a2af38b7584de0ba57055f8f06eda0fcc2d9f489;hpb=4dc77c6e72e3ec99cd8a57c9442b7511c47d3dca;p=xboard.git diff --git a/dialogs.c b/dialogs.c index a2af38b..b6abd82 100644 --- a/dialogs.c +++ b/dialogs.c @@ -235,9 +235,9 @@ GenericReadout (Option *opts, int selected) //------------------------------------------- Match Options ------------------------------------------------------ char *engineName, *engineChoice, *tfName; -char *engineList[MAXENGINES] = {" "}, *engineMnemonic[MAXENGINES] = {""}; +char *engineList[MAXENGINES] = {" "}, *engineMnemonic[MAXENGINES]; -static void AddToTourney P((int n)); +static void AddToTourney P((int n, int sel)); static void CloneTourney P((void)); static void ReplaceParticipant P((void)); static void UpgradeParticipant P((void)); @@ -254,20 +254,26 @@ MatchOK (int n) 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)") }, +{ 0, LR, 200, NULL, NULL, "", NULL, Label, N_("Tourney participants:") }, +{ 0, SAME_ROW|RR, 0, NULL, NULL, "", NULL, Label, N_("Select Engine:") }, { 150, T_VSCRL | T_FILL | T_WRAP, - 0, NULL, (void*) &engineName, "", NULL, TextBox, N_("Tourney participants:") }, -{ 0, COMBO_CALLBACK | NO_GETTEXT, - 0, NULL, (void*) &AddToTourney, (char*) (engineMnemonic+1), (engineMnemonic+1), ComboBox, N_("Select Engine:") }, + 175, NULL, (void*) &engineName, "", NULL, TextBox, "" }, +{ 150, SAME_ROW|RR, + 175, NULL, (void*) engineMnemonic, (char*) &AddToTourney, NULL, ListBox, "" }, +//{ 0, COMBO_CALLBACK | NO_GETTEXT, +// 0, NULL, (void*) &AddToTourney, (char*) (engineMnemonic+1), (engineMnemonic+1), ComboBox, N_("Select Engine:") }, { 0, 0, 10, NULL, (void*) &appData.tourneyType, "", NULL, Spin, N_("Tourney type (0 = round-robin, 1 = gauntlet):") }, { 0, 1, 1000000000, NULL, (void*) &appData.tourneyCycles, "", NULL, Spin, N_("Number of tourney cycles (or Swiss rounds):") }, { 0, 1, 1000000000, NULL, (void*) &appData.defaultMatchGames, "", NULL, Spin, N_("Default Number of Games in Match (or Pairing):") }, { 0, 0, 1000000000, NULL, (void*) &appData.matchPause, "", NULL, Spin, N_("Pause between Match Games (msec):") }, -{ 0, 0, 0, NULL, (void*) &appData.saveGameFile, ".pgn", NULL, FileName, N_("Save Tourney Games on:") }, -{ 0, 0, 0, NULL, (void*) &appData.loadGameFile, ".pgn", NULL, FileName, N_("Game File with Opening Lines:") }, +{ 0, 0, 0, NULL, (void*) &appData.saveGameFile, ".pgn .game", NULL, FileName, N_("Save Tourney Games on:") }, +{ 0, 0, 0, NULL, (void*) &appData.loadGameFile, ".pgn .game", NULL, FileName, N_("Game File with Opening Lines:") }, { 0, -2, 1000000000, NULL, (void*) &appData.loadGameIndex, "", NULL, Spin, N_("Game Number (-1 or -2 = Auto-Increment):") }, -{ 0, 0, 0, NULL, (void*) &appData.loadPositionFile, ".fen", NULL, FileName, N_("File with Start Positions:") }, +{ 0, 0, 0, NULL, (void*) &appData.loadPositionFile, ".fen .epd .pos", 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*) &appData.defNoBook, "", NULL, CheckBox, N_("Disable own engine books by default") }, @@ -280,14 +286,14 @@ static Option matchOptions[] = { static void ReplaceParticipant () { - GenericReadout(matchOptions, 3); + GenericReadout(matchOptions, 7); Substitute(strdup(engineName), True); } static void UpgradeParticipant () { - GenericReadout(matchOptions, 3); + GenericReadout(matchOptions, 7); Substitute(strdup(engineName), False); } @@ -307,19 +313,31 @@ CloneTourney () } static void -AddToTourney (int n) +AddToTourney (int n, int sel) { - AddLine(&matchOptions[3], engineMnemonic[values[4]+1]); + int nr; + char buf[MSG_SIZ]; + if(sel < 1) buf[0] = NULLCHAR; // back to top level + else if(engineList[sel][0] == '#') safeStrCpy(buf, engineList[sel], MSG_SIZ); // group header, open group + else { // normal line, select engine + AddLine(&matchOptions[7], engineMnemonic[sel]); + return; + } + nr = NamesToList(firstChessProgramNames, engineList, engineMnemonic, buf); // replace list by only the group contents + ASSIGN(engineMnemonic[0], buf); + LoadListBox(&matchOptions[8], _("# no engines are installed")); + HighlightWithScroll(&matchOptions[8], 0, nr); } void MatchOptionsProc () { - NamesToList(firstChessProgramNames, engineList, engineMnemonic, "all"); - matchOptions[5].min = -(appData.pairingEngine[0] != NULLCHAR); // with pairing engine, allow Swiss + NamesToList(firstChessProgramNames, engineList, engineMnemonic, ""); + matchOptions[9].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); + ASSIGN(engineMnemonic[0], ""); + GenericPopUp(matchOptions, _("Match Options"), TransientDlg, BoardWindow, MODAL, 0); } // ------------------------------------------- General Options -------------------------------------------------- @@ -360,6 +378,7 @@ static Option generalOptions[] = { { 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):") }, @@ -372,14 +391,17 @@ OptionsProc () { 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 ------------------------------------------------ static void Pick P((int n)); +static char warning[MSG_SIZ]; + static Option variantDescriptors[] = { +{ 0, 0, 275, NULL, NULL, NULL, NULL, Label, warning }, { VariantNormal, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Button, N_("normal")}, { VariantFairy, SAME_ROW, 135, NULL, (void*) &Pick, "#BFBFBF", NULL, Button, N_("fairy")}, { VariantFischeRandom, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Button, N_("FRC")}, @@ -460,7 +482,8 @@ Pick (int n) void NewVariantProc () { - GenericPopUp(variantDescriptors, _("New Variant"), TransientDlg, BoardWindow, MODAL); + sprintf(warning, _("All variants not supported by first engine\n(currently %s) are disabled"), first.tidy); + GenericPopUp(variantDescriptors, _("New Variant"), TransientDlg, BoardWindow, MODAL, 0); } //------------------------------------------- Common Engine Options ------------------------------------- @@ -504,7 +527,7 @@ UciMenuProc () { 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 -------------------------------------- @@ -526,7 +549,7 @@ static Option adjudicationOptions[] = { void EngineMenuProc () { - GenericPopUp(adjudicationOptions, _("Adjudicate non-ICS Games"), TransientDlg, BoardWindow, MODAL); + GenericPopUp(adjudicationOptions, _("Adjudicate non-ICS Games"), TransientDlg, BoardWindow, MODAL, 0); } //--------------------------------------------- ICS Options --------------------------------------------- @@ -574,7 +597,7 @@ Option icsOptions[] = { void IcsOptionsProc () { - GenericPopUp(icsOptions, _("ICS Options"), TransientDlg, BoardWindow, MODAL); + GenericPopUp(icsOptions, _("ICS Options"), TransientDlg, BoardWindow, MODAL, 0); } //-------------------------------------------- Load Game Options --------------------------------- @@ -610,10 +633,16 @@ static Option loadOptions[] = { }; 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 -------------------------------------------- @@ -633,7 +662,7 @@ static Option saveOptions[] = { void SaveOptionsProc () { - GenericPopUp(saveOptions, _("Save Game Options"), TransientDlg, BoardWindow, MODAL); + GenericPopUp(saveOptions, _("Save Game Options"), TransientDlg, BoardWindow, MODAL, 0); } //----------------------------------------------- Sound Options --------------------------------------------- @@ -713,7 +742,7 @@ SoundOptionsProc () { free(soundFiles[2]); soundFiles[2] = strdup("*"); - GenericPopUp(soundOptions, _("Sound Options"), TransientDlg, BoardWindow, MODAL); + GenericPopUp(soundOptions, _("Sound Options"), TransientDlg, BoardWindow, MODAL, 0); } //--------------------------------------------- Board Options -------------------------------------- @@ -830,7 +859,7 @@ AdjustColor (int i) void BoardOptionsProc () { - GenericPopUp(boardOptions, _("Board Options"), TransientDlg, BoardWindow, MODAL); + GenericPopUp(boardOptions, _("Board Options"), TransientDlg, BoardWindow, MODAL, 0); } //-------------------------------------------- ICS Text Menu Options ------------------------------ @@ -881,8 +910,8 @@ IcsTextProc () textOptions[i].type = EndMark; textOptions[i].target = NULL; textOptions[i].min = 2; - MarkMenu("ICStex", TextMenuDlg); - GenericPopUp(textOptions, _("ICS text menu"), TextMenuDlg, BoardWindow, NONMODAL); + MarkMenu("View.ICStextmenu", TextMenuDlg); + GenericPopUp(textOptions, _("ICS text menu"), TextMenuDlg, BoardWindow, NONMODAL, 1); } //---------------------------------------------------- Edit Comment ----------------------------------- @@ -928,8 +957,8 @@ NewCommentPopup (char *title, char *text, int index) } if(commentText) free(commentText); commentText = strdup(text); commentIndex = index; - MarkMenu("Show Comments", CommentDlg); - if(GenericPopUp(commentOptions, title, CommentDlg, BoardWindow, NONMODAL)) + MarkMenu("View.Comments", CommentDlg); + if(GenericPopUp(commentOptions, title, CommentDlg, BoardWindow, NONMODAL, 1)) AddHandler(&commentOptions[0], 1); } @@ -938,8 +967,8 @@ EditCommentProc () { int j; if (PopDown(CommentDlg)) { // popdown succesful - MarkMenuItem("Edit Comment", False); - MarkMenuItem("Show Comments", False); +// MarkMenuItem("Edit.EditComment", False); +// MarkMenuItem("View.Comments", False); } else // was not up EditCommentEvent(); } @@ -982,8 +1011,8 @@ NewTagsPopup (char *text, char *msg) } if(tagsText) free(tagsText); tagsText = strdup(text); tagsOptions[0].name = msg; - MarkMenu("Show Tags", TagsDlg); - GenericPopUp(tagsOptions, title, TagsDlg, BoardWindow, NONMODAL); + MarkMenu("View.Tags", TagsDlg); + GenericPopUp(tagsOptions, title, TagsDlg, BoardWindow, NONMODAL, 1); } //---------------------------------------------- ICS Input Box ---------------------------------- @@ -1088,8 +1117,8 @@ PutText (char *text, int pos) void ICSInputBoxPopUp () { - MarkMenu("ICS Input Box", InputBoxDlg); - if(GenericPopUp(boxOptions, _("ICS input box"), InputBoxDlg, BoardWindow, NONMODAL)) + MarkMenu("View.ICSInputBox", InputBoxDlg); + if(GenericPopUp(boxOptions, _("ICS input box"), InputBoxDlg, BoardWindow, NONMODAL, 0)) AddHandler(&boxOptions[0], 3); } @@ -1120,7 +1149,7 @@ PopUpMoveDialog (char firstchar) { 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); } @@ -1145,7 +1174,7 @@ void SettingsPopUp (ChessProgramState *cps) { currentCps = cps; - GenericPopUp(cps->option, _("Engine Settings"), TransientDlg, BoardWindow, MODAL); + GenericPopUp(cps->option, _("Engine Settings"), TransientDlg, BoardWindow, MODAL, 0); } void @@ -1164,19 +1193,15 @@ SecondSettingsProc () //----------------------------------------------- Load Engine -------------------------------------- char *engineDir, *engineLine, *nickName, *params; -Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick; -static char *engineNr[] = { N_("First Engine"), N_("Second Engine"), NULL }; +Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick, secondEng; -static int -InstallOK (int n) -{ - PopDown(TransientDlg); // early popdown, to allow FreezeUI to instate grab - if(engineChoice[0] == engineNr[0][0]) Load(&first, 0); else Load(&second, 1); - return FALSE; // no double PopDown! -} +static void EngSel P((int n, int sel)); +static int InstallOK P((int n)); static Option installOptions[] = { -{ 0, NO_GETTEXT, 0, NULL, (void*) &engineLine, (char*) engineList, engineMnemonic, ComboBox, N_("Select engine from list:") }, +{ 0,LR|T2T, 0, NULL, NULL, NULL, NULL, Label, N_("Select engine from list:") }, +{ 300,LR|TB,200, NULL, (void*) engineMnemonic, (char*) &EngSel, NULL, ListBox, "" }, +{ 0,SAME_ROW, 0, NULL, NULL, NULL, NULL, Break, NULL }, { 0, LR, 0, NULL, NULL, NULL, NULL, Label, N_("or specify one below:") }, { 0, 0, 0, NULL, (void*) &nickName, NULL, NULL, TextBox, N_("Nickname (optional):") }, { 0, 0, 0, NULL, (void*) &useNick, NULL, NULL, CheckBox, N_("Use nickname in PGN player tags of engine-engine games") }, @@ -1188,21 +1213,62 @@ static Option installOptions[] = { { 0, 0, 0, NULL, (void*) &hasBook, NULL, NULL, CheckBox, N_("Must not use GUI book") }, { 0, 0, 0, NULL, (void*) &addToList, NULL, NULL, CheckBox, N_("Add this engine to the list") }, { 0, 0, 0, NULL, (void*) &storeVariant, NULL, NULL, CheckBox, N_("Force current variant with this engine") }, -{ 0, 0, 0, NULL, (void*) &engineChoice, (char*) engineNr, engineNr, ComboBox, N_("Load mentioned engine as") }, -{ 0,SAME_ROW, 0, NULL, (void*) &InstallOK, "", NULL, EndMark , "" } +{ 0, 0, 0, NULL, (void*) &InstallOK, "", NULL, EndMark , "" } }; -void -LoadEngineProc () +static int +InstallOK (int n) +{ + if(n && (n = SelectedListBoxItem(&installOptions[1])) > 0) { // called by pressing OK, and engine selected + ASSIGN(engineLine, engineList[n]); + } + PopDown(TransientDlg); // early popdown, to allow FreezeUI to instate grab + if(!secondEng) Load(&first, 0); else Load(&second, 1); + return FALSE; // no double PopDown! +} + +static void +EngSel (int n, int sel) +{ + int nr; + char buf[MSG_SIZ]; + if(sel < 1) buf[0] = NULLCHAR; // back to top level + else if(engineList[sel][0] == '#') safeStrCpy(buf, engineList[sel], MSG_SIZ); // group header, open group + else { // normal line, select engine + ASSIGN(engineLine, engineList[sel]); + InstallOK(0); + return; + } + nr = NamesToList(firstChessProgramNames, engineList, engineMnemonic, buf); // replace list by only the group contents + ASSIGN(engineMnemonic[0], buf); + LoadListBox(&installOptions[1], _("# no engines are installed")); + HighlightWithScroll(&installOptions[1], 0, nr); +} + +static void +LoadEngineProc (int engineNr, char *title) { isUCI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults - if(engineChoice) free(engineChoice); engineChoice = strdup(engineNr[0]); + secondEng = engineNr; if(engineLine) free(engineLine); engineLine = strdup(""); - if(engineDir) free(engineDir); engineDir = strdup(""); + if(engineDir) free(engineDir); engineDir = strdup("."); if(nickName) free(nickName); nickName = strdup(""); if(params) free(params); params = strdup(""); - NamesToList(firstChessProgramNames, engineList, engineMnemonic, "all"); - GenericPopUp(installOptions, _("Load engine"), TransientDlg, BoardWindow, MODAL); + ASSIGN(engineMnemonic[0], ""); + NamesToList(firstChessProgramNames, engineList, engineMnemonic, ""); + GenericPopUp(installOptions, title, TransientDlg, BoardWindow, MODAL, 0); +} + +void +LoadEngine1Proc () +{ + LoadEngineProc (0, _("Load first engine")); +} + +void +LoadEngine2Proc () +{ + LoadEngineProc (1, _("Load second engine")); } //----------------------------------------------------- Edit Book ----------------------------------------- @@ -1245,7 +1311,7 @@ SetRandom (int n) void ShuffleMenuProc () { - GenericPopUp(shuffleOptions, _("New Shuffle Game"), TransientDlg, BoardWindow, MODAL); + GenericPopUp(shuffleOptions, _("New Shuffle Game"), TransientDlg, BoardWindow, MODAL, 0); } //------------------------------------------------------ Time Control ----------------------------------- @@ -1338,7 +1404,7 @@ TimeControlProc () 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 ----------------------------------------- @@ -1377,7 +1443,7 @@ AskQuestion (char *title, char *question, char *replyPrefix, ProcRef pr) 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); } @@ -1460,7 +1526,7 @@ PromotionPopUp () SetPromo(_("Defer"), --count, '='); SetPromo(_("Promote"), --count, '+'); } - GenericPopUp(promoOptions + count, "Promotion", PromoDlg, BoardWindow, NONMODAL); + GenericPopUp(promoOptions + count, "Promotion", PromoDlg, BoardWindow, NONMODAL, 0); } //---------------------------- Chat Windows ---------------------------------------------- @@ -1471,6 +1537,100 @@ OutputChatMessage (int partner, char *mess) return; // dummy } +//--------------------------------- 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 ----------------------------- /* @@ -1515,10 +1675,10 @@ ErrorPopUp (char *title, char *label, int modal) { errorUp = True; errorOptions[1].name = label; - if(dialogError = shellUp[TransientDlg]) - GenericPopUp(errorOptions+1, title, FatalDlg, TransientDlg, MODAL); // pop up as daughter of the transient dialog + 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); // kludge: option start address indicates modality + GenericPopUp(errorOptions+modal, title, modal ? FatalDlg: ErrorDlg, BoardWindow, modal, 0); // kludge: option start address indicates modality } void @@ -1632,4 +1792,489 @@ DisplayTitle (char *text) SetWindowTitle(text, title, icon); } +#define PAUSE_BUTTON "P" +#define PIECE_MENU_SIZE 18 +static String pieceMenuStrings[2][PIECE_MENU_SIZE+1] = { + { N_("White"), "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"), + N_("Queen"), N_("King"), "----", N_("Elephant"), N_("Cannon"), + N_("Archbishop"), N_("Chancellor"), "----", N_("Promote"), N_("Demote"), + N_("Empty square"), N_("Clear board"), NULL }, + { N_("Black"), "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"), + N_("Queen"), N_("King"), "----", N_("Elephant"), N_("Cannon"), + N_("Archbishop"), N_("Chancellor"), "----", N_("Promote"), N_("Demote"), + N_("Empty square"), N_("Clear board"), NULL } +}; +/* must be in same order as pieceMenuStrings! */ +static ChessSquare pieceMenuTranslation[2][PIECE_MENU_SIZE] = { + { WhitePlay, (ChessSquare) 0, WhitePawn, WhiteKnight, WhiteBishop, + WhiteRook, WhiteQueen, WhiteKing, (ChessSquare) 0, WhiteAlfil, + WhiteCannon, WhiteAngel, WhiteMarshall, (ChessSquare) 0, + PromotePiece, DemotePiece, EmptySquare, ClearBoard }, + { BlackPlay, (ChessSquare) 0, BlackPawn, BlackKnight, BlackBishop, + BlackRook, BlackQueen, BlackKing, (ChessSquare) 0, BlackAlfil, + BlackCannon, BlackAngel, BlackMarshall, (ChessSquare) 0, + PromotePiece, DemotePiece, EmptySquare, ClearBoard }, +}; + +#define DROP_MENU_SIZE 6 +static String dropMenuStrings[DROP_MENU_SIZE+1] = { + "----", N_("Pawn"), N_("Knight"), N_("Bishop"), N_("Rook"), N_("Queen"), NULL + }; +/* must be in same order as dropMenuStrings! */ +static ChessSquare dropMenuTranslation[DROP_MENU_SIZE] = { + (ChessSquare) 0, WhitePawn, WhiteKnight, WhiteBishop, + WhiteRook, WhiteQueen +}; + +// [HGM] experimental code to pop up window just like the main window, using GenercicPopUp + +static Option *Exp P((int n, int x, int y)); +void MenuCallback P((int n)); +void SizeKludge P((int n)); + +static int pmFromX = -1, pmFromY = -1; + +static void +PMSelect (int n) +{ // user callback for board context menus + if (pmFromX < 0 || pmFromY < 0) return; + if(n == 25) DropMenuEvent(dropMenuTranslation[values[n]], pmFromX, pmFromY); + else EditPositionMenuEvent(pieceMenuTranslation[n-23][values[n]], pmFromX, pmFromY); +} + +int +CCB (int n) +{ + shiftKey = (ShiftKeys() & 3) != 0; + ClockClick(n == 12); +} + +Option mainOptions[] = { // description of main window in terms of generic dialog creator +{ 0, 0xCA, 0, NULL, NULL, "", NULL, BoxBegin, "" }, // menu bar + { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("File") }, + { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Edit") }, + { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("View") }, + { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Mode") }, + { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Action") }, + { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Engine") }, + { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Options") }, + { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Help") }, +{ 0, 0, 0, NULL, (void*)&SizeKludge, "", NULL, BoxEnd, "" }, +{ 0, LR|T2T|BORDER|SAME_ROW, 0, NULL, NULL, "", NULL, Label, "1" }, // optional title in window +{ 0, L2L|T2T, 200, NULL, (void*) &CCB, NULL, NULL, Label, "White" }, // white clock +{ 0, R2R|T2T|SAME_ROW, 200, NULL, (void*) &CCB, NULL, NULL, Label, "Black" }, // black clock +{ 0, LR|T2T|BORDER, 401, NULL, NULL, "", NULL, -1, "2" }, // backup for title in window (if no room for other) +{ 0, LR|T2T|BORDER, 270, NULL, NULL, "", NULL, Label, "message" }, // message field +{ 0, RR|TT|SAME_ROW, 125, NULL, NULL, "", NULL, BoxBegin, "" }, // (optional) button bar + { 0, 0, 0, NULL, (void*) &ToStartEvent, NULL, NULL, Button, N_("<<") }, + { 0, SAME_ROW, 0, NULL, (void*) &BackwardEvent, NULL, NULL, Button, N_("<") }, + { 0, SAME_ROW, 0, NULL, (void*) &PauseEvent, NULL, NULL, Button, N_(PAUSE_BUTTON) }, + { 0, SAME_ROW, 0, NULL, (void*) &ForwardEvent, NULL, NULL, Button, N_(">") }, + { 0, SAME_ROW, 0, NULL, (void*) &ToEndEvent, NULL, NULL, Button, N_(">>") }, +{ 0, 0, 0, NULL, NULL, "", NULL, BoxEnd, "" }, +{ 401, LR|TT, 401, NULL, (char*) &Exp, NULL, NULL, Graph, "shadow board" }, // board + { 2, COMBO_CALLBACK, 0, NULL, (void*) &PMSelect, NULL, pieceMenuStrings[0], PopUp, "menuW" }, + { 2, COMBO_CALLBACK, 0, NULL, (void*) &PMSelect, NULL, pieceMenuStrings[1], PopUp, "menuB" }, + { -1, COMBO_CALLBACK, 0, NULL, (void*) &PMSelect, NULL, dropMenuStrings, PopUp, "menuD" }, +{ 0, NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" } +}; + +void +SizeKludge (int n) +{ // callback called by GenericPopUp immediately after sizing the menu bar + int width = BOARD_WIDTH*(squareSize + lineGap) + lineGap; + int w = width - 44 - mainOptions[n].min; + mainOptions[10].max = w; // width left behind menu bar + if(w < 0.4*width) // if no reasonable amount of space for title, force small layout + mainOptions[13].type = mainOptions[10].type, mainOptions[10].type = -1; +} + +void +MenuCallback (int n) +{ + MenuProc *proc = (MenuProc *) (((MenuItem*)(mainOptions[n].choice))[values[n]].proc); + + (proc)(); +} + +static Option * +Exp (int n, int x, int y) +{ + static int but1, but3; + int menuNr = -3; + + if(n == 0) { // motion + if(SeekGraphClick(Press, x, y, 1)) return NULL; + if(but1 && !PromoScroll(x, y)) DragPieceMove(x, y); + if(but3) MovePV(x, y, lineGap + BOARD_HEIGHT * (squareSize + lineGap)); + return NULL; + } + shiftKey = (ShiftKeys() & 3) != 0; + switch(n) { + case 1: LeftClick(Press, x, y), but1 = 1; break; + case -1: LeftClick(Release, x, y), but1 = 0; break; + case 2: shiftKey = !shiftKey; + case 3: menuNr = RightClick(Press, x, y, &pmFromX, &pmFromY), but3 = 1; break; + case -2: shiftKey = !shiftKey; + case -3: menuNr = RightClick(Release, x, y, &pmFromX, &pmFromY), but3 = 0; break; + case 10: + DrawPosition(True, NULL); + default: + return NULL; + } + + switch(menuNr) { + case 0: return &mainOptions[shiftKey ? 23: 24]; + case 1: SetupDropMenu(); return &mainOptions[25]; + case 2: + case -1: ErrorPopDown(); + case -2: + default: break; // -3, so no clicks caught + } + return NULL; +} + +Option * +BoardPopUp (int squareSize, int lineGap, void *clockFontThingy) +{ + extern Option *dialogOptions[]; + int i, size = BOARD_WIDTH*(squareSize + lineGap) + lineGap; + mainOptions[11].choice = (char**) clockFontThingy; + mainOptions[12].choice = (char**) clockFontThingy; + mainOptions[22].value = BOARD_HEIGHT*(squareSize + lineGap) + lineGap; + mainOptions[22].max = mainOptions[13].max = size; // board size + mainOptions[13].max = size - 2; // board title (subtract border!) + mainOptions[12].max = mainOptions[11].max = size/2-3; // clock width + mainOptions[14].max = appData.showButtonBar ? size-130 : size-2; // message + mainOptions[0].max = size-40; // menu bar + mainOptions[10].type = appData.titleInWindow ? Label : -1 ; + if(!appData.showButtonBar) for(i=15; i<22; i++) mainOptions[i].type = -1; + for(i=0; i<8; i++) mainOptions[i+1].choice = (char**) menuBar[i].mi; + GenericPopUp(mainOptions, "XBoard", BoardWindow, BoardWindow, NONMODAL, 1); + return mainOptions; +} + +static Option * +SlaveExp (int n, int x, int y) +{ + if(n == 10) { // expose event + flipView = !flipView; partnerUp = !partnerUp; + DrawPosition(True, NULL); // [HGM] dual: draw other board in other orientation + flipView = !flipView; partnerUp = !partnerUp; + } + return NULL; +} + +Option dualOptions[] = { // auxiliary board window +{ 0, L2L|T2T, 198, NULL, NULL, NULL, NULL, Label, "White" }, // white clock +{ 0, R2R|T2T|SAME_ROW, 198, NULL, NULL, NULL, NULL, Label, "Black" }, // black clock +{ 0, LR|T2T|BORDER, 401, NULL, NULL, NULL, NULL, Label, "message" }, // message field +{ 401, LR|TT, 401, NULL, (char*) &SlaveExp, NULL, NULL, Graph, "shadow board" }, // board +{ 0, NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" } +}; + +void +SlavePopUp () +{ + // copy params from main board + dualOptions[0].choice = mainOptions[11].choice; + dualOptions[1].choice = mainOptions[12].choice; + dualOptions[3].value = mainOptions[22].value; + dualOptions[3].max = dualOptions[2].max = mainOptions[22].max; // board size + dualOptions[0].max = dualOptions[1].max = mainOptions[11].max; // clock width + GenericPopUp(dualOptions, "XBoard", DummyDlg, BoardWindow, NONMODAL, 1); +} + +void +DisplayWhiteClock (long timeRemaining, int highlight) +{ + if(appData.noGUI) return; + if(twoBoards && partnerUp) { + DisplayTimerLabel(&dualOptions[0], _("White"), timeRemaining, highlight); + return; + } + DisplayTimerLabel(&mainOptions[11], _("White"), timeRemaining, highlight); + if(highlight) SetClockIcon(0); +} + +void +DisplayBlackClock (long timeRemaining, int highlight) +{ + if(appData.noGUI) return; + if(twoBoards && partnerUp) { + DisplayTimerLabel(&dualOptions[1], _("Black"), timeRemaining, highlight); + return; + } + DisplayTimerLabel(&mainOptions[12], _("Black"), timeRemaining, highlight); + if(highlight) SetClockIcon(1); +} + + +//--------------------------------------------- + +void +DisplayMessage (char *message, char *extMessage) +{ + /* display a message in the message widget */ + + char buf[MSG_SIZ]; + + if (extMessage) + { + if (*message) + { + snprintf(buf, sizeof(buf), "%s %s", message, extMessage); + message = buf; + } + else + { + message = extMessage; + }; + }; + + safeStrCpy(lastMsg, message, MSG_SIZ); // [HGM] make available + + /* need to test if messageWidget already exists, since this function + can also be called during the startup, if for example a Xresource + is not set up correctly */ + if(mainOptions[14].handle) + SetWidgetLabel(&mainOptions[14], message); + + return; +} + +//----------------------------------- File Browser ------------------------------- + +#ifdef HAVE_DIRENT_H +#include +#else +#include +#define dirent direct +#endif + +#include + +static ChessProgramState *savCps; +static FILE **savFP; +static char *fileName, *extFilter, *dirListing, *savMode, **namePtr; +static int folderPtr, filePtr, oldVal, byExtension, extFlag; +static char curDir[MSG_SIZ], title[MSG_SIZ], *folderList[1000], *fileList[1000]; + +static char *FileTypes[] = { +"Chess Games", +"Chess Positions", +"Tournaments", +"Opening Books", +"Settings (*.ini)", +"Log files", +"All files", +NULL, +"PGN", +"Old-Style Games", +"FEN", +"Old-Style Positions", +NULL, +NULL +}; + +static char *Extensions[] = { +".pgn .game", +".fen .epd .pos", +".trn", +".bin", +".ini", +".log", +"", +"INVALID", +".pgn", +".game", +".fen", +".pos", +NULL, +"" +}; + +void DirSelProc P((int n, int sel)); +void FileSelProc P((int n, int sel)); +void SetTypeFilter P((int n)); +int BrowseOK P((int n)); +void Switch P((int n)); + +Option browseOptions[] = { +{ 0, LR|T2T, 500, NULL, NULL, NULL, NULL, Label, title }, +{ 0, L2L|T2T, 250, NULL, NULL, NULL, NULL, Label, N_("Directories:") }, +{ 0,R2R|T2T|SAME_ROW,100, NULL, NULL, NULL, NULL, Label, N_("Files:") }, +{ 0,R2R|T2T|SAME_ROW, 70, NULL, (void*) &Switch, NULL, NULL, Button, N_("by name") }, +{ 0,R2R|T2T|SAME_ROW, 70, NULL, (void*) &Switch, NULL, NULL, Button, N_("by type") }, +{ 300, L2L|T2T, 250, NULL, (void*) folderList, (char*) &DirSelProc, NULL, ListBox, "" }, +{ 300,R2R|T2T|SAME_ROW,250, NULL, (void*) fileList, (char*) &FileSelProc, NULL, ListBox, "" }, +{ 0, 0, 350, NULL, (void*) &fileName, NULL, NULL, TextBox, N_("Filename:") }, +{ 0, COMBO_CALLBACK, 150, NULL, (void*) &SetTypeFilter, NULL, FileTypes, ComboBox, N_("File type:") }, +{ 0, SAME_ROW, 0, NULL, (void*) &BrowseOK, "", NULL, EndMark , "" } +}; + +int +BrowseOK (int n) +{ + if(!fileName[0]) { // it is enough to have a file selected + if(browseOptions[6].textValue) { // kludge: if callback specified we browse for file + int sel = SelectedListBoxItem(&browseOptions[6]); + if(sel < 0 || sel >= filePtr) return FALSE; + ASSIGN(fileName, fileList[sel]); + } else { // we browse for path + ASSIGN(fileName, curDir); // kludge: without callback we browse for path + } + } + if(!fileName[0]) return FALSE; // refuse OK when no file + if(!savMode[0]) { // browsing for name only (dialog Browse button) + snprintf(title, MSG_SIZ, "%s/%s", curDir, fileName); + SetWidgetText((Option*) savFP, title, TransientDlg); + currentCps = savCps; // could return to Engine Settings dialog! + return TRUE; + } + *savFP = fopen(fileName, savMode); + if(*savFP == NULL) return FALSE; // refuse OK if file not openable + ASSIGN(*namePtr, fileName); + ScheduleDelayedEvent(DelayedLoad, 50); + currentCps = savCps; // not sure this is ever non-null + return TRUE; +} + +void +FileSelProc (int n, int sel) +{ + if(sel<0) return; + ASSIGN(fileName, fileList[sel]); + if(BrowseOK(0)) PopDown(BrowserDlg); +} + +int +AlphaNumCompare (char *p, char *q) +{ + while(*p) { + if(isdigit(*p) && isdigit(*q) && atoi(p) != atoi(q)) + return (atoi(p) > atoi(q) ? 1 : -1); + if(*p != *q) break; + p++, q++; + } + if(*p == *q) return 0; + return (*p > *q ? 1 : -1); +} + +int +Comp (const void *s, const void *t) +{ + char *p = *(char**) s, *q = *(char**) t; + if(extFlag) { + char *h; int r; + while(h = strchr(p, '.')) p = h+1; + if(p == *(char**) s) p = ""; + while(h = strchr(q, '.')) q = h+1; + if(q == *(char**) t) q = ""; + r = AlphaNumCompare(p, q); + if(r) return r; + } + return AlphaNumCompare( *(char**) s, *(char**) t ); +} + +void +ListDir (int pathFlag) +{ + DIR *dir; + struct dirent *dp; + struct stat statBuf; + static int lastFlag; + char buf[MSG_SIZ]; + + if(pathFlag < 0) pathFlag = lastFlag; + lastFlag = pathFlag; + dir = opendir("."); + getcwd(curDir, MSG_SIZ); + snprintf(title, MSG_SIZ, "%s %s", _("Contents of"), curDir); + folderPtr = filePtr = 0; // clear listing + + while (dp = readdir(dir)) { // pass 1: list foders + char *s = dp->d_name, match; + if(!stat(s, &statBuf) && S_ISDIR(statBuf.st_mode)) { // stat succeeds and tells us it is directory + if(s[0] == '.' && strcmp(s, "..")) continue; // suppress hidden, except ".." + ASSIGN(folderList[folderPtr], s); folderPtr++; + } else if(!pathFlag) { + char *s = dp->d_name, match=0; + if(s[0] == '.') continue; // suppress hidden files + if(extFilter[0]) { // [HGM] filter on extension + char *p = extFilter, *q; + do { + if(q = strchr(p, ' ')) *q = 0; + if(strstr(s, p)) match++; + if(q) *q = ' '; + } while(q && (p = q+1)); + if(!match) continue; + } + ASSIGN(fileList[filePtr], s); filePtr++; + } + } + FREE(folderList[folderPtr]); folderList[folderPtr] = NULL; + FREE(fileList[filePtr]); fileList[filePtr] = NULL; + closedir(dir); + extFlag = 0; qsort((void*)folderList, folderPtr, sizeof(char*), &Comp); + extFlag = byExtension; qsort((void*)fileList, filePtr, sizeof(char*), &Comp); +} + +void +Refresh (int pathFlag) +{ + ListDir(pathFlag); // and make new one + LoadListBox(&browseOptions[5], ""); + LoadListBox(&browseOptions[6], ""); +} + +void +Switch (int n) +{ + if(byExtension == (n == 4)) return; + extFlag = byExtension = (n == 4); + qsort((void*)fileList, filePtr, sizeof(char*), &Comp); + LoadListBox(&browseOptions[6], ""); +} + +void +SetTypeFilter (int n) +{ + int j = values[n]; + if(j == browseOptions[n].value) return; // no change + browseOptions[n].value = j; + SetWidgetLabel(&browseOptions[n], FileTypes[j]); + ASSIGN(extFilter, Extensions[j]); + Refresh(-1); // uses pathflag remembered by ListDir + values[n] = oldVal; // do not disturb combo settings of underlying dialog +} + +void +DirSelProc (int n, int sel) +{ + if(!chdir(folderList[sel])) { // cd succeeded, so we are in new directory now + Refresh(-1); + SetWidgetLabel(&browseOptions[0], title); + } +} + +FILE * +Browse (DialogClass dlg, char *label, char *proposed, char *ext, Boolean pathFlag, char *mode, char **name, FILE **fp) +{ + int j=0; + savFP = fp; savMode = mode, namePtr = name, savCps = currentCps, oldVal = values[8]; // save params, for use in callback + ASSIGN(extFilter, ext); + ASSIGN(fileName, proposed ? proposed : ""); + for(j=0; Extensions[j]; j++) // look up actual value in list of possible values, to get selection nr + if(extFilter && !strcmp(extFilter, Extensions[j])) break; + if(Extensions[j] == NULL) { j++; ASSIGN(FileTypes[j], extFilter); } + browseOptions[8].value = j; + browseOptions[6].textValue = (char*) (pathFlag ? NULL : &FileSelProc); // disable file listbox during path browsing + ListDir(pathFlag); + currentCps = NULL; + if(GenericPopUp(browseOptions, label, BrowserDlg, dlg, MODAL, 0)) { + } + SetWidgetLabel(&browseOptions[8], FileTypes[j]); +} +