X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=e0d1c4e6a104e3ecc93f1c30772e6cc902fa7cc0;hb=7c9ee0544821f7981792be03e90ba15e9a8aeada;hp=046fbc6df5366058d2dcfb28c50eb1c824e0c01e;hpb=e131fadbb0f396098fb300283227bdf042c71d45;p=xboard.git diff --git a/dialogs.c b/dialogs.c index 046fbc6..e0d1c4e 100644 --- a/dialogs.c +++ b/dialogs.c @@ -736,7 +736,7 @@ static void Test (int n) { GenericReadout(soundOptions, 2); - if(soundFiles[values[3]]) PlaySound(soundFiles[values[3]]); + if(soundFiles[values[3]]) PlaySoundFile(soundFiles[values[3]]); } void @@ -2057,11 +2057,13 @@ DisplayMessage (char *message, char *extMessage) #include +#define MAXFILES 1000 + static ChessProgramState *savCps; static FILE **savFP; static char *fileName, *extFilter, *savMode, **namePtr; -static int folderPtr, filePtr, oldVal, byExtension, extFlag; -static char curDir[MSG_SIZ], title[MSG_SIZ], *folderList[1000], *fileList[1000]; +static int folderPtr, filePtr, oldVal, byExtension, extFlag, pageStart, cnt; +static char curDir[MSG_SIZ], title[MSG_SIZ], *folderList[MAXFILES], *fileList[MAXFILES]; static char *FileTypes[] = { "Chess Games", @@ -2069,6 +2071,7 @@ static char *FileTypes[] = { "Tournaments", "Opening Books", "Sound files", +"Images", "Settings (*.ini)", "Log files", "All files", @@ -2087,6 +2090,7 @@ static char *Extensions[] = { ".trn", ".bin", ".wav", +".xpm", ".ini", ".log", "", @@ -2147,14 +2151,6 @@ BrowseOK (int n) 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) { @@ -2197,15 +2193,16 @@ ListDir (int pathFlag) dir = opendir("."); getcwd(curDir, MSG_SIZ); snprintf(title, MSG_SIZ, "%s %s", _("Contents of"), curDir); - folderPtr = filePtr = 0; // clear listing + folderPtr = filePtr = cnt = 0; // clear listing while (dp = readdir(dir)) { // pass 1: list foders char *s = dp->d_name; 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++; + ASSIGN(folderList[folderPtr], s); if(folderPtr < MAXFILES-2) folderPtr++; } else if(!pathFlag) { char *s = dp->d_name, match=0; +// if(cnt == pageStart) { ASSIGN } if(s[0] == '.') continue; // suppress hidden files if(extFilter[0]) { // [HGM] filter on extension char *p = extFilter, *q; @@ -2216,9 +2213,12 @@ ListDir (int pathFlag) } while(q && (p = q+1)); if(!match) continue; } + if(filePtr == MAXFILES-2) continue; + if(cnt++ < pageStart) continue; ASSIGN(fileList[filePtr], s); filePtr++; } } + if(filePtr == MAXFILES-2) { ASSIGN(fileList[filePtr], _("\177 next page")); filePtr++; } FREE(folderList[folderPtr]); folderList[folderPtr] = NULL; FREE(fileList[filePtr]); fileList[filePtr] = NULL; closedir(dir); @@ -2266,11 +2266,21 @@ SetTypeFilter (int n) browseOptions[n].value = j; SetWidgetLabel(&browseOptions[n], FileTypes[j]); ASSIGN(extFilter, Extensions[j]); + pageStart = 0; Refresh(-1); // uses pathflag remembered by ListDir values[n] = oldVal; // do not disturb combo settings of underlying dialog } void +FileSelProc (int n, int sel) +{ + if(sel<0) return; + if(sel == MAXFILES-2) { pageStart = cnt; Refresh(-1); return; } + ASSIGN(fileName, fileList[sel]); + if(BrowseOK(0)) PopDown(BrowserDlg); +} + +void DirSelProc (int n, int sel) { if(!chdir(folderList[sel])) { // cd succeeded, so we are in new directory now @@ -2290,7 +2300,7 @@ Browse (DialogClass dlg, char *label, char *proposed, char *ext, Boolean pathFla if(Extensions[j] == NULL) { j++; ASSIGN(FileTypes[j], extFilter); } browseOptions[9].value = j; browseOptions[6].textValue = (char*) (pathFlag ? NULL : &FileSelProc); // disable file listbox during path browsing - ListDir(pathFlag); + pageStart = 0; ListDir(pathFlag); currentCps = NULL; GenericPopUp(browseOptions, label, BrowserDlg, dlg, MODAL, 0); SetWidgetLabel(&browseOptions[9], FileTypes[j]);