X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwchat.c;h=e06d99601594a62400b5486cc31d0c2c4325793e;hb=165dd54f68ac49be0b50c3d2e1c5c054decdc5ac;hp=8d53d7c70c70168ca9cf292c9f5b8cb229a20f56;hpb=187622c7a66834db1b980750e5fe513696308c20;p=xboard.git

diff --git a/winboard/wchat.c b/winboard/wchat.c
index 8d53d7c..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.
  *
  * ------------------------------------------------------------------------
  *
@@ -32,6 +32,7 @@
 #include <malloc.h>
 #include <commdlg.h>
 #include <dlgs.h>
+#include <Windowsx.h>
 
 #include "common.h"
 #include "frontend.h"
@@ -41,6 +42,7 @@
 #include "wsnap.h"
 
 int chatCount;
+static int onTop;
 extern char chatPartner[MAX_CHAT][MSG_SIZ];
 HANDLE chatHandle[MAX_CHAT];
 static WNDPROC chatInputWindowProc;
@@ -59,9 +61,11 @@ char *NextInHistory();
 extern HWND ChatDialog;
 
 extern HINSTANCE hInst;
-extern HWND hwndMain;
+extern HWND hwndConsole;
+extern char ics_handle[];
 
 extern WindowPlacement wpChat[MAX_CHAT];
+extern WindowPlacement wpConsole;
 
 extern BoardSize boardSize;
 
@@ -177,7 +181,7 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 {
     static SnapData sd;
     char buf[MSG_SIZ], mess[MSG_SIZ];
-    int partner = -1, i;
+    int partner = -1, i, x, y;
     static BOOL filterHasFocus[MAX_CHAT];
     WORD wMask;
     HWND hMemo;
@@ -186,16 +190,28 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 
     switch (message) {
     case WM_INITDIALOG:
+        Translate(hDlg, DLG_Chat);
 	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);
         }
-//	chatPartner[partner][0] = 0;
+	for(i=0; i<MAX_CHAT; i++) if(chatHandle[i]) {
+	    if(i == partner) continue;
+	    // set our button in other open chats
+	    SetDlgItemText(chatHandle[i], IDC_Focus1+partner-(i<partner), chatPartner[partner]);
+	    EnableWindow( GetDlgItem(chatHandle[i], IDC_Focus1+partner-(i<partner)), 1 );
+	    // and buttons for other chats in ours
+	    SetDlgItemText(hDlg, IDC_Focus1+i-(i>partner), chatPartner[i]);
+	} else EnableWindow( GetDlgItem(hDlg, IDC_Focus1+i-(i>partner)), 0 );
+	for(i=0; i<MAX_CHAT-1; i++) { Button_SetStyle(GetDlgItem(hDlg, IDC_Focus1+i), BS_PUSHBUTTON|BS_LEFT, TRUE); }
+        x = wpConsole.x; y = wpConsole.y; EnsureOnScreen(&x, &y, 0, 0);
+        SetWindowPos(hDlg, NULL, x, y, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
 	SendMessage( GetDlgItem(hDlg, IDC_ChatPartner), // [HGM] clickbox: initialize with requested handle
 			WM_SETTEXT, 0, (LPARAM) chatPartner[partner] );
 	filterHasFocus[partner] = TRUE;
+	onTop = partner; // a newly opened box becomes top one
 	if(chatPartner[partner][0]) {
 	    filterHasFocus[partner] = FALSE;
 	    SetFocus( GetDlgItem(hDlg, OPT_ChatInput) );
@@ -205,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:
@@ -226,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.
@@ -250,12 +266,9 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 
         switch (LOWORD(wParam)) {
 
-	case IDCANCEL:
-	    chatHandle[partner] = 0;
-	    chatPartner[partner][0] = 0;
-            ChatPopDown();
-	    EndDialog(hDlg, TRUE);
-            break;
+	case IDCANCEL: /* let Esc key switch focus back to console */
+	    SetFocus(GetDlgItem(hwndConsole, OPT_ConsoleInput));
+	    break;
 
 	case IDC_Clear:
 	    SendMessage( GetDlgItem(hDlg, IDC_ChatMemo), WM_SETTEXT, 0, (LPARAM) "" );
@@ -263,6 +276,10 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 
 	case IDC_Change:
 	    GetDlgItemText(hDlg, IDC_ChatPartner, chatPartner[partner], MSG_SIZ);
+	    for(i=0; i<MAX_CHAT; i++) if(chatHandle[i] && i != partner) {
+	      // set our button in other open chats
+	      SetDlgItemText(chatHandle[i], IDC_Focus1+partner-(i<partner), chatPartner[partner]);
+	    }
 	    break;
 
 	case IDC_Send:
@@ -270,19 +287,37 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 	    SetDlgItemText(hDlg, OPT_ChatInput, "");
 	    // from here on it could be back-end
 	    SaveInHistory(mess);
-	    if(!strcmp("WHISPER", chatPartner[partner]))
-		sprintf(buf, "whisper %s\n", mess); // WHISPER box uses "whisper" to send
+	    if(!strcmp("whispers", chatPartner[partner]))
+	      snprintf(buf, MSG_SIZ, "whisper %s\n", mess); // WHISPER box uses "whisper" to send
+	    else if(!strcmp("shouts", chatPartner[partner]))
+	      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;
 
+	case IDC_Focus1:
+	case IDC_Focus2:
+	case IDC_Focus3:
+	case IDC_Focus4:
+	    i = LOWORD(wParam) - IDC_Focus1;
+	    if(i >= partner) i++;
+	    onTop = i;
+	    SetFocus(GetDlgItem(hDlg, IDC_Send));
+	    if(chatHandle[i]) {
+		int j;
+		for(j=0; j<MAX_CHAT; j++) if(i != j && chatHandle[j])
+		    Button_SetState(GetDlgItem(chatHandle[j], IDC_Focus1+i-(j<i)), FALSE);
+		SetFocus(GetDlgItem(chatHandle[i], OPT_ChatInput));
+	    }
+	    break;
+
         default:
           break;
         }
@@ -293,6 +328,11 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 	chatHandle[partner] = 0;
 	chatPartner[partner][0] = 0;
         ChatPopDown();
+	for(i=0; i<MAX_CHAT; i++) if(chatHandle[i] && i != partner) {
+	    // set our button in other open chats
+	    SetDlgItemText(chatHandle[i], IDC_Focus1+partner-(i<partner), "");
+	    EnableWindow( GetDlgItem(chatHandle[i], IDC_Focus1+partner-(i<partner)), 0 );
+	}
 	EndDialog(hDlg, TRUE);
         break;
 
@@ -321,19 +361,27 @@ 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
-       strcpy(chatPartner[partner], icsHandle);
-  else chatPartner[partner][0] = NULLCHAR;
+  if(icsHandle) { // [HGM] clickbox set handle in advance
+    safeStrCpy(chatPartner[partner], icsHandle,
+	       sizeof(chatPartner[partner])/sizeof(chatPartner[partner][0]) );
+    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 );
 
     /* Note to self: dialog must have the WS_VISIBLE style set, otherwise it's not shown! */
-    CreateDialog( hInst, MAKEINTRESOURCE(DLG_Chat), hwndMain, (DLGPROC)lpProc );
+    CreateDialog( hInst, MAKEINTRESOURCE(DLG_Chat), hwndConsole, (DLGPROC)lpProc );
 
     FreeProcInstance(lpProc);
 
@@ -351,9 +399,11 @@ void ChatPopDown()
 
 void OutputChatMessage(int partner, char *text)
 {
-	if(!chatHandle[partner]) return;
+	int j, n = strlen(text);
 
-	int n = strlen(text);
+	if(!chatHandle[partner]) return;
 	text[n+1] = 0; text[n] = '\n'; text[n-1] = '\r'; // Needs CR to not lose line breaks on copy-paste
 	InsertIntoMemo(chatHandle[partner], text);
+	if(partner != onTop) for(j=0; j<MAX_CHAT; j++) if(j != partner && chatHandle[j])
+	    Button_SetState(GetDlgItem(chatHandle[j], IDC_Focus1+partner-(j<partner)), TRUE);
 }