void
GenericUpdate (Option *opts, int selected)
{
- int i, j;
+ int i;
char buf[MSG_SIZ];
- float x;
- for(i=0; ; i++) {
- if(selected >= 0) { if(i < selected) continue; else if(i > selected) break; }
- switch(opts[i].type) {
- case TextBox:
- case FileName:
- case PathName:
- SetWidgetText(&opts[i], *(char**) opts[i].target, -1);
- break;
- case Spin:
- sprintf(buf, "%d", *(int*) opts[i].target);
- SetWidgetText(&opts[i], buf, -1);
- break;
- case Fractional:
- sprintf(buf, "%4.2f", *(float*) opts[i].target);
- SetWidgetText(&opts[i], buf, -1);
- break;
- case CheckBox:
- SetWidgetState(&opts[i], *(Boolean*) opts[i].target);
- break;
- case ComboBox:
- if(opts[i].min & COMBO_CALLBACK) break;
- SetCurrentComboSelection(opts+i);
- // TODO: actually display this (but it is never used that way...)
- break;
- case EndMark:
- return;
- default:
- printf("GenericUpdate: unexpected case in switch.\n");
- case ListBox:
- case Button:
- case SaveButton:
- case Label:
- case Break:
- break;
- }
- }
+
+ for(i=0; ; i++)
+ {
+ if(selected >= 0) { if(i < selected) continue; else if(i > selected) break; }
+ switch(opts[i].type)
+ {
+ case TextBox:
+ case FileName:
+ case PathName:
+ SetWidgetText(&opts[i], *(char**) opts[i].target, -1);
+ break;
+ case Spin:
+ sprintf(buf, "%d", *(int*) opts[i].target);
+ SetWidgetText(&opts[i], buf, -1);
+ break;
+ case Fractional:
+ sprintf(buf, "%4.2f", *(float*) opts[i].target);
+ SetWidgetText(&opts[i], buf, -1);
+ break;
+ case CheckBox:
+ SetWidgetState(&opts[i], *(Boolean*) opts[i].target);
+ break;
+ case ComboBox:
+ if(opts[i].min & COMBO_CALLBACK) break;
+ SetCurrentComboSelection(opts+i);
+ // TODO: actually display this (but it is never used that way...)
+ break;
+ case EndMark:
+ return;
+ default:
+ printf("GenericUpdate: unexpected case in switch.\n");
+ case ListBox:
+ case Button:
+ case SaveButton:
+ case Label:
+ case Break:
+ break;
+ }
+ }
}
//------------------------------------------- Read out dialog controls ------------------------------------
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
Test (int n)
{
GenericReadout(soundOptions, 2);
- if(soundFiles[values[3]]) PlaySound(soundFiles[values[3]]);
+ if(soundFiles[values[3]]) PlaySoundFile(soundFiles[values[3]]);
}
void
void
EditCommentProc ()
{
- int j;
if (PopDown(CommentDlg)) { // popdown succesful
// MarkMenuItem("Edit.EditComment", False);
// MarkMenuItem("View.Comments", False);
GetWidgetText(&boxOptions[0], &val);
SaveInHistory(val);
SendMultiLineToICS(val);
- SetWidgetText(&boxOptions[0], val, InputBoxDlg);
+ SetWidgetText(&boxOptions[0], "", InputBoxDlg);
}
void
static int TcOK P((int n));
int tmpMoves, tmpTc, tmpInc, tmpOdds1, tmpOdds2, tcType;
-static void
-ShowTC (int n)
-{
-}
-
static void SetTcType P((int n));
static char *
static void PromoPick P((int n));
static Option promoOptions[] = {
-{ 0, 0, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
+{ 0, 0, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{ 0, SAME_ROW, 0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
{ 0, SAME_ROW | NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" }
};
static void
SetPromo (char *name, int nr, char promoChar)
{
- safeStrCpy(promoOptions[nr].name, name, MSG_SIZ);
+ ASSIGN(promoOptions[nr].name, name);
promoOptions[nr].value = promoChar;
+ promoOptions[nr].min = SAME_ROW;
}
void
SetPromo(_("Defer"), --count, '=');
SetPromo(_("Promote"), --count, '+');
}
+ promoOptions[count].min = 0;
GenericPopUp(promoOptions + count, "Promotion", PromoDlg, BoardWindow, NONMODAL, 0);
}
if (text == NULL) text = "";
+ if(partnerUp) { SetDialogTitle(DummyDlg, text); return; }
+
if (*text != NULLCHAR) {
safeStrCpy(icon, text, sizeof(icon)/sizeof(icon[0]) );
safeStrCpy(title, text, sizeof(title)/sizeof(title[0]) );
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);
+ if(n == W_DROP) DropMenuEvent(dropMenuTranslation[values[n]], pmFromX, pmFromY);
+ else EditPositionMenuEvent(pieceMenuTranslation[n - W_MENUW][values[n]], pmFromX, pmFromY);
}
-int
+static void
CCB (int n)
{
shiftKey = (ShiftKeys() & 3) != 0;
- ClockClick(n == 12);
+ ClockClick(n == W_BLACK);
}
Option mainOptions[] = { // description of main window in terms of generic dialog creator
{ // 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
if(but3) MovePV(x, y, lineGap + BOARD_HEIGHT * (squareSize + lineGap));
return NULL;
}
+ if(n != 10 && PopDown(PromoDlg)) fromX = fromY = -1; // user starts fiddling with board when promotion dialog is up
shiftKey = ShiftKeys();
controlKey = (shiftKey & 0xC) != 0;
shiftKey = (shiftKey & 3) != 0;
}
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:
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;
+ 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<W_BOARD; 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;
void
SlavePopUp ()
{
+ int size = BOARD_WIDTH*(squareSize + lineGap) + lineGap;
// 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
+ dualOptions[0].choice = mainOptions[W_WHITE].choice;
+ dualOptions[1].choice = mainOptions[W_BLACK].choice;
+ dualOptions[3].value = BOARD_HEIGHT*(squareSize + lineGap) + lineGap;
+ dualOptions[3].max = dualOptions[2].max = size; // board width
+ dualOptions[0].max = dualOptions[1].max = size/2 - 3; // clock width
GenericPopUp(dualOptions, "XBoard", DummyDlg, BoardWindow, NONMODAL, 1);
}
DisplayTimerLabel(&dualOptions[0], _("White"), timeRemaining, highlight);
return;
}
- DisplayTimerLabel(&mainOptions[11], _("White"), timeRemaining, highlight);
+ DisplayTimerLabel(&mainOptions[W_WHITE], _("White"), timeRemaining, highlight);
if(highlight) SetClockIcon(0);
}
DisplayTimerLabel(&dualOptions[1], _("Black"), timeRemaining, highlight);
return;
}
- DisplayTimerLabel(&mainOptions[12], _("Black"), timeRemaining, highlight);
+ DisplayTimerLabel(&mainOptions[W_BLACK], _("Black"), timeRemaining, highlight);
if(highlight) SetClockIcon(1);
}
/* 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);
+ if(mainOptions[W_MESSG].handle)
+ SetWidgetLabel(&mainOptions[W_MESSG], message);
return;
}
#include <sys/stat.h>
+#define MAXFILES 1000
+
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 *fileName, *extFilter, *savMode, **namePtr;
+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",
"Chess Positions",
"Tournaments",
"Opening Books",
+"Sound files",
+"Images",
"Settings (*.ini)",
"Log files",
"All files",
".fen .epd .pos",
".trn",
".bin",
+".wav",
+".xpm",
".ini",
".log",
"",
void SetTypeFilter P((int n));
int BrowseOK P((int n));
void Switch P((int n));
+void CreateDir 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, 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, 300, NULL, (void*) &fileName, NULL, NULL, TextBox, N_("Filename:") },
+{ 0, SAME_ROW, 120, NULL, (void*) &CreateDir, NULL, NULL, Button, N_("New directory") },
{ 0, COMBO_CALLBACK, 150, NULL, (void*) &SetTypeFilter, NULL, FileTypes, ComboBox, N_("File type:") },
{ 0, SAME_ROW, 0, NULL, (void*) &BrowseOK, "", NULL, EndMark , "" }
};
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)
{
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
+ folderPtr = filePtr = cnt = 0; // clear listing
while (dp = readdir(dir)) { // pass 1: list foders
- char *s = dp->d_name, match;
+ 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;
} 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);
ListDir(pathFlag); // and make new one
LoadListBox(&browseOptions[5], "");
LoadListBox(&browseOptions[6], "");
+ SetWidgetLabel(&browseOptions[0], title);
+}
+
+void
+CreateDir (int n)
+{
+ char *name, *errmsg = "";
+ GetWidgetText(&browseOptions[n-1], &name);
+ if(!name[0]) errmsg = _("FIRST TYPE DIRECTORY NAME HERE"); else
+ if(mkdir(name, 0755)) errmsg = _("TRY ANOTHER NAME");
+ else {
+ chdir(name);
+ Refresh(-1);
+ }
+ SetWidgetText(&browseOptions[n-1], errmsg, BrowserDlg);
}
void
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
Refresh(-1);
- SetWidgetLabel(&browseOptions[0], title);
}
}
-FILE *
+void
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
+ savFP = fp; savMode = mode, namePtr = name, savCps = currentCps, oldVal = values[9]; // 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[9].value = j;
browseOptions[6].textValue = (char*) (pathFlag ? NULL : &FileSelProc); // disable file listbox during path browsing
- ListDir(pathFlag);
+ pageStart = 0; ListDir(pathFlag);
currentCps = NULL;
- if(GenericPopUp(browseOptions, label, BrowserDlg, dlg, MODAL, 0)) {
+ 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);
}
- SetWidgetLabel(&browseOptions[8], FileTypes[j]);
}
projects / xboard.git / blobdiff