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

diff --git a/winboard/wchat.c b/winboard/wchat.c
index 8d53d7c..30b6aa5 100644
--- a/winboard/wchat.c
+++ b/winboard/wchat.c
@@ -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,10 @@ char *NextInHistory();
 extern HWND ChatDialog;
 
 extern HINSTANCE hInst;
-extern HWND hwndMain;
+extern HWND hwndConsole;
 
 extern WindowPlacement wpChat[MAX_CHAT];
+extern WindowPlacement wpConsole;
 
 extern BoardSize boardSize;
 
@@ -177,7 +180,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;
@@ -192,10 +195,21 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 		sprintf(buf, "Chat Window %s", 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) );
@@ -250,12 +264,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 +274,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,8 +285,10 @@ 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]))
+	    if(!strcmp("whispers", chatPartner[partner]))
 		sprintf(buf, "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
 	    else {
 		if(!atoi(chatPartner[partner])) {
 		    sprintf(buf, "> %s\r\n", mess); // echo only tells to handle, not channel
@@ -283,6 +300,22 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 	    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 +326,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;
 
@@ -333,7 +371,7 @@ void ChatPopUp(char *icsHandle)
     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 +389,12 @@ void ChatPopDown()
 
 void OutputChatMessage(int partner, char *text)
 {
+	int j;
 	if(!chatHandle[partner]) return;
 
 	int n = strlen(text);
 	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);
 }