Fix copying of WB Chat Window contents

[xboard.git] / winboard / wchat.c

diff --git a/winboard/wchat.c b/winboard/wchat.c
index 48d555a..b02e00e 100644 (file)
--- a/winboard/wchat.c
+++ b/winboard/wchat.c
@@ -3,6 +3,8 @@
  *\r
  * Author: H.G.Muller (August 2009)\r
  *\r
+ * Copyright 2009, 2010 Free Software Foundation, Inc. \r
+ *\r
  * ------------------------------------------------------------------------\r
  *\r
  * GNU XBoard is free software: you can redistribute it and/or modify\r
@@ -43,7 +45,7 @@ extern char chatPartner[MAX_CHAT][MSG_SIZ];
 HANDLE chatHandle[MAX_CHAT];\r
 \r
 void SendToICS P((char *s));\r
-void ChatPopUp();\r
+void ChatPopUp P((char *s));\r
 void ChatPopDown();\r
 \r
 /* Imports from backend.c */\r
@@ -148,9 +150,14 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
                sprintf(buf, "Chat Window %s", first.tidy);\r
                SetWindowText(hDlg, buf);\r
         }\r
-       chatPartner[partner][0] = 0;\r
-       filterHasFocus[partner] = FALSE;\r
-\r
+//     chatPartner[partner][0] = 0;\r
+       SendMessage( GetDlgItem(hDlg, IDC_ChatPartner), // [HGM] clickbox: initialize with requested handle\r
+                       WM_SETTEXT, 0, (LPARAM) chatPartner[partner] );\r
+       filterHasFocus[partner] = TRUE;\r
+       if(chatPartner[partner][0]) {\r
+           filterHasFocus[partner] = FALSE;\r
+           SetFocus( GetDlgItem(hDlg, OPT_ChatInput) );\r
+       }\r
         return FALSE;\r
 \r
     case WM_COMMAND:\r
@@ -201,7 +208,7 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
                sprintf(buf, "whisper %s\n", mess); // WHISPER box uses "whisper" to send\r
            else {\r
                if(!atoi(chatPartner[partner])) {\r
-                   sprintf(buf, "> %s\n", mess); // echo only tells to handle, not channel\r
+                   sprintf(buf, "> %s\r\n", mess); // echo only tells to handle, not channel\r
                InsertIntoMemo(hDlg, buf);\r
                sprintf(buf, "xtell %s %s\n", chatPartner[partner], mess);\r
                } else\r
@@ -244,13 +251,17 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 }\r
 \r
 // front end\r
-void ChatPopUp()\r
+void ChatPopUp(char *icsHandle)\r
 {\r
   FARPROC lpProc;\r
+  int i, partner = -1;\r
   \r
-  if(chatCount >= MAX_CHAT) return;\r
-\r
   CheckMenuItem(GetMenu(hwndMain), IDM_NewChat, MF_CHECKED);\r
+  for(i=0; i<MAX_CHAT; i++) if(chatHandle[i] == NULL) { partner = i; break; }\r
+  if(partner == -1) { DisplayError("You first have to close a Chat Box\nbefore you can open a new one", 0); return; }\r
+  if(icsHandle) // [HGM] clickbox set handle in advance\r
+       strcpy(chatPartner[partner], icsHandle);\r
+  else chatPartner[partner][0] = NULLCHAR;\r
   chatCount++;\r
 \r
     lpProc = MakeProcInstance( (FARPROC) ChatProc, hInst );\r
@@ -276,5 +287,7 @@ void OutputChatMessage(int partner, char *text)
 {\r
        if(!chatHandle[partner]) return;\r
 \r
+       int n = strlen(text);\r
+       text[n+1] = 0; text[n] = '\n'; text[n-1] = '\r'; // Needs CR to not lose line breaks on copy-paste\r
        InsertIntoMemo(chatHandle[partner], text);\r
 }\r