X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=16d4d19b3a3043013866deb12255bda30f57a45e;hb=51e9503489f2cee28a076bf52c56185a5283b069;hp=59b8e04cc6c266cef033dd61e27be3d0530bfaba;hpb=53160aadadca6a23463efdeb9f6e0953de4eb380;p=xboard.git diff --git a/dialogs.c b/dialogs.c index 59b8e04..16d4d19 100644 --- a/dialogs.c +++ b/dialogs.c @@ -682,6 +682,7 @@ Option icsOptions[] = { { 0, 0, 0, NULL, (void*) &appData.colorChallenge, "", NULL, TextBox, N_("Challenge Text Colors:") }, { 0, 0, 0, NULL, (void*) &appData.colorRequest, "", NULL, TextBox, N_("Request Text Colors:") }, { 0, 0, 0, NULL, (void*) &appData.colorSeek, "", NULL, TextBox, N_("Seek Text Colors:") }, +{ 0, 0, 0, NULL, (void*) &appData.colorNormal, "", NULL, TextBox, N_("Other Text Colors:") }, { 0, 0, 0, NULL, (void*) &IcsOptionsOK, "", NULL, EndMark , "" } }; @@ -902,6 +903,7 @@ static Option boardOptions[] = { { 0, 0, 0, NULL, (void*) &appData.upsideDown, "", NULL, CheckBox, N_("Flip Pieces Shogi Style (Colored buttons restore default)") }, //{ 0, 0, 0, NULL, (void*) &appData.allWhite, "", NULL, CheckBox, N_("Use Outline Pieces for Black") }, { 0, 0, 0, NULL, (void*) &appData.monoMode, "", NULL, CheckBox, N_("Mono Mode") }, +{ 0, 0, 200, NULL, (void*) &appData.logoSize, "", NULL, Spin, N_("Logo Size (0=off, requires restart):") }, { 0,-1, 5, NULL, (void*) &appData.overrideLineGap, "", NULL, Spin, N_("Line Gap (-1 = default for board size):") }, { 0, 0, 0, NULL, (void*) &appData.useBitmaps, "", NULL, CheckBox, N_("Use Board Textures") }, { 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".png", NULL, FileName, N_("Light-Squares Texture File:") }, @@ -964,20 +966,35 @@ BoardOptionsProc () Option textOptions[100]; static void PutText P((char *text, int pos)); +static void NewChat P((char *name)); +static char clickedWord[MSG_SIZ], click; void SendString (char *p) { - char buf[MSG_SIZ], *q; + char buf[MSG_SIZ], buf2[MSG_SIZ], *q; + if(q = strstr(p, "$name")) { // in Xaw this is already intercepted + if(!shellUp[TextMenuDlg] || !clickedWord[0]) return; + strncpy(buf2, p, MSG_SIZ); + snprintf(buf2 + (q-p), MSG_SIZ -(q-p), "%s%s", clickedWord, q+5); + p = buf2; + } + if(!strcmp(p, "$chat")) { // special case for opening chat + NewChat(clickedWord); + } else if(q = strstr(p, "$input")) { if(!shellUp[TextMenuDlg]) return; strncpy(buf, p, MSG_SIZ); strncpy(buf + (q-p), q+6, MSG_SIZ-(q-p)); PutText(buf, q-p); - return; + } else { + snprintf(buf, MSG_SIZ, "%s\n", p); + SendToICS(buf); + } + if(click) { // popped up by memo click + click = clickedWord[0] = 0; + PopDown(TextMenuDlg); } - snprintf(buf, MSG_SIZ, "%s\n", p); - SendToICS(buf); } void @@ -1109,12 +1126,14 @@ EditCommentProc () //------------------------------------------------------ Edit Tags ---------------------------------- static void changeTags P((int n)); -static char *tagsText; +static char *tagsText, **resPtr; static int NewTagsCallback (int n) { - if(!bookUp) ReplaceTags(tagsText, &gameInfo); + if(bookUp) SaveToBook(tagsText), DisplayBook(currentMove); else + if(resPtr) { ASSIGN(*resPtr, tagsText); } else + ReplaceTags(tagsText, &gameInfo); return 1; } @@ -1130,6 +1149,7 @@ changeTags (int n) { GenericReadout(tagsOptions, 1); if(bookUp) SaveToBook(tagsText), DisplayBook(currentMove); else + if(resPtr) { ASSIGN(*resPtr, tagsText); } else ReplaceTags(tagsText, &gameInfo); } @@ -1157,6 +1177,7 @@ TagsPopUp (char *tags, char *msg) void EditTagsPopUp (char *tags, char **dest) { // wrapper to preserve old name used in back-end + resPtr = dest; NewTagsPopup(tags, NULL); } @@ -1222,6 +1243,8 @@ NextInHistory () } // end of borrowed code +#define INPUT 0 + Option boxOptions[] = { { 30, T_TOP, 400, NULL, (void*) &icsText, "", NULL, TextBox, "" }, { 0, NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" } @@ -1232,10 +1255,10 @@ ICSInputSendText () { char *val; - GetWidgetText(&boxOptions[0], &val); + GetWidgetText(&boxOptions[INPUT], &val); SaveInHistory(val); SendMultiLineToICS(val); - SetWidgetText(&boxOptions[0], "", InputBoxDlg); + SetWidgetText(&boxOptions[INPUT], "", InputBoxDlg); } void @@ -1249,29 +1272,14 @@ IcsKey (int n) ICSInputSendText(); return; case 1: - GetWidgetText(&boxOptions[0], &val); + GetWidgetText(&boxOptions[INPUT], &val); val = PrevInHistory(val); break; case -1: val = NextInHistory(); } - SetWidgetText(&boxOptions[0], val = val ? val : "", InputBoxDlg); - SetInsertPos(&boxOptions[0], strlen(val)); -} - -static void -PutText (char *text, int pos) -{ - char buf[MSG_SIZ], *p; - - if(strstr(text, "$add ") == text) { - GetWidgetText(&boxOptions[0], &p); - snprintf(buf, MSG_SIZ, "%s%s", p, text+5); text = buf; - pos += strlen(p) - 5; - } - SetWidgetText(&boxOptions[0], text, TextMenuDlg); - SetInsertPos(&boxOptions[0], pos); - HardSetFocus(&boxOptions[0]); + SetWidgetText(&boxOptions[INPUT], val = val ? val : "", InputBoxDlg); + SetInsertPos(&boxOptions[INPUT], strlen(val)); } void @@ -1279,8 +1287,8 @@ ICSInputBoxPopUp () { MarkMenu("View.ICSInputBox", InputBoxDlg); if(GenericPopUp(boxOptions, _("ICS input box"), InputBoxDlg, BoardWindow, NONMODAL, 0)) - AddHandler(&boxOptions[0], InputBoxDlg, 3); - CursorAtEnd(&boxOptions[0]); + AddHandler(&boxOptions[INPUT], InputBoxDlg, 3); + CursorAtEnd(&boxOptions[INPUT]); } void @@ -1322,10 +1330,10 @@ BoxAutoPopUp (char *buf) 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 char *p, newText[MSG_SIZ]; - GetWidgetText(&boxOptions[0], &p); + GetWidgetText(&boxOptions[INPUT], &p); snprintf(newText, MSG_SIZ, "%s%c", p, *buf); - SetWidgetText(&boxOptions[0], newText, InputBoxDlg); - if(shellUp[InputBoxDlg]) HardSetFocus (&boxOptions[0]); //why??? + SetWidgetText(&boxOptions[INPUT], newText, InputBoxDlg); + if(shellUp[InputBoxDlg]) HardSetFocus (&boxOptions[INPUT]); //why??? } else icsText = buf; // box did not exist: make sure it pops up with char in it ICSInputBoxPopUp(); } else PopUpMoveDialog(*buf); @@ -1698,23 +1706,102 @@ PromotionPopUp (char choice) //---------------------------- Chat Windows ---------------------------------------------- -static char *line, *memo, *partner, *texts[MAX_CHAT], dirty[MAX_CHAT]; -static int activePartner; +static char *line, *memo, *chatMemo, *partner, *texts[MAX_CHAT], dirty[MAX_CHAT]; +static int activePartner, 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 + +void PaneSwitch 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; + 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 + GetPlacement(ChatDlg, &wpTextMenu); + if(opt->target == (void*) &chatMemo) wpTextMenu.y += (wpTextMenu.height - 30)/2; // click in chat + wpTextMenu.x += x - 50; wpTextMenu.y += y - h + 50; // request positioning + if(wpTextMenu.x < 0) wpTextMenu.x = 0; + if(wpTextMenu.y < 0) wpTextMenu.y = 0; + wpTextMenu.width = wpTextMenu.height = -1; + IcsTextProc(); + return TRUE; +} + Option chatOptions[] = { +{ 0, 0, 0, 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") }, +{ 4, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") }, +{ 5, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") }, +{ 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:") }, -{ 1, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, "" }, -{ 2, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, "" }, -{ 3, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, "" }, -{ 4, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, "" }, -{ 100, T_VSCRL | T_FILL | T_WRAP | T_TOP, 510, NULL, (void*) &memo, NULL, NULL, TextBox, "" }, +{ 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 , "" }, { 0, 0, 510, NULL, (void*) &line, NULL, NULL, TextBox, "" }, { 0, NO_OK|SAME_ROW, 0, NULL, (void*) &ChatOK, NULL, NULL, EndMark , "" } }; +static void +PutText (char *text, int pos) +{ + char buf[MSG_SIZ], *p; + DialogClass dlg = ChatDlg; + Option *opt = &chatOptions[CHAT_IN]; + + if(strstr(text, "$add ") == text) { + GetWidgetText(&boxOptions[INPUT], &p); + snprintf(buf, MSG_SIZ, "%s%s", p, text+5); text = buf; + pos += strlen(p) - 5; + } + 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); + CursorAtEnd(opt); +} + +void +IcsHist (int n, Option *opt, DialogClass dlg) +{ // [HGM] input: let up-arrow recall previous line from history + char *val = NULL; // to suppress spurious warning + + if(opt != &chatOptions[CHAT_IN]) return; + switch(n) { + case 1: + GetWidgetText(opt, &val); + val = PrevInHistory(val); + break; + case -1: + val = NextInHistory(); + } + SetWidgetText(opt, val = val ? val : "", dlg); + SetInsertPos(opt, strlen(val)); +} + void OutputChatMessage (int partner, char *mess) { @@ -1725,11 +1812,11 @@ OutputChatMessage (int partner, char *mess) texts[partner] = (char*) malloc(len); snprintf(texts[partner], len, "%s%s", p ? p : "", mess); FREE(p); - if(partner == activePartner) { - AppendText(&chatOptions[5], mess); - SetInsertPos(&chatOptions[5], len-2); + if(partner == activePartner && !hidden) { + AppendText(&chatOptions[CHAT_OUT], mess); + SetInsertPos(&chatOptions[CHAT_OUT], len-2); } else { - SetColor("#FFC000", &chatOptions[partner + (partner < activePartner)]); + SetColor("#FFC000", &chatOptions[partner + 1]); dirty[partner] = 1; } } @@ -1739,17 +1826,19 @@ ChatOK (int n) { // can only be called through in chat-partner text-edit, as there is no OK button char buf[MSG_SIZ]; - if(!partner || strcmp(partner, chatPartner[activePartner])) { + if(!hidden && (!partner || strcmp(partner, chatPartner[activePartner]))) { safeStrCpy(chatPartner[activePartner], partner, MSG_SIZ); - SetWidgetText(&chatOptions[5], "", -1); // clear text if we alter partner - SetWidgetText(&chatOptions[6], "", ChatDlg); // clear text if we alter partner - HardSetFocus(&chatOptions[6]); + 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]); } - if(line[0]) { // something was typed - SetWidgetText(&chatOptions[6], "", ChatDlg); + 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(!strcmp("whispers", chatPartner[activePartner])) snprintf(buf, MSG_SIZ, "whisper %s\n", line); // WHISPER box uses "whisper" to send else if(!strcmp("shouts", chatPartner[activePartner])) @@ -1768,30 +1857,62 @@ ChatOK (int n) } 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); +} + +void ChatSwitch (int n) { int i, j; - if(n <= activePartner) n--; - activePartner = n; + Show(&chatOptions[CHAT_PANE], 0); // show + if(hidden) ScheduleDelayedEvent(DelayedScroll, 50); // Awful! + hidden = 0; + activePartner = --n; if(!texts[n]) texts[n] = strdup(""); dirty[n] = 0; - SetWidgetText(&chatOptions[5], texts[n], ChatDlg); - SetInsertPos(&chatOptions[5], strlen(texts[n])); - SetWidgetText(&chatOptions[0], chatPartner[n], ChatDlg); + SetWidgetText(&chatOptions[CHAT_OUT], texts[n], ChatDlg); + SetInsertPos(&chatOptions[CHAT_OUT], strlen(texts[n])); + SetWidgetText(&chatOptions[CHAT_PARTNER], chatPartner[n], ChatDlg); for(i=j=0; i