X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=df8750ab0d76fe2d5ef47b1b8077da2e38f8cfea;hb=9d455a7f4ce66cc25d540d4dc5a65fdb1895cc2e;hp=91a2e5a7aba24f70fa6767425bbda04defd7cdf4;hpb=71d96ad96e11224c77a9a4e3735661e020beeee1;p=xboard.git diff --git a/dialogs.c b/dialogs.c index 91a2e5a..df8750a 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); } @@ -1214,9 +1230,19 @@ InstallOK (int n) static void EngSel (int n, int sel) { - if(sel < 1) return; - ASSIGN(engineLine, engineList[sel]); - InstallOK(0); + 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 @@ -1225,10 +1251,11 @@ LoadEngineProc (int engineNr, char *title) isUCI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults 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"); + ASSIGN(engineMnemonic[0], ""); + NamesToList(firstChessProgramNames, engineList, engineMnemonic, ""); GenericPopUp(installOptions, title, TransientDlg, BoardWindow, MODAL, 0); } @@ -1765,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] = { @@ -1873,9 +1884,9 @@ 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 + mainOptions[W_TITLE].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; + mainOptions[W_SMALL].type = mainOptions[W_TITLE].type, mainOptions[W_TITLE].type = -1; } void @@ -1898,7 +1909,9 @@ Exp (int n, int x, int y) if(but3) MovePV(x, y, lineGap + BOARD_HEIGHT * (squareSize + lineGap)); return NULL; } - shiftKey = (ShiftKeys() & 3) != 0; + shiftKey = ShiftKeys(); + controlKey = (shiftKey & 0xC) != 0; + shiftKey = (shiftKey & 3) != 0; switch(n) { case 1: LeftClick(Press, x, y), but1 = 1; break; case -1: LeftClick(Release, x, y), but1 = 0; break; @@ -1908,18 +1921,13 @@ 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; } switch(menuNr) { - case 0: return &mainOptions[shiftKey ? 23: 24]; - case 1: SetupDropMenu(); return &mainOptions[25]; + case 0: return &mainOptions[shiftKey ? W_MENUW: W_MENUB]; + case 1: SetupDropMenu(); return &mainOptions[W_DROP]; case 2: case -1: ErrorPopDown(); case -2: @@ -1933,21 +1941,79 @@ 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; + mainOptions[W_WHITE].choice = (char**) clockFontThingy; + mainOptions[W_BLACK].choice = (char**) clockFontThingy; + mainOptions[W_BOARD].value = BOARD_HEIGHT*(squareSize + lineGap) + lineGap; + mainOptions[W_BOARD].max = mainOptions[W_SMALL].max = size; // board size + mainOptions[W_SMALL].max = size - 2; // board title (subtract border!) + mainOptions[W_BLACK].max = mainOptions[W_WHITE].max = size/2-3; // clock width + mainOptions[W_MESSG].max = appData.showButtonBar ? size-130 : size-2; // message + mainOptions[W_MENU].max = size-40; // menu bar + mainOptions[W_TITLE].type = appData.titleInWindow ? Label : -1 ; + if(!appData.showButtonBar) for(i=W_BUTTON; i +#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|TT|SAME_ROW, 70, NULL, (void*) &Switch, NULL, NULL, Button, N_("by name") }, +{ 0, R2R|TT|SAME_ROW, 70, NULL, (void*) &Switch, NULL, NULL, Button, N_("by type") }, +{ 300, L2L|TB, 250, NULL, (void*) folderList, (char*) &DirSelProc, NULL, ListBox, "" }, +{ 300, R2R|TB|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]); +} +