X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=91d752b0ef5d0bb77010f8ad4975b9f1e010823b;hb=20d95ee2c3dfba12a15c9290b69aa8aaa9d5f2fa;hp=16d4d19b3a3043013866deb12255bda30f57a45e;hpb=51e9503489f2cee28a076bf52c56185a5283b069;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index 16d4d19..91d752b 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -1325,7 +1325,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 +1333,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,7 +1706,7 @@ PromotionPopUp (char choice)
 
 //---------------------------- Chat Windows ----------------------------------------------
 
-static char *line, *memo, *chatMemo, *partner, *texts[MAX_CHAT], dirty[MAX_CHAT];
+static char *line, *memo, *chatMemo, *partner, *texts[MAX_CHAT], dirty[MAX_CHAT], *inputs[MAX_CHAT], *icsLine, *tmpLine;
 static int activePartner, hidden = 1;
 
 void ChatSwitch P((int n));
@@ -1780,17 +1780,30 @@ 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: // <Esc>
+	if(hidden) BoardToTop();
+	else PaneSwitch();
+	break;
+      case 10: // <Tab>
+	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 +1813,7 @@ IcsHist (int n, Option *opt, DialogClass dlg)
     }
     SetWidgetText(opt, val = val ? val : "", dlg);
     SetInsertPos(opt, strlen(val));
+    return 1;
 }
 
 void
@@ -1831,7 +1845,7 @@ 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);
@@ -1857,17 +1871,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 +1906,24 @@ 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));
 }
 
 static void
@@ -1912,8 +1949,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 ------------------------------------------