{ 0, 0, 0, NULL, (void*) &appData.cycleSync, "", NULL, CheckBox, N_("Sync after cycle") },
{ 0, LR, 175, NULL, NULL, NULL, NULL, Label, N_("Tourney participants:") },
{ 0, SAME_ROW|RR, 175, NULL, NULL, NULL, NULL, Label, N_("Select Engine:") },
-{ 150, T_VSCRL | T_FILL | T_WRAP,
+{ 200, T_VSCRL | T_FILL | T_WRAP,
175, NULL, (void*) &engineName, NULL, NULL, TextBox, "" },
-{ 150, SAME_ROW|RR,
+{ 200, SAME_ROW|RR,
175, NULL, (void*) engineMnemonic, (char*) &AddToTourney, NULL, ListBox, "" },
-{ 0, 0, 0, NULL, NULL, NULL, NULL, Break, "" }, // to decouple alignment above and below boxes
+{ 0, SAME_ROW, 0, NULL, NULL, NULL, NULL, Break, "" }, // to decouple alignment above and below boxes
//{ 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):") },
{
static int start;
int i, last;
- char buf[MSG_SIZ];
ranksTmp = filesTmp = sizeTmp = -1; // prefer defaults over actual settings
if(appData.noChessProgram) sprintf(warning, _("Only bughouse is not available in viewer mode.")); else
sprintf(warning, _("All variants not supported by the first engine\n(currently %s) are disabled."), first.tidy);
}
variantDescriptors[start-2].type = (last < 0 ? EndMark : Skip);
variantDescriptors[start-1].type = (last < 6 ? Skip : Break);
- safeStrCpy(buf, engineVariant, MSG_SIZ); *engineVariant = NULLCHAR; // yeghh...
+ safeStrCpy(engineVariant+100, engineVariant, 100); *engineVariant = NULLCHAR; // yeghh...
GenericPopUp(variantDescriptors, _("New Variant"), TransientDlg, BoardWindow, MODAL, 0);
- safeStrCpy(engineVariant, buf, MSG_SIZ); // must temporarily clear to avoid enabling all variant buttons
+ safeStrCpy(engineVariant, engineVariant+100, MSG_SIZ); // must temporarily clear to avoid enabling all variant buttons
}
//------------------------------------------- Common Engine Options -------------------------------------
//----------------------------------------------- Load Engine --------------------------------------
char *engineDir, *engineLine, *nickName, *params;
-Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick, secondEng;
+Boolean isUCI, isUSI, hasBook, storeVariant, v1, addToList, useNick, secondEng;
static void EngSel P((int n, int sel));
static int InstallOK P((int n));
{ 0, 0, 0, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine Command:") },
{ 0, LR, 0, NULL, NULL, NULL, NULL, Label, N_("(Directory will be derived from engine path when empty)") },
{ 0, 0, 0, NULL, (void*) &isUCI, NULL, NULL, CheckBox, N_("UCI") },
+{ 0, 0, 0, NULL, (void*) &isUSI, NULL, NULL, CheckBox, N_("USI/UCCI (uses specified -uxiAdapter)") },
{ 0, 0, 0, NULL, (void*) &v1, NULL, NULL, CheckBox, N_("WB protocol v1 (do not wait for engine features)") },
{ 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") },
ASSIGN(engineLine, engineList[n]);
}
PopDown(TransientDlg); // early popdown, to allow FreezeUI to instate grab
+ if(isUSI) {
+ isUCI = 2; // kludge to pass isUSI to Load()
+ if(!*appData.ucciAdapter) { ASSIGN(appData.ucciAdapter, "usi2wb -%variant \"%fcp\"\"%fd\""); } // make sure -uxiAdapter is defined
+ }
if(!secondEng) Load(&first, 0); else Load(&second, 1);
return FALSE; // no double PopDown!
}
static void
LoadEngineProc (int engineNr, char *title)
{
- isUCI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults
+ isUCI = isUSI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults
secondEng = engineNr;
if(engineLine) free(engineLine); engineLine = strdup("");
if(engineDir) free(engineDir); engineDir = strdup(".");
if(opt != &chatOptions[CHAT_IN] && !(opt == &chatOptions[CHAT_PARTNER] && n == 33)) return 0;
switch(n) {
+ case 5:
+ if(!hidden) ClearChat();
+ break;
+ case 8:
+ if(!hidden) PaneSwitch();
+ break;
case 33: // <Esc>
+ if(1) BoardToTop(); else
if(hidden) BoardToTop();
else PaneSwitch();
break;
while(!dirty[chat = (chat + 1)%MAX_CHAT]) if(chat == start) break;
if(!dirty[chat])
while(!chatPartner[chat = (chat + 1)%MAX_CHAT][0]) if(chat == start) break;
- if(chat == start && hidden) chat = 0; // if all unused, start left
+ if(!chatPartner[chat][0]) break; // if all unused, ignore
ChatSwitch(chat + 1);
break;
case 1:
{ // can only be called through <Enter> in chat-partner text-edit, as there is no OK button
char buf[MSG_SIZ];
- if(!hidden && (!partner || strcmp(partner, chatPartner[activePartner]))) {
+ if(!hidden && (!partner || strcmp(partner, chatPartner[activePartner]) || !*partner)) {
safeStrCpy(chatPartner[activePartner], partner, MSG_SIZ);
SetWidgetText(&chatOptions[CHAT_OUT], "", -1); // clear text if we alter partner
SetWidgetText(&chatOptions[CHAT_IN], "", ChatDlg); // clear text if we alter partner
SetWidgetLabel(&chatOptions[activePartner+1], chatPartner[activePartner][0] ? chatPartner[activePartner] : _("New Chat"));
+ if(!*partner) PaneSwitch();
HardSetFocus(&chatOptions[CHAT_IN], 0);
}
if(line[0] || hidden) { // something was typed (for ICS commands we also allow empty line!)
snprintf(buf, MSG_SIZ, "whisper %s\n", line); // WHISPER box uses "whisper" to send
else if(!strcmp("shouts", chatPartner[activePartner]))
snprintf(buf, MSG_SIZ, "shout %s\n", line); // SHOUT box uses "shout" to send
+ else if(!strcmp("c-shouts", chatPartner[activePartner]))
+ snprintf(buf, MSG_SIZ, "cshout %s\n", line); // C-SHOUT box uses "cshout" to send
+ else if(!strcmp("kibitzes", chatPartner[activePartner]))
+ snprintf(buf, MSG_SIZ, "kibitz %s\n", line); // KIBITZ box uses "kibitz" to send
else {
if(!atoi(chatPartner[activePartner])) {
snprintf(buf, MSG_SIZ, "> %s\n", line); // echo only tells to handle, not channel
void
ConsoleAutoPopUp (char *buf)
{
+ if(*buf == 27) { if(appData.icsActive && DialogExists(ChatDlg)) HardSetFocus (&chatOptions[CHAT_IN], ChatDlg); return; }
if(!appData.autoBox) return;
if(appData.icsActive) { // text typed to board in ICS mode: divert to ICS input box
if(DialogExists(ChatDlg)) { // box already exists: append to current contents
{
GLT_ParseList();
appData.gameListTags = strdup(lpUserGLT);
+ GameListUpdate();
return 1;
}
{
void *whiteLogo = first.programLogo, *blackLogo = second.programLogo;
if(appData.autoLogo) {
- if(appData.noChessProgram) whiteLogo = blackLogo = NULL; else
+ if(appData.noChessProgram) whiteLogo = blackLogo = NULL;
+ if(appData.icsActive) whiteLogo = blackLogo = second.programLogo;
switch(gameMode) { // pick logos based on game mode
case IcsObserving:
whiteLogo = second.programLogo; // ICS logo
Option mainOptions[] = { // description of main window in terms of generic dialog creator
{ 0, 0xCA, 0, NULL, NULL, "", NULL, BarBegin, "" }, // menu bar
- { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("File") },
- { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Edit") },
- { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("View") },
- { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Mode") },
- { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Action") },
- { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Engine") },
- { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Options") },
- { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Help") },
+ { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("_File") },
+ { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("_Edit") },
+ { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("_View") },
+ { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("_Mode") },
+ { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("_Action") },
+ { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("E_ngine") },
+ { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("_Options") },
+ { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("_Help") },
{ 0, 0, 0, NULL, (void*)&SizeKludge, "", NULL, BarEnd, "" },
{ 0, LR|T2T|BORDER|SAME_ROW, 0, NULL, NULL, NULL, NULL, Label, "1" }, // optional title in window
{ 50, LL|TT, 100, NULL, (void*) &LogoW, NULL, NULL, Skip, "" }, // white logo
static int but1, but3, oldW, oldH;
int menuNr = -3, sizing, f, r;
TimeMark now;
+ extern Boolean right;
+
+ if(right) { // kludgy way to let button 1 double as button 3 when back-end requests this
+ if(but1 && n == 0) but1 = 0, but3 = 1;
+ else if(n == -1) n = -3, right = FALSE;
+ }
if(n == 0) { // motion
if(SeekGraphClick(Press, x, y, 1)) return NULL;
BoardPopUp (int squareSize, int lineGap, void *clockFontThingy)
{
int i, size = BOARD_WIDTH*(squareSize + lineGap) + lineGap, logo = appData.logoSize;
+ int f = 2*appData.fixedSize; // width fudge, needed for unknown reasons to not clip board
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-135 : size-2; // message
+ mainOptions[W_MESSG].max = appData.showButtonBar ? size-135+f : size-2+f; // message
mainOptions[W_MENU].max = size-40; // menu bar
mainOptions[W_TITLE].type = appData.titleInWindow ? Label : Skip ;
if(logo && logo <= size/4) { // Activate logos
#define MAXFILES 1000
+static DialogClass savDlg;
static ChessProgramState *savCps;
static FILE **savFP;
static char *fileName, *extFilter, *savMode, **namePtr;
snprintf(title, MSG_SIZ, "%s", fileName);
else
snprintf(title, MSG_SIZ, "%s/%s", curDir, fileName);
- SetWidgetText((Option*) savFP, title, TransientDlg);
+ SetWidgetText((Option*) savFP, title, savDlg);
currentCps = savCps; // could return to Engine Settings dialog!
return TRUE;
}
}
void
+StartDir (char *filter, char *newName)
+{
+ static char *gamesDir, *trnDir, *imgDir, *bookDir;
+ static char curDir[MSG_SIZ];
+ char **res = NULL;
+ if(!filter || !*filter) return;
+ if(strstr(filter, "pgn")) res = &gamesDir; else
+ if(strstr(filter, "bin")) res = &bookDir; else
+ if(strstr(filter, "png")) res = &imgDir; else
+ if(strstr(filter, "trn")) res = &trnDir; else
+ if(strstr(filter, "fen")) res = &appData.positionDir;
+ if(res) {
+ if(newName) {
+ char *p, *q;
+ if(*newName) {
+ ASSIGN(*res, newName);
+ for(p=*res; q=strchr(p, '/');) p = q + 1; *p = NULLCHAR;
+ }
+ if(*curDir) chdir(curDir);
+ *curDir = NULLCHAR;
+ } else {
+ getcwd(curDir, MSG_SIZ);
+ if(*res && **res) chdir(*res);
+ }
+ }
+}
+
+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[9]; // save params, for use in callback
+ savFP = fp; savMode = mode, namePtr = name, savCps = currentCps, oldVal = values[9], savDlg = dlg; // 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