X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=b6abd82f8e4a07caba4b294419db7a94d90bf224;hb=c0d0ea91773838e5d11c3cd3b407fea251058c34;hp=5f269a665d4b5f3cf00d7fa3053b89d24b209cf1;hpb=747fb0571c0942f12845351dca22af723300cc09;p=xboard.git diff --git a/dialogs.c b/dialogs.c index 5f269a6..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)); @@ -258,18 +258,22 @@ static Option matchOptions[] = { { 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") }, @@ -282,14 +286,14 @@ static Option matchOptions[] = { static void ReplaceParticipant () { - GenericReadout(matchOptions, 5); + GenericReadout(matchOptions, 7); Substitute(strdup(engineName), True); } static void UpgradeParticipant () { - GenericReadout(matchOptions, 5); + GenericReadout(matchOptions, 7); Substitute(strdup(engineName), False); } @@ -309,18 +313,30 @@ CloneTourney () } static void -AddToTourney (int n) +AddToTourney (int n, int sel) { - AddLine(&matchOptions[5], engineMnemonic[values[6]+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[7].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); + ASSIGN(engineMnemonic[0], ""); GenericPopUp(matchOptions, _("Match Options"), TransientDlg, BoardWindow, MODAL, 0); } @@ -1177,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") }, @@ -1201,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, 0); + 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 ----------------------------------------- @@ -1739,22 +1792,6 @@ DisplayTitle (char *text) SetWindowTitle(text, title, icon); } -void -DisplayWhiteClock (long timeRemaining, int highlight) -{ - if(appData.noGUI) return; - DisplayTimerLabel(11, _("White"), timeRemaining, highlight); - if(highlight) SetClockIcon(0); -} - -void -DisplayBlackClock (long timeRemaining, int highlight) -{ - if(appData.noGUI) return; - DisplayTimerLabel(12, _("Black"), timeRemaining, highlight); - if(highlight) SetClockIcon(1); -} - #define PAUSE_BUTTON "P" #define PIECE_MENU_SIZE 18 static String pieceMenuStrings[2][PIECE_MENU_SIZE+1] = { @@ -1882,11 +1919,6 @@ Exp (int n, int x, int y) case -3: menuNr = RightClick(Release, x, y, &pmFromX, &pmFromY), but3 = 0; break; case 10: DrawPosition(True, NULL); - if(twoBoards) { // [HGM] dual: draw other board in other orientation - flipView = !flipView; partnerUp = !partnerUp; - DrawPosition(True, NULL); - flipView = !flipView; partnerUp = !partnerUp; - } default: return NULL; } @@ -1922,6 +1954,64 @@ BoardPopUp (int squareSize, int lineGap, void *clockFontThingy) 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) { @@ -1953,4 +2043,238 @@ DisplayMessage (char *message, char *extMessage) 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]); +} +