X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=df53d8afd51edb3dc80d20406b8792eba7161efc;hb=95bcf4c69c5c7c40bcecdf5624ca622a9373701e;hp=16d4d19b3a3043013866deb12255bda30f57a45e;hpb=51e9503489f2cee28a076bf52c56185a5283b069;p=xboard.git diff --git a/dialogs.c b/dialogs.c index 16d4d19..df53d8a 100644 --- a/dialogs.c +++ b/dialogs.c @@ -846,20 +846,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, ".png", 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 +913,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 +966,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 +1012,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 @@ -1325,7 +1361,7 @@ PopUpMoveDialog (char firstchar) void BoxAutoPopUp (char *buf) -{ +{ // only used in Xaw. GTK calls ConsoleAutoPopUp in stead (when we type to board) if(!appData.autoBox) return; if(appData.icsActive) { // text typed to board in ICS mode: divert to ICS input box if(DialogExists(InputBoxDlg)) { // box already exists: append to current contents @@ -1333,7 +1369,7 @@ BoxAutoPopUp (char *buf) GetWidgetText(&boxOptions[INPUT], &p); snprintf(newText, MSG_SIZ, "%s%c", p, *buf); SetWidgetText(&boxOptions[INPUT], newText, InputBoxDlg); - if(shellUp[InputBoxDlg]) HardSetFocus (&boxOptions[INPUT]); //why??? + if(shellUp[InputBoxDlg]) HardSetFocus (&boxOptions[INPUT], InputBoxDlg); //why??? } else icsText = buf; // box did not exist: make sure it pops up with char in it ICSInputBoxPopUp(); } else PopUpMoveDialog(*buf); @@ -1706,35 +1742,41 @@ PromotionPopUp (char choice) //---------------------------- Chat Windows ---------------------------------------------- -static char *line, *memo, *chatMemo, *partner, *texts[MAX_CHAT], dirty[MAX_CHAT]; -static int activePartner, hidden = 1; +static char *line, *memo, *chatMemo, *partner, *texts[MAX_CHAT], dirty[MAX_CHAT], *inputs[MAX_CHAT], *icsLine, *tmpLine; +static int activePartner; +int hidden = 1; void ChatSwitch P((int n)); int ChatOK P((int n)); #define CHAT_ICS 6 #define CHAT_PARTNER 8 -#define CHAT_OUT 10 -#define CHAT_PANE 11 -#define CHAT_IN 12 +#define CHAT_OUT 11 +#define CHAT_PANE 12 +#define CHAT_IN 13 void PaneSwitch P((void)); +void ClearChat P((void)); 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 @@ -1758,6 +1800,7 @@ Option chatOptions[] = { { 250, T_VSCRL | T_FILL | T_WRAP | T_TOP, 510, NULL, (void*) &memo, NULL, (void*) &ContextMenu, TextBox, "" }, { 0, 0, 0, NULL, NULL, "", NULL, Break , "" }, { 0, T_TOP, 100, NULL, (void*) &partner, NULL, NULL, TextBox, N_("Chat partner:") }, +{ 0, SAME_ROW, 0, NULL, (void*) &ClearChat, NULL, NULL, Button, N_("End Chat") }, { 0, SAME_ROW, 0, NULL, (void*) &PaneSwitch, NULL, NULL, Button, N_("Hide") }, { 250, T_VSCRL | T_FILL | T_WRAP | T_TOP, 510, NULL, (void*) &chatMemo, NULL, (void*) &ContextMenu, TextBox, "" }, { 0, 0, 0, NULL, NULL, "", NULL, Break , "" }, @@ -1780,17 +1823,37 @@ PutText (char *text, int pos) if(shellUp[InputBoxDlg]) opt = &boxOptions[INPUT], dlg = InputBoxDlg; // for the benefit of Xaw give priority to ICS Input Box SetWidgetText(opt, text, dlg); SetInsertPos(opt, pos); - HardSetFocus(opt); + HardSetFocus(opt, dlg); CursorAtEnd(opt); } -void +int IcsHist (int n, Option *opt, DialogClass dlg) { // [HGM] input: let up-arrow recall previous line from history char *val = NULL; // to suppress spurious warning + int chat, start; - if(opt != &chatOptions[CHAT_IN]) return; + if(opt != &chatOptions[CHAT_IN] && !(opt == &chatOptions[CHAT_PARTNER] && n == 33)) return 0; switch(n) { + case 33: // + if(hidden) BoardToTop(); + else PaneSwitch(); + break; + case 15: + NewChat(lastTalker); + break; + case 14: + for(chat=0; chat < MAX_CHAT; chat++) if(!chatPartner[chat][0]) break; + if(chat < MAX_CHAT) ChatSwitch(chat + 1); + break; + case 10: // + chat = start = (activePartner - hidden + MAX_CHAT) % MAX_CHAT; + 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 + ChatSwitch(chat + 1); + break; case 1: GetWidgetText(opt, &val); val = PrevInHistory(val); @@ -1800,6 +1863,7 @@ IcsHist (int n, Option *opt, DialogClass dlg) } SetWidgetText(opt, val = val ? val : "", dlg); SetInsertPos(opt, strlen(val)); + return 1; } void @@ -1831,14 +1895,14 @@ ChatOK (int n) 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")); - HardSetFocus(&chatOptions[CHAT_IN]); + HardSetFocus(&chatOptions[CHAT_IN], 0); } if(line[0] || hidden) { // something was typed (for ICS commands we also allow empty line!) SetWidgetText(&chatOptions[CHAT_IN], "", ChatDlg); // 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])) @@ -1857,17 +1921,30 @@ ChatOK (int n) } void +DelayedSetText () +{ + SetWidgetText(&chatOptions[CHAT_IN], tmpLine, ChatDlg); + SetInsertPos(&chatOptions[CHAT_IN], strlen(tmpLine)); +} + +void DelayedScroll () { // If we do this immediately it does it before shrinking the memo, so the lower half remains hidden (Ughh!) SetInsertPos(&chatOptions[CHAT_ICS], 999999); + SetWidgetText(&chatOptions[CHAT_IN], tmpLine, ChatDlg); + SetInsertPos(&chatOptions[CHAT_IN], strlen(tmpLine)); } void ChatSwitch (int n) { int i, j; + char *v; Show(&chatOptions[CHAT_PANE], 0); // show if(hidden) ScheduleDelayedEvent(DelayedScroll, 50); // Awful! + else ScheduleDelayedEvent(DelayedSetText, 50); + GetWidgetText(&chatOptions[CHAT_IN], &v); + if(hidden) { ASSIGN(icsLine, v); } else { ASSIGN(inputs[activePartner], v); } hidden = 0; activePartner = --n; if(!texts[n]) texts[n] = strdup(""); @@ -1879,14 +1956,37 @@ ChatSwitch (int n) SetWidgetLabel(&chatOptions[++j], *chatPartner[i] ? chatPartner[i] : _("New Chat")); SetColor(dirty[i] ? "#FFC000" : "#FFFFFF", &chatOptions[j]); } - SetWidgetText(&chatOptions[CHAT_IN], "", ChatDlg); - HardSetFocus(&chatOptions[strcmp(chatPartner[n], "") ? CHAT_IN : CHAT_PARTNER]); + if(!inputs[n]) { ASSIGN(inputs[n], ""); } +// SetWidgetText(&chatOptions[CHAT_IN], inputs[n], ChatDlg); // does not work (in this widget only) +// SetInsertPos(&chatOptions[CHAT_IN], strlen(inputs[n])); + tmpLine = inputs[n]; // for the delayed event + HardSetFocus(&chatOptions[strcmp(chatPartner[n], "") ? CHAT_IN : CHAT_PARTNER], 0); } void PaneSwitch () { + char *v; Show(&chatOptions[CHAT_PANE], hidden = 1); // hide + GetWidgetText(&chatOptions[CHAT_IN], &v); + ASSIGN(inputs[activePartner], v); + if(!icsLine) { ASSIGN(icsLine, ""); } + tmpLine = icsLine; ScheduleDelayedEvent(DelayedSetText, 50); +// SetWidgetText(&chatOptions[CHAT_IN], icsLine, ChatDlg); // does not work (in this widget only) +// SetInsertPos(&chatOptions[CHAT_IN], strlen(icsLine)); +} + +void +ClearChat () +{ // clear the chat to make it free for other use + chatPartner[activePartner][0] = NULLCHAR; + ASSIGN(texts[activePartner], ""); + ASSIGN(inputs[activePartner], ""); + SetWidgetText(&chatOptions[CHAT_PARTNER], "", ChatDlg); + SetWidgetText(&chatOptions[CHAT_OUT], "", ChatDlg); + SetWidgetText(&chatOptions[CHAT_IN], "", ChatDlg); + SetWidgetLabel(&chatOptions[activePartner+1], _("New Chat")); + HardSetFocus(&chatOptions[CHAT_PARTNER], 0); } static void @@ -1912,8 +2012,26 @@ ChatProc () { 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 - PaneSwitch(); HardSetFocus(&chatOptions[CHAT_IN]); + Show(&chatOptions[CHAT_PANE], hidden = 1); // hide +// HardSetFocus(&chatOptions[CHAT_IN], 0); MarkMenu("View.OpenChatWindow", ChatDlg); + CursorAtEnd(&chatOptions[CHAT_IN]); +} + +void +ConsoleAutoPopUp (char *buf) +{ + 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 + char *p, newText[MSG_SIZ]; + GetWidgetText(&chatOptions[CHAT_IN], &p); + snprintf(newText, MSG_SIZ, "%s%c", p, *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(); + } else PopUpMoveDialog(*buf); } //--------------------------------- Game-List options dialog ------------------------------------------ @@ -2801,10 +2919,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; -}