X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwchat.c;h=e762b199c424b5277b9204158797c6d3029858be;hb=31d464fc0f1de8577fd198a180ba26f8cd884ac2;hp=d6dc5027940de709e531156f25462c0ba4726c69;hpb=c81dfbe8facdec8a6d9645ef0c999b40e241d40d;p=xboard.git

diff --git a/winboard/wchat.c b/winboard/wchat.c
index d6dc502..e762b19 100644
--- a/winboard/wchat.c
+++ b/winboard/wchat.c
@@ -45,7 +45,7 @@ extern char chatPartner[MAX_CHAT][MSG_SIZ];
 HANDLE chatHandle[MAX_CHAT];
 
 void SendToICS P((char *s));
-void ChatPopUp();
+void ChatPopUp P((char *s));
 void ChatPopDown();
 
 /* Imports from backend.c */
@@ -150,9 +150,14 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 		sprintf(buf, "Chat Window %s", first.tidy);
 		SetWindowText(hDlg, buf);
         }
-	chatPartner[partner][0] = 0;
-	filterHasFocus[partner] = FALSE;
-
+//	chatPartner[partner][0] = 0;
+	SendMessage( GetDlgItem(hDlg, IDC_ChatPartner), // [HGM] clickbox: initialize with requested handle
+			WM_SETTEXT, 0, (LPARAM) chatPartner[partner] );
+	filterHasFocus[partner] = TRUE;
+	if(chatPartner[partner][0]) {
+	    filterHasFocus[partner] = FALSE;
+	    SetFocus( GetDlgItem(hDlg, OPT_ChatInput) );
+	}
         return FALSE;
 
     case WM_COMMAND:
@@ -246,13 +251,19 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 }
 
 // front end
-void ChatPopUp()
+void ChatPopUp(char *icsHandle)
 {
   FARPROC lpProc;
+  int i, partner = -1;
   
   if(chatCount >= MAX_CHAT) return;
 
   CheckMenuItem(GetMenu(hwndMain), IDM_NewChat, MF_CHECKED);
+  for(i=0; i<MAX_CHAT; i++) if(chatHandle[i] == NULL) { partner = i; break; }
+  if(partner == -1) { DisplayError("No chat box available", 0); return; }
+  if(icsHandle) // [HGM] clickbox set handle in advance
+       strcpy(chatPartner[partner], icsHandle);
+  else chatPartner[partner][0] = NULLCHAR;
   chatCount++;
 
     lpProc = MakeProcInstance( (FARPROC) ChatProc, hInst );