X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwchat.c;h=30b6aa5ba6c69b84305518b2c6dd66e2796744d9;hb=e7419db9b1c542d1ca0b825cdfc0032a4ba39188;hp=4a1b4d317ba6cdaa4d6e8acb883e7e51c70fb599;hpb=74c6f0bfb6476b2ba21f90d9e5d34130b26825ef;p=xboard.git

diff --git a/winboard/wchat.c b/winboard/wchat.c
index 4a1b4d3..30b6aa5 100644
--- a/winboard/wchat.c
+++ b/winboard/wchat.c
@@ -61,7 +61,7 @@ char *NextInHistory();
 extern HWND ChatDialog;
 
 extern HINSTANCE hInst;
-extern HWND hwndMain;
+extern HWND hwndConsole;
 
 extern WindowPlacement wpChat[MAX_CHAT];
 extern WindowPlacement wpConsole;
@@ -180,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;
@@ -195,15 +195,17 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 		sprintf(buf, "Chat Window %s", first.tidy);
 		SetWindowText(hDlg, buf);
         }
-	for(i=0; i<MAX_CHAT; i++) if(chatHandle[i] && i != partner) {
+	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)), 1 );
+	} 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); }
-        SetWindowPos(hDlg, NULL, wpConsole.x, wpConsole.y, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
+        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;
@@ -262,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) "" );
@@ -372,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);