X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwchat.c;h=ecfbcbdc7a96436ffbc87f1cdf6503dc2d853b22;hb=79173c63a1184a8c99f5b25ae5d20ccf27ac01bc;hp=a387466513fb7b48e78f026f9d507e1df5e8153a;hpb=45ceecc52a3f3c8f44bb5272f658be4d95f0cc07;p=xboard.git

diff --git a/winboard/wchat.c b/winboard/wchat.c
index a387466..ecfbcbd 100644
--- a/winboard/wchat.c
+++ b/winboard/wchat.c
@@ -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;
@@ -189,13 +189,14 @@ 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);
 		SetWindowText(hDlg, buf);
         }
-	for(i=0; i<MAX_CHAT; i++) if(chatHandle[i]) {
+	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]);
@@ -204,7 +205,8 @@ LRESULT CALLBACK ChatProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 	    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); }
-        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;
@@ -388,10 +390,9 @@ void ChatPopDown()
 
 void OutputChatMessage(int partner, char *text)
 {
-	int j;
-	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])