X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwchat.c;h=6346c7d8f40f4957ffa05f98bb300d86aaff770c;hb=d99fcee670f13546341990351298e627cc7f385f;hp=1f786054bf3cb1951b89d796ea70a1b66375980f;hpb=0ea1b434ac6becf79c75d85ba27de5b89666a7c3;p=xboard.git

diff --git a/winboard/wchat.c b/winboard/wchat.c
index 1f78605..6346c7d 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, 2014 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;
-		sprintf(buf, "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:
@@ -241,7 +242,7 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
     break;
 
     case WM_COMMAND:
-      /* 
+      /*
         [AS]
         If <Enter> is pressed while editing the filter, it's better to apply
         the filter rather than selecting the current game.
@@ -287,16 +288,16 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 	    // from here on it could be back-end
 	    SaveInHistory(mess);
 	    if(!strcmp("whispers", chatPartner[partner]))
-		sprintf(buf, "whisper %s\n", mess); // WHISPER box uses "whisper" to send
+	      snprintf(buf, MSG_SIZ, "whisper %s\n", mess); // WHISPER box uses "whisper" to send
 	    else if(!strcmp("shouts", chatPartner[partner]))
-		sprintf(buf, "shout %s\n", mess); // SHOUT box uses "shout" to send
+	      snprintf(buf, MSG_SIZ, "shout %s\n", mess); // SHOUT box uses "shout" to send
 	    else {
 		if(!atoi(chatPartner[partner])) {
-		    sprintf(buf, "> %s\r\n", mess); // echo only tells to handle, not channel
+		  snprintf(buf, MSG_SIZ, "> %s\r\n", mess); // echo only tells to handle, not channel
 		InsertIntoMemo(hDlg, buf);
-		sprintf(buf, "xtell %s %s\n", chatPartner[partner], mess);
+		snprintf(buf, MSG_SIZ, "xtell %s %s\n", chatPartner[partner], mess);
 		} else
-		sprintf(buf, "tell %s %s\n", chatPartner[partner], mess);
+		  snprintf(buf, MSG_SIZ, "tell %s %s\n", chatPartner[partner], mess);
 	    }
 	    SendToICS(buf);
 	    break;
@@ -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
-    safeStrCpy(chatPartner[partner], icsHandle, 
+  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 );