X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=2ea3d0a8deaba6e0d56a026778de02698bceedae;hb=8cadd120c307bb1049f6d08d9ae23f67432bd038;hp=da4fb7151f254846933aee70ca622d1afb2a82a0;hpb=fafca253f3540ba9f65f8d2ec19ff6091f5f9c5d;p=xboard.git diff --git a/dialogs.c b/dialogs.c index da4fb71..2ea3d0a 100644 --- a/dialogs.c +++ b/dialogs.c @@ -281,16 +281,16 @@ DoGeneral(int n) static Option matchOptions[] = { { 0, 0, 0, NULL, (void*) &tfName, ".trn", NULL, FileName, N_("Tournament file: ") }, -{ 0, 0, 0, NULL, NULL, "", NULL, Label, N_("For concurrent playing of tourney with multiple XBoards:") }, +{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("For concurrent playing of tourney with multiple XBoards:") }, { 0, 0, 0, NULL, (void*) &appData.roundSync, "", NULL, CheckBox, N_("Sync after round") }, { 0, 0, 0, NULL, (void*) &appData.cycleSync, "", NULL, CheckBox, N_("Sync after cycle") }, -{ 0, LR, 175, NULL, NULL, "", NULL, Label, N_("Tourney participants:") }, -{ 0, SAME_ROW|RR, 175, NULL, NULL, "", NULL, Label, N_("Select Engine:") }, -{ 150, T_VSCRL | T_FILL | T_WRAP, - 175, NULL, (void*) &engineName, "", NULL, TextBox, "" }, -{ 150, SAME_ROW|RR, +{ 0, LR, 175, NULL, NULL, NULL, NULL, Label, N_("Tourney participants:") }, +{ 0, SAME_ROW|RR, 175, NULL, NULL, NULL, NULL, Label, N_("Select Engine:") }, +{ 200, T_VSCRL | T_FILL | T_WRAP, + 175, NULL, (void*) &engineName, NULL, NULL, TextBox, "" }, +{ 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):") }, @@ -490,10 +490,22 @@ static Option variantDescriptors[] = { { VariantXiangqi, SAME_ROW,135, NULL, (void*) &Pick, "#BFFFFF", NULL, Button, N_("xiangqi (9x10)")}, { VariantLion, 0, 135, NULL, (void*) &Pick, "#BFBFBF", NULL, Button, N_("mighty lion")}, { VariantCourier, SAME_ROW,135, NULL, (void*) &Pick, "#BFFFBF", NULL, Button, N_("courier (12x8)")}, -{ VariantChuChess, 0, 135, NULL, (void*) &Pick, "#BFBFBF", NULL, Button, N_("chu chess (10x10)")}, +{ VariantChuChess, 0, 135, NULL, (void*) &Pick, "#BFBFBF", NULL, Button, N_("elven chess (10x10)")}, { VariantChu, SAME_ROW, 135, NULL, (void*) &Pick, "#BFFFBF", NULL, Button, N_("chu shogi (12x12)")}, //{ -1, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Button, N_(" ")}, // dummy, to have good alignment // optional buttons for engine-defined variants +{ 0, NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" }, +{ 0, SAME_ROW, 0, NULL, NULL, NULL, NULL, Skip, ""}, +{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, +{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, +{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, +{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, +{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, +{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, +{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, +{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, +{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, +{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, { VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, { VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, { VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL }, @@ -550,11 +562,13 @@ NewVariantProc () { 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); - if(!start) while(variantDescriptors[start].type != Skip) start++; // locate first spare + if(!start) { + while(variantDescriptors[start].type != EndMark) start++; // locate spares + start += 2; // conditional EndMark and Break + } last = -1; for(i=0; variantDescriptors[start+i].type != EndMark; i++) { // create buttons for engine-defined variants char *v = EngineDefinedVariant(&first, i); @@ -569,19 +583,27 @@ NewVariantProc () variantDescriptors[start+last+1].type = Button; variantDescriptors[start+last+1].value = Skip; } - safeStrCpy(buf, engineVariant, MSG_SIZ); *engineVariant = NULLCHAR; // yeghh... + variantDescriptors[start-2].type = (last < 0 ? EndMark : Skip); + variantDescriptors[start-1].type = (last < 6 ? Skip : Break); + 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 ------------------------------------- static int oldCores; +static char *egtPath; static int CommonOptionsOK (int n) { int newPonder = appData.ponderNextMove; + if(*egtPath != '/' && strchr(egtPath, ':')) { + ASSIGN(appData.egtFormats, egtPath); + } else { + ASSIGN(appData.defaultPathEGTB, egtPath); + } // make sure changes are sent to first engine by re-initializing it // if it was already started pre-emptively at end of previous game if(gameMode == BeginningOfGame) Reset(True, True); else { @@ -599,7 +621,7 @@ static Option commonEngineOptions[] = { { 0, 0, 1000, NULL, (void*) &appData.smpCores, "", NULL, Spin, N_("Maximum Number of CPUs per Engine:") }, { 0, 0, 0, NULL, (void*) &appData.polyglotDir, "", NULL, PathName, N_("Polygot Directory:") }, { 0, 0,16000, NULL, (void*) &appData.defaultHashSize, "", NULL, Spin, N_("Hash-Table Size (MB):") }, -{ 0, 0, 0, NULL, (void*) &appData.defaultPathEGTB, "", NULL, PathName, N_("Nalimov EGTB Path:") }, +{ 0, 0, 0, NULL, (void*) &egtPath, "", NULL, PathName, N_("EGTB Path:") }, { 0, 0, 1000, NULL, (void*) &appData.defaultCacheSizeEGTB, "", NULL, Spin, N_("EGTB Cache Size (MB):") }, { 0, 0, 0, NULL, (void*) &appData.usePolyglotBook, "", NULL, CheckBox, N_("Use GUI Book") }, { 0, 0, 0, NULL, (void*) &appData.polyglotBook, ".bin", NULL, FileName, N_("Opening-Book Filename:") }, @@ -615,6 +637,8 @@ UciMenuProc () { oldCores = appData.smpCores; oldPonder = appData.ponderNextMove; + if(appData.egtFormats && *appData.egtFormats) { ASSIGN(egtPath, appData.egtFormats); } + else { ASSIGN(egtPath, appData.defaultPathEGTB); } GenericPopUp(commonEngineOptions, _("Common Engine Settings"), TransientDlg, BoardWindow, MODAL, 0); } @@ -697,11 +721,14 @@ IcsOptionsProc () static char *modeNames[] = { N_("Exact position match"), N_("Shown position is subset"), N_("Same material with exactly same Pawn chain"), N_("Same material"), N_("Material range (top board half optional)"), N_("Material difference (optional stuff balanced)"), NULL }; static char *modeValues[] = { "1", "2", "3", "4", "5", "6" }; -static char *searchMode; +static char *searchMode, *countRange; static int LoadOptionsOK () { + appData.minPieces = appData.maxPieces = 0; + sscanf(countRange, "%d-%d", &appData.minPieces, &appData.maxPieces); + if(appData.maxPieces < appData.minPieces) appData.maxPieces = appData.minPieces; appData.searchMode = atoi(searchMode); return 1; } @@ -718,6 +745,7 @@ static Option loadOptions[] = { { 0, 0,5000, NULL, (void*) &appData.eloThreshold2, "", NULL, Spin, N_("Elo of weakest player at least:") }, { 0, 0,5000, NULL, (void*) &appData.dateThreshold, "", NULL, Spin, N_("No games before year:") }, { 0, 1,50, NULL, (void*) &appData.stretch, "", NULL, Spin, N_("Minimum nr consecutive positions:") }, +{ 0, 0,197, NULL, (void*) &countRange, "", NULL, TextBox, "Final nr of pieces" }, { 0, 0,205, NULL, (void*) &searchMode, (char*) modeValues, modeNames, ComboBox, N_("Search mode:") }, { 0, 0, 0, NULL, (void*) &appData.ignoreColors, "", NULL, CheckBox, N_("Also match reversed colors") }, { 0, 0, 0, NULL, (void*) &appData.findMirror, "", NULL, CheckBox, N_("Also match left-right flipped position") }, @@ -727,6 +755,7 @@ static Option loadOptions[] = { void LoadOptionsPopUp (DialogClass parent) { + ASSIGN(countRange, ""); ASSIGN(searchMode, modeValues[appData.searchMode-1]); GenericPopUp(loadOptions, _("Load Game Options"), TransientDlg, parent, MODAL, 0); } @@ -846,20 +875,20 @@ SoundOptionsProc () static void DefColor P((int n)); static void AdjustColor P((int i)); +static void ThemeSel P((int n, int sel)); +static int BoardOptionsOK P((int n)); static char oldPieceDir[MSG_SIZ]; +extern char *engineLine, *nickName; // defined later on -static int -BoardOptionsOK (int n) -{ - if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap; - InitDrawingParams(strcmp(oldPieceDir, appData.pieceDirectory)); - InitDrawingSizes(-1, 0); - DrawPosition(True, NULL); - return 1; -} +#define THEMELIST 1 static Option boardOptions[] = { +{ 0,LR|T2T, 0, NULL, NULL, NULL, NULL, Label, N_("Selectable themes:") }, +{ 300,LR|TB,200, NULL, (void*) engineMnemonic, (char*) &ThemeSel, NULL, ListBox, "" }, +{ 0,LR|T2T, 0, NULL, NULL, NULL, NULL, Label, N_("New name for current theme:") }, +{ 0, 0, 0, NULL, (void*) &nickName, "", NULL, TextBox, "" }, +{ 0,SAME_ROW, 0, NULL, NULL, NULL, NULL, Break, NULL }, { 0, 0, 70, NULL, (void*) &appData.whitePieceColor, "", NULL, TextBox, N_("White Piece Color:") }, { 1000, SAME_ROW, 0, NULL, (void*) &DefColor, NULL, (char**) "#FFFFCC", Button, " " }, /* TRANSLATORS: R = single letter for the color red */ @@ -913,6 +942,16 @@ static Option boardOptions[] = { { 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" } }; +static int +BoardOptionsOK (int n) +{ + if(n && (n = SelectedListBoxItem(&boardOptions[THEMELIST])) > 0 && *engineList[n] != '#') { // called by pressing OK, and theme selected + ASSIGN(engineLine, engineList[n]); + } + LoadTheme(); + return 1; +} + static void SetColorText (int n, char *buf) { @@ -956,9 +995,32 @@ AdjustColor (int i) } void +ThemeSel (int n, int sel) +{ + 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]); + LoadTheme(); + PopDown(TransientDlg); + return; + } + nr = NamesToList(appData.themeNames, engineList, engineMnemonic, buf); // replace list by only the group contents + ASSIGN(engineMnemonic[0], buf); + LoadListBox(&boardOptions[THEMELIST], _("# no themes are defined"), -1, -1); + HighlightWithScroll(&boardOptions[THEMELIST], 0, nr); +} + +void BoardOptionsProc () { strncpy(oldPieceDir, appData.pieceDirectory, MSG_SIZ-1); // to see if it changed + ASSIGN(engineLine, ""); + ASSIGN(nickName, ""); + ASSIGN(engineMnemonic[0], ""); + NamesToList(appData.themeNames, engineList, engineMnemonic, ""); GenericPopUp(boardOptions, _("Board Options"), TransientDlg, BoardWindow, MODAL, 0); } @@ -979,6 +1041,9 @@ SendString (char *p) snprintf(buf2 + (q-p), MSG_SIZ -(q-p), "%s%s", clickedWord, q+5); p = buf2; } + if(!strcmp(p, "$copy")) { // special case for copy selection + CopySomething(clickedWord); + } else if(!strcmp(p, "$chat")) { // special case for opening chat NewChat(clickedWord); } else @@ -998,7 +1063,7 @@ SendString (char *p) } void -IcsTextProc () +IcsTextPopUp () { int i=0, j; char *p, *q, *r; @@ -1030,6 +1095,13 @@ IcsTextProc () GenericPopUp(textOptions, _("ICS text menu"), TextMenuDlg, BoardWindow, NONMODAL, appData.topLevel); } +void +IcsTextProc () +{ + if(shellUp[TextMenuDlg]) PopDown(TextMenuDlg); + else IcsTextPopUp(); +} + //---------------------------------------------------- Edit Comment ----------------------------------- static char *commentText; @@ -1048,7 +1120,7 @@ NewComCallback (int n) } Option commentOptions[] = { -{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 250, NULL, (void*) &commentText, "", (char **) &CommentClick, TextBox, "" }, +{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 250, NULL, (void*) &commentText, NULL, (char **) &CommentClick, TextBox, "", &appData.commentFont }, { 0, 0, 50, NULL, (void*) &ClearComment, NULL, NULL, Button, N_("clear") }, { 0, SAME_ROW, 100, NULL, (void*) &SaveChanges, NULL, NULL, Button, N_("save changes") }, { 0, SAME_ROW, 0, NULL, (void*) &NewComCallback, "", NULL, EndMark , "" } @@ -1128,6 +1200,8 @@ EditCommentProc () static void changeTags P((int n)); static char *tagsText, **resPtr; +static int TagsClick P((Option *opt, int n, int x, int y, char *val, int index)); + static int NewTagsCallback (int n) { @@ -1137,13 +1211,27 @@ NewTagsCallback (int n) return 1; } +static void +NewMove () +{ + addToBookFlag = !addToBookFlag; +} + static Option tagsOptions[] = { { 0, 0, 0, NULL, NULL, NULL, NULL, Label, NULL }, -{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 200, NULL, (void*) &tagsText, "", NULL, TextBox, "" }, -{ 0, 0, 100, NULL, (void*) &changeTags, NULL, NULL, Button, N_("save changes") }, +{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 200, NULL, (void*) &tagsText, NULL, (char **) &TagsClick, TextBox, "", &appData.tagsFont }, +{ 0, 0, 100, NULL, (void*) &NewMove, NULL, NULL, Button, N_("add next move") }, +{ 0,SAME_ROW,100,NULL, (void*) &changeTags, NULL, NULL, Button, N_("save changes") }, { 0,SAME_ROW, 0, NULL, (void*) &NewTagsCallback, "", NULL, EndMark , "" } }; +static int TagsClick (Option *opt, int n, int x, int y, char *val, int index) +{ + if(!bookUp || n != 3) return FALSE; // only button-3 press in Edit Book is of interest + PlayBookMove(val, index); + return TRUE; +} + static void changeTags (int n) { @@ -1158,6 +1246,8 @@ NewTagsPopup (char *text, char *msg) { char *title = bookUp ? _("Edit book") : _("Tags"); + tagsOptions[2].type = bookUp ? Button : Skip; + tagsOptions[3].min = bookUp ? SAME_ROW : 0; if(DialogExists(TagsDlg)) { // if already exists, alter title and content SetWidgetText(&tagsOptions[1], text, TagsDlg); SetDialogTitle(TagsDlg, title); @@ -1194,6 +1284,12 @@ EditTagsProc () if (bookUp || !PopDown(TagsDlg)) EditTagsEvent(); } +void +AddBookMove (char *text) +{ + AppendText(&tagsOptions[1], text); +} + //---------------------------------------------- ICS Input Box ---------------------------------- char *icsText; @@ -1246,7 +1342,7 @@ NextInHistory () #define INPUT 0 Option boxOptions[] = { -{ 30, T_TOP, 400, NULL, (void*) &icsText, "", NULL, TextBox, "" }, +{ 30, T_TOP, 400, NULL, (void*) &icsText, NULL, NULL, TextBox, "" }, { 0, NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" } }; @@ -1302,7 +1398,7 @@ IcsInputBoxProc () static int TypeInOK P((int n)); Option typeOptions[] = { -{ 30, T_TOP, 400, NULL, (void*) &icsText, "", NULL, TextBox, "" }, +{ 30, T_TOP, 400, NULL, (void*) &icsText, NULL, NULL, TextBox, "" }, { 0, NO_OK, 0, NULL, (void*) &TypeInOK, "", NULL, EndMark , "" } }; @@ -1707,7 +1803,8 @@ PromotionPopUp (char choice) //---------------------------- Chat Windows ---------------------------------------------- static char *line, *memo, *chatMemo, *partner, *texts[MAX_CHAT], dirty[MAX_CHAT], *inputs[MAX_CHAT], *icsLine, *tmpLine; -static int activePartner, hidden = 1; +static int activePartner; +int hidden = 1; void ChatSwitch P((int n)); int ChatOK P((int n)); @@ -1726,16 +1823,20 @@ WindowPlacement wpTextMenu; int ContextMenu (Option *opt, int button, int x, int y, char *text, int index) { // callback for ICS-output clicks; handles button 3, passes on other events - char *start, *end; int h; if(button == -3) return TRUE; // supress default GTK context menu on up-click if(button != 3) return FALSE; - start = end = text + index; // figure out what text was clicked - while(isalnum(*end)) end++; - while(start > text && isalnum(start[-1])) start--; - clickedWord[0] = NULLCHAR; - if(end-start >= 80) end = start + 80; // intended for small words and numbers - strncpy(clickedWord, start, end-start); clickedWord[end-start] = NULLCHAR; + if(index == -1) { // pre-existing selection in memo + strncpy(clickedWord, text, MSG_SIZ); + } else { // figure out what word was clicked + char *start, *end; + start = end = text + index; + while(isalnum(*end)) end++; + while(start > text && isalnum(start[-1])) start--; + clickedWord[0] = NULLCHAR; + if(end-start >= 80) end = start + 80; // intended for small words and numbers + strncpy(clickedWord, start, end-start); clickedWord[end-start] = NULLCHAR; + } click = !shellUp[TextMenuDlg]; // request auto-popdown of textmenu when we popped it up h = wpTextMenu.height; // remembered height of text menu if(h <= 0) h = 65; // when not available, position w.r.t. top @@ -1745,12 +1846,12 @@ ContextMenu (Option *opt, int button, int x, int y, char *text, int index) if(wpTextMenu.x < 0) wpTextMenu.x = 0; if(wpTextMenu.y < 0) wpTextMenu.y = 0; wpTextMenu.width = wpTextMenu.height = -1; - IcsTextProc(); + IcsTextPopUp(); return TRUE; } Option chatOptions[] = { -{ 0, 0, 0, NULL, NULL, "", NULL, Label , N_("Chats:") }, +{ 0, 0, 0, NULL, NULL, NULL, NULL, Label , N_("Chats:") }, { 1, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") }, { 2, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") }, { 3, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") }, @@ -1861,7 +1962,7 @@ ChatOK (int n) // from here on it could be back-end if(line[strlen(line)-1] == '\n') line[strlen(line)-1] = NULLCHAR; SaveInHistory(line); - if(hidden) snprintf(buf, MSG_SIZ, "%s\n", line); else // command for ICS + if(hidden || !*chatPartner[activePartner]) snprintf(buf, MSG_SIZ, "%s\n", line); else // command for ICS if(!strcmp("whispers", chatPartner[activePartner])) snprintf(buf, MSG_SIZ, "whisper %s\n", line); // WHISPER box uses "whisper" to send else if(!strcmp("shouts", chatPartner[activePartner])) @@ -1882,7 +1983,7 @@ ChatOK (int n) void DelayedSetText () { - SetWidgetText(&chatOptions[CHAT_IN], tmpLine, ChatDlg); + SetWidgetText(&chatOptions[CHAT_IN], tmpLine, -1); // leave focus on chat-partner field! SetInsertPos(&chatOptions[CHAT_IN], strlen(tmpLine)); } @@ -1899,6 +2000,7 @@ ChatSwitch (int n) { int i, j; char *v; + if(chatOptions[CHAT_ICS].type == Skip) hidden = 0; // In Xaw there is no ICS pane we can hide behind Show(&chatOptions[CHAT_PANE], 0); // show if(hidden) ScheduleDelayedEvent(DelayedScroll, 50); // Awful! else ScheduleDelayedEvent(DelayedSetText, 50); @@ -1960,24 +2062,31 @@ NewChat (char *name) void ConsoleWrite(char *message, int count) { - if(shellUp[ChatDlg]) { + if(shellUp[ChatDlg] && chatOptions[CHAT_ICS].type != Skip) { // in Xaw this is a no-op AppendColorized(&chatOptions[CHAT_ICS], message, count); SetInsertPos(&chatOptions[CHAT_ICS], 999999); } } void -ChatProc () +ChatPopUp () { if(GenericPopUp(chatOptions, _("ICS Interaction"), ChatDlg, BoardWindow, NONMODAL, appData.topLevel)) AddHandler(&chatOptions[CHAT_PARTNER], ChatDlg, 2), AddHandler(&chatOptions[CHAT_IN], ChatDlg, 2); // treats return as OK Show(&chatOptions[CHAT_PANE], hidden = 1); // hide - HardSetFocus(&chatOptions[CHAT_IN], 0); +// HardSetFocus(&chatOptions[CHAT_IN], 0); MarkMenu("View.OpenChatWindow", ChatDlg); CursorAtEnd(&chatOptions[CHAT_IN]); } void +ChatProc () +{ + if(shellUp[ChatDlg]) PopDown(ChatDlg); + else ChatPopUp(); +} + +void ConsoleAutoPopUp (char *buf) { if(!appData.autoBox) return; @@ -1989,7 +2098,7 @@ ConsoleAutoPopUp (char *buf) SetWidgetText(&chatOptions[CHAT_IN], newText, ChatDlg); if(shellUp[ChatDlg]) HardSetFocus (&chatOptions[CHAT_IN], ChatDlg); //why??? } else { ASSIGN(line, buf); } // box did not exist: make sure it pops up with char in it - ChatProc(); + ChatPopUp(); } else PopUpMoveDialog(*buf); } @@ -2028,7 +2137,7 @@ static void GLT_Button P((int n)); static int GLT_OK P((int n)); static Option listOptions[] = { -{300, LR|TB, 200, NULL, (void*) strings, "", NULL, ListBox, "" }, // For GTK we need to specify a height, as default would just show 3 lines +{300, LR|TB, 200, NULL, (void*) strings, NULL, NULL, ListBox, "" }, // For GTK we need to specify a height, as default would just show 3 lines { 0, 0, 0, NULL, (void*) &GLT_Button, NULL, NULL, Button, N_("factory") }, { 0, SAME_ROW, 0, NULL, (void*) &GLT_Button, NULL, NULL, Button, N_("up") }, { 0, SAME_ROW, 0, NULL, (void*) &GLT_Button, NULL, NULL, Button, N_("down") }, @@ -2040,6 +2149,7 @@ GLT_OK (int n) { GLT_ParseList(); appData.gameListTags = strdup(lpUserGLT); + GameListUpdate(); return 1; } @@ -2304,7 +2414,8 @@ DisplayLogos (Option *w1, Option *w2) { void *whiteLogo = first.programLogo, *blackLogo = second.programLogo; if(appData.autoLogo) { - + 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 @@ -2369,19 +2480,19 @@ Option mainOptions[] = { // description of main window in terms of generic dialo { 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, Label, "1" }, // optional title in window +{ 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 { 12, L2L|T2T, 200, NULL, (void*) &CCB, NULL, NULL, Label, "White" }, // white clock { 13, 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, Skip, "" }, // black logo { 0, LR|T2T|BORDER, 401, NULL, NULL, "", NULL, Skip, "2" }, // backup for title in window (if no room for other) -{ 0, LR|T2T|BORDER, 270, NULL, NULL, "", NULL, Label, "message" }, // message field +{ 0, LR|T2T|BORDER, 270, NULL, NULL, NULL, NULL, Label, "message", &appData.font }, // message field { 0, RR|TT|SAME_ROW, 125, NULL, NULL, "", NULL, BoxBegin, "" }, // (optional) button bar - { 0, 0, 0, NULL, (void*) &ToStartEvent, NULL, NULL, Button, N_("<<") }, - { 0, SAME_ROW, 0, NULL, (void*) &BackwardEvent, NULL, NULL, Button, N_("<") }, - { 0, SAME_ROW, 0, NULL, (void*) &PauseEvent, NULL, NULL, Button, N_(PAUSE_BUTTON) }, - { 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, (void*) &ToStartEvent, NULL, NULL, Button, N_("<<"), &appData.font }, + { 0, SAME_ROW, 0, NULL, (void*) &BackwardEvent, NULL, NULL, Button, N_("<"), &appData.font }, + { 0, SAME_ROW, 0, NULL, (void*) &PauseEvent, NULL, NULL, Button, N_(PAUSE_BUTTON), &appData.font }, + { 0, SAME_ROW, 0, NULL, (void*) &ForwardEvent, NULL, NULL, Button, N_(">"), &appData.font }, + { 0, SAME_ROW, 0, NULL, (void*) &ToEndEvent, NULL, NULL, Button, N_(">>"), &appData.font }, { 0, 0, 0, NULL, NULL, "", NULL, BoxEnd, "" }, { 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" }, @@ -2427,6 +2538,7 @@ Exp (int n, int x, int y) { static int but1, but3, oldW, oldH; int menuNr = -3, sizing, f, r; + TimeMark now; if(n == 0) { // motion if(SeekGraphClick(Press, x, y, 1)) return NULL; @@ -2440,6 +2552,7 @@ Exp (int n, int x, int y) return NULL; } if(n != 10 && PopDown(PromoDlg)) fromX = fromY = -1; // user starts fiddling with board when promotion dialog is up + else GetTimeMark(&now); shiftKey = ShiftKeys(); controlKey = (shiftKey & 0xC) != 0; shiftKey = (shiftKey & 3) != 0; @@ -2450,11 +2563,13 @@ Exp (int n, int x, int y) case 3: menuNr = RightClick(Press, x, y, &pmFromX, &pmFromY), but3 = 1; break; case -2: shiftKey = !shiftKey; case -3: menuNr = RightClick(Release, x, y, &pmFromX, &pmFromY), but3 = 0; break; + case 4: BackwardEvent(); break; + case 5: ForwardEvent(); break; case 10: sizing = (oldW != x || oldH != y); oldW = x; oldH = y; InitDrawingHandle(mainOptions + W_BOARD); - if(sizing) return NULL; // don't redraw while sizing + if(sizing && SubtractTimeMarks(&now, &programStartTime) > 10000) return NULL; // don't redraw while sizing (except at startup) DrawPosition(True, NULL); default: return NULL; @@ -2475,13 +2590,14 @@ Option * 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 @@ -2878,10 +2994,9 @@ FileNamePopUp (char *label, char *def, char *filter, FileProc proc, char *openMo void ActivateTheme (int col) { + if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap; + InitDrawingParams(strcmp(oldPieceDir, appData.pieceDirectory)); + InitDrawingSizes(-1, 0); + DrawPosition(True, NULL); } -char * -Col2Text (int n) -{ - return NULL; -}