X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=47efff8298cf1943241ca18ab74f304bb04fde13;hb=a61f78756889e18aa279dc273bd99b9af60468d7;hp=525ce710551aa05ecd2b566c259b1ae79036e3b0;hpb=af378fcf30993faf28f17255fde4968eae28ad0d;p=xboard.git diff --git a/dialogs.c b/dialogs.c index 525ce71..47efff8 100644 --- a/dialogs.c +++ b/dialogs.c @@ -204,7 +204,7 @@ GenericReadout (Option *opts, int selected) break; case ComboBox: if(opts[i].min & COMBO_CALLBACK) break; - if(!opts[i].textValue) { *(int*)opts[i].target == opts[i].value; break; } // numeric + if(!opts[i].textValue) { *(int*)opts[i].target = values[i]; break; } // numeric val = ((char**)opts[i].textValue)[values[i]]; if(currentCps) { if(opts[i].value == values[i]) break; // not changed @@ -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 @@ -1078,7 +1078,7 @@ ICSInputSendText () GetWidgetText(&boxOptions[0], &val); SaveInHistory(val); SendMultiLineToICS(val); - SetWidgetText(&boxOptions[0], val, InputBoxDlg); + SetWidgetText(&boxOptions[0], "", InputBoxDlg); } void @@ -1831,8 +1831,49 @@ static ChessSquare dropMenuTranslation[DROP_MENU_SIZE] = { static Option *Exp P((int n, int x, int y)); void MenuCallback P((int n)); void SizeKludge P((int n)); +static Option *LogoW P((int n, int x, int y)); +static Option *LogoB P((int n, int x, int y)); static int pmFromX = -1, pmFromY = -1; +void *userLogo; + +void +DisplayLogos (void *w1, void *w2) +{ + void *whiteLogo = first.programLogo, *blackLogo = second.programLogo; + if(appData.autoLogo) { + + switch(gameMode) { // pick logos based on game mode + case IcsObserving: + whiteLogo = second.programLogo; // ICS logo + blackLogo = second.programLogo; + default: + break; + case IcsPlayingWhite: + if(!appData.zippyPlay) whiteLogo = userLogo; + blackLogo = second.programLogo; // ICS logo + break; + case IcsPlayingBlack: + whiteLogo = second.programLogo; // ICS logo + blackLogo = appData.zippyPlay ? first.programLogo : userLogo; + break; + case TwoMachinesPlay: + if(first.twoMachinesColor[0] == 'b') { + whiteLogo = second.programLogo; + blackLogo = first.programLogo; + } + break; + case MachinePlaysWhite: + blackLogo = userLogo; + break; + case MachinePlaysBlack: + whiteLogo = userLogo; + blackLogo = first.programLogo; + } + } + DrawLogo(w1, whiteLogo); + DrawLogo(w2, blackLogo); +} static void PMSelect (int n) @@ -1861,8 +1902,10 @@ Option mainOptions[] = { // description of main window in terms of generic dialo { 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 +{ 50, LL|TT, 100, NULL, (void*) &LogoW, NULL, NULL, -1, "LogoW" }, // white logo +{ 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 +{ 50, RR|TT|SAME_ROW, 100, NULL, (void*) &LogoB, NULL, NULL, -1, "LogoB" }, // black logo { 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 @@ -1872,13 +1915,27 @@ Option mainOptions[] = { // description of main window in terms of generic dialo { 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 +{ 401, LR|TB, 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 , "" } }; +Option * +LogoW (int n, int x, int y) +{ + if(n == 10) DisplayLogos(mainOptions[W_WHITE-1].handle, NULL); + return NULL; +} + +Option * +LogoB (int n, int x, int y) +{ + if(n == 10) DisplayLogos(NULL, mainOptions[W_BLACK+1].handle); + return NULL; +} + void SizeKludge (int n) { // callback called by GenericPopUp immediately after sizing the menu bar @@ -1940,7 +1997,7 @@ Exp (int n, int x, int y) Option * BoardPopUp (int squareSize, int lineGap, void *clockFontThingy) { - int i, size = BOARD_WIDTH*(squareSize + lineGap) + lineGap; + int i, size = BOARD_WIDTH*(squareSize + lineGap) + lineGap, logo = appData.logoSize; mainOptions[W_WHITE].choice = (char**) clockFontThingy; mainOptions[W_BLACK].choice = (char**) clockFontThingy; mainOptions[W_BOARD].value = BOARD_HEIGHT*(squareSize + lineGap) + lineGap; @@ -1950,6 +2007,14 @@ BoardPopUp (int squareSize, int lineGap, void *clockFontThingy) 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(logo && logo <= size/4) { // Activate logos + mainOptions[W_WHITE-1].type = mainOptions[W_BLACK+1].type = Graph; + mainOptions[W_WHITE-1].max = mainOptions[W_BLACK+1].max = logo; + mainOptions[W_WHITE-1].value= mainOptions[W_BLACK+1].value= logo/2; + mainOptions[W_WHITE].min |= SAME_ROW; + mainOptions[W_WHITE].max = mainOptions[W_BLACK].max -= logo + 4; + mainOptions[W_WHITE].name = mainOptions[W_BLACK].name = "Double\nHeight"; + } if(!appData.showButtonBar) for(i=W_BUTTON; i +#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 +2136,7 @@ static char *FileTypes[] = { "Tournaments", "Opening Books", "Sound files", +"Images", "Settings (*.ini)", "Log files", "All files", @@ -2087,6 +2155,7 @@ static char *Extensions[] = { ".trn", ".bin", ".wav", +".xpm", ".ini", ".log", "", @@ -2147,14 +2216,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 +2258,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 +2278,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 +2331,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,10 +2365,32 @@ 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]); } +static char *openName; +FileProc fileProc; +char *fileOpenMode; +FILE *openFP; + +void +DelayedLoad () +{ + (void) (*fileProc)(openFP, 0, openName); +} + +void +FileNamePopUp (char *label, char *def, char *filter, FileProc proc, char *openMode) +{ + fileProc = proc; /* I can't see a way not */ + fileOpenMode = openMode; /* to use globals here */ + { // [HGM] use file-selector dialog stolen from Ghostview + // int index; // this is not supported yet + Browse(BoardWindow, label, (def[0] ? def : NULL), filter, False, openMode, &openName, &openFP); + } +} +