X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwchat.c;h=3be1e7f7d33d2bb1dd196b8191470c2a97d8c083;hb=6341a1e8f282d099affed789a69bad4660fe9cdc;hp=97c060b2061f1d3a869187f64f994ab073589bf8;hpb=b382d988c6f886f3a49483df9e3e36de0b6b0824;p=xboard.git

diff --git a/winboard/wchat.c b/winboard/wchat.c
index 97c060b..3be1e7f 100644
--- a/winboard/wchat.c
+++ b/winboard/wchat.c
@@ -3,7 +3,8 @@
  *
  * Author: H.G.Muller (August 2009)
  *
- * Copyright 2009, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * ------------------------------------------------------------------------
  *
@@ -221,7 +222,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:
@@ -361,14 +362,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 );