From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Tue, 16 Feb 2010 18:44:46 +0000 (+0100)
Subject: Make Chat Windows pseudo-tabbed
X-Git-Tag: master-20100221~15
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=b42a7598bf84b00ff82160234839d7b1c9f3f329;p=xboard.git

Make Chat Windows pseudo-tabbed

By adding buttons in every Chat Box to navigate directly to every other
Chat Box, a stacked set of Chat Windows behaves like a single tabbed
window, but can still be unstacked. The buttons turn grey to warn that
new text appeared in hidden boxes (i.e. not the one last brought to top).
---

diff --git a/common.h b/common.h
index 745ceac..35c04c8 100644
--- a/common.h
+++ b/common.h
@@ -717,7 +717,7 @@ extern WindowPlacement wpGameList;
 extern WindowPlacement wpTags;
 
 // [HGM] chat	
-#define MAX_CHAT 3
+#define MAX_CHAT 5
 extern int chatCount;
 extern char chatPartner[MAX_CHAT][MSG_SIZ];
 
diff --git a/winboard/resource.h b/winboard/resource.h
index 9092c29..f6a1f5f 100644
--- a/winboard/resource.h
+++ b/winboard/resource.h
@@ -507,6 +507,10 @@
 #define IDC_Clear			1725
 #define IDC_Send			1726
 #define IDM_NewChat			1727
+#define IDC_Focus1			1730
+#define IDC_Focus2			1731
+#define IDC_Focus3			1732
+#define IDC_Focus4			1733
 #define IDC_SPECIFY_ENG_STATIC          1814
 #define IDC_SPECIFY_SERVER_STATIC       1815
 #define OPT_MESS                        1818
diff --git a/winboard/wchat.c b/winboard/wchat.c
index 8d53d7c..3b90b2c 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;
@@ -62,6 +64,7 @@ extern HINSTANCE hInst;
 extern HWND hwndMain;
 
 extern WindowPlacement wpChat[MAX_CHAT];
+extern WindowPlacement wpConsole;
 
 extern BoardSize boardSize;
 
@@ -192,7 +195,15 @@ 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] && i != partner) {
+	    // 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 );
+	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);
 	SendMessage( GetDlgItem(hDlg, IDC_ChatPartner), // [HGM] clickbox: initialize with requested handle
 			WM_SETTEXT, 0, (LPARAM) chatPartner[partner] );
 	filterHasFocus[partner] = TRUE;
@@ -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:
@@ -283,6 +298,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 +324,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;
 
@@ -351,9 +387,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);
 }
diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 15d94dc..35f202f 100644
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -823,22 +823,25 @@ BEGIN
     ICON            IDI_TRANS_14,IDC_StateIcon2,164,84,20,20
 END
 
-DLG_Chat DIALOGEX 0, 0, 256, 106
+DLG_Chat DIALOGEX 0, 0, 290, 106
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_TOOLWINDOW
 CAPTION "Chat Window"
 FONT 8, "MS Sans Serif"
 BEGIN
     LTEXT           "Chat partner:",IDC_STATIC,5,5,45,10
-    EDITTEXT        IDC_ChatPartner,50,3,100,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Change",IDC_Change,155,3,35,13
-    PUSHBUTTON      "Clear",IDC_Clear,198,3,25,13
-    DEFPUSHBUTTON   "Send",IDC_Send,228,3,25,13
+    EDITTEXT        IDC_ChatPartner,50,3,45,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "",IDC_Focus1,100,3,30,13
+    PUSHBUTTON      "",IDC_Focus2,133,3,30,13
+    PUSHBUTTON      "",IDC_Focus3,166,3,30,13
+    PUSHBUTTON      "",IDC_Focus4,199,3,30,13
+    PUSHBUTTON      "Clear",IDC_Clear,232,3,25,13
+    DEFPUSHBUTTON   "Send",IDC_Send,262,3,25,13
     CONTROL         "",IDC_ChatMemo,"RICHEDIT",ES_MULTILINE | ES_READONLY |
                     ES_AUTOVSCROLL | WS_BORDER | WS_VSCROLL | 
-                    WS_HSCROLL | WS_TABSTOP,3,17,250,70
+                    WS_HSCROLL | WS_TABSTOP,3,17,284,70
     CONTROL         "",OPT_ChatInput,"RICHEDIT",ES_AUTOHSCROLL | ES_NOHIDESEL | 
-                    WS_BORDER | WS_TABSTOP,3,90,250,13
+                    WS_BORDER | WS_TABSTOP,3,90,284,13
 END
 
 DLG_EnginePlayOptions DIALOG DISCARDABLE  0, 0, 208, 202