X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwchat.c;h=e06d99601594a62400b5486cc31d0c2c4325793e;hb=0235f1ff0f54978979e94bb8d34ad1a882bbff68;hp=1da04b749f738f74d6e9018b3291aea3347172ce;hpb=e80c98c04e951e5026a24531cd6316be962636b9;p=xboard.git

diff --git a/winboard/wchat.c b/winboard/wchat.c
index 1da04b7..e06d996 100644
--- a/winboard/wchat.c
+++ b/winboard/wchat.c
@@ -3,7 +3,7 @@
  *
  * Author: H.G.Muller (August 2009)
  *
- * Copyright 2009, 2010 Free Software Foundation, Inc.
+ * Copyright 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
  *
  * ------------------------------------------------------------------------
  *
@@ -62,6 +62,7 @@ extern HWND ChatDialog;
 
 extern HINSTANCE hInst;
 extern HWND hwndConsole;
+extern char ics_handle[];
 
 extern WindowPlacement wpChat[MAX_CHAT];
 extern WindowPlacement wpConsole;
@@ -193,7 +194,7 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 	if(partner<0) {
 		for(i=0; i<MAX_CHAT; i++) if(chatHandle[i] == NULL) { partner = i; break; }
 	        chatHandle[partner] = hDlg;
-		snprintf(buf, MSG_SIZ, "Chat Window %s", first.tidy);
+		snprintf(buf, MSG_SIZ, T_("Chat Window %s"), ics_handle[0] ? ics_handle : first.tidy);
 		SetWindowText(hDlg, buf);
         }
 	for(i=0; i<MAX_CHAT; i++) if(chatHandle[i]) {
@@ -220,7 +221,7 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 	SendMessage(hMemo, EM_SETEVENTMASK, 0, wMask | ENM_LINK);
 	SendMessage(hMemo, EM_AUTOURLDETECT, TRUE, 0L);
 	chatInputWindowProc = (WNDPROC) // cloned from ConsoleWndProc(). Assume they all share same proc.
-	      SetWindowLong(GetDlgItem(hDlg, OPT_ChatInput), GWL_WNDPROC, (LONG) InterceptArrowKeys);
+	      SetWindowLongPtr(GetDlgItem(hDlg, OPT_ChatInput), GWLP_WNDPROC, (LONG_PTR) InterceptArrowKeys);
         return FALSE;
 
     case WM_NOTIFY:
@@ -360,14 +361,21 @@ void ChatPopUp(char *icsHandle)
 {
   FARPROC lpProc;
   int i, partner = -1;
+  char buf[MSG_SIZ];
+  static int first = 1;
 
   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("You first have to close a Chat Box\nbefore you can open a new one", 0); return; }
-  if(icsHandle) // [HGM] clickbox set handle in advance
+  if(icsHandle) { // [HGM] clickbox set handle in advance
     safeStrCpy(chatPartner[partner], icsHandle,
 	       sizeof(chatPartner[partner])/sizeof(chatPartner[partner][0]) );
-  else chatPartner[partner][0] = NULLCHAR;
+    if(sscanf(icsHandle, "%d", &i) == 1) { // make sure channel is on
+	snprintf(buf, MSG_SIZ, "addlist ch %d\n", i);
+	SendToICS(buf);
+	if(first) first=0, SendToICS(buf); // work-around for weirdness: On public FICS code first attempt on login is completely ignored
+    }
+  } else chatPartner[partner][0] = NULLCHAR;
   chatCount++;
 
     lpProc = MakeProcInstance( (FARPROC) ChatProc, hInst );