chat's component COLORCHOOSER standardized in the core

git-svn-id: http://svn.miranda-ng.org/main/trunk@11332 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

18 files changed, 133 insertions, 193 deletions

diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h
index bcf4291b89..73a91c4028 100644
--- a/src/core/commonheaders.h
+++ b/src/core/commonheaders.h
@@ -48,6 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include <malloc.h>

 #include <stdio.h>

+#include <math.h>

 #include <time.h>

 #include <stddef.h>

 #include <process.h>

diff --git a/src/core/stdchat/res/chat.rc b/src/core/stdchat/res/chat.rc
index 1465655e61..c4fc84fc82 100644
--- a/src/core/stdchat/res/chat.rc
+++ b/src/core/stdchat/res/chat.rc
@@ -277,7 +277,6 @@ BEGIN
 END

 #endif    // APSTUDIO_INVOKED

 

-

 /////////////////////////////////////////////////////////////////////////////

 //

 // Icon

@@ -287,42 +286,6 @@ END
 // remains consistent on all systems.

 IDI_TAG1                ICON                    "tag1.ico"

 IDI_TAG2                ICON                    "tag2.ico"

-#endif    // Neutral (Default) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-/////////////////////////////////////////////////////////////////////////////

-// Swedish resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)

-#ifdef _WIN32

-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_COLORCHOOSER DIALOGEX 0, 0, 198, 150

-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | 

-	WS_VISIBLE | WS_BORDER

-EXSTYLE WS_EX_TOPMOST

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,172,136,26,14,NOT WS_TABSTOP

-    CTEXT           "",IDC_COLORTEXT,0,0,197,12,SS_CENTERIMAGE

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

 IDI_BUNDERLINE          ICON                    "underline.ico"

 IDI_BBOLD               ICON                    "bold.ico"

 IDI_BITALICS            ICON                    "italics.ico"

@@ -360,33 +323,6 @@ IDI_OVERLAY             ICON                    "overlay.ico"
 IDI_NICKLIST2           ICON                    "nicklist2.ico"

 IDI_FILTER2             ICON                    "filter2.ico"

 

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\\src\\resource.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""winres.h""\r\n"

-    "#include ""richedit.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

 /////////////////////////////////////////////////////////////////////////////

 //

 // Menu

@@ -438,11 +374,10 @@ BEGIN
     END

 END

 

-#endif    // Swedish resources

+#endif    // Neutral (Default) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

-

 #ifndef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h
index 3507e8f5c5..d0702be5d2 100644
--- a/src/core/stdchat/src/chat.h
+++ b/src/core/stdchat/src/chat.h
@@ -137,23 +137,9 @@ struct CREOleCallback : public IRichEditOleCallback
 

 extern CREOleCallback reOleCallback;

 

-struct COLORCHOOSER

-{

-	MODULEINFO*   pModule;

-	int           xPosition;

-	int           yPosition;

-	HWND          hWndTarget;

-	BOOL          bForeground;

-	SESSION_INFO *si;

-};

-

 //main.c

-

 void LoadIcons(void);

 

-//colorchooser.c

-INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-

 // log.c

 void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, BOOL bRedraw, BOOL bPhaseTwo);

 void ValidateFilename (TCHAR * filename);

diff --git a/src/core/stdchat/src/resource.h b/src/core/stdchat/src/resource.h
index f95fa7dd01..439c6d3639 100644
--- a/src/core/stdchat/src/resource.h
+++ b/src/core/stdchat/src/resource.h
@@ -36,7 +36,6 @@
 #define IDI_TAG1                        149

 #define IDI_TAG2                        150

 #define IDR_MENU                        151

-#define IDD_COLORCHOOSER                152

 #define IDI_STATUS3                     153

 #define IDI_STATUS2                     154

 #define IDI_STATUS4                     155

@@ -94,7 +93,6 @@
 #define IDC_HIGHLIGHT                   1068

 #define IDC_TEXTO                       1069

 #define IDC_LOGGING                     1069

-#define IDC_COLORTEXT                   1070

 #define IDC_LIST                        1072

 #define IDC_TAB                         1074

 #define IDC_1                           1075

diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index 4a73524523..f3dbde1bb6 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -1121,6 +1121,7 @@ static void __cdecl phase2(void * lParam)
 INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)

 {

 	SESSION_INFO *si = (SESSION_INFO*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

+	RECT rc;

 

 	switch (uMsg) {

 	case WM_INITDIALOG:

@@ -1876,7 +1877,6 @@ LABEL_SHOWWINDOW:
 	case GC_SPLITTERMOVED:

 		{

 			POINT pt;

-			RECT rc;

 			RECT rcLog;

 			BOOL bFormat = IsWindowVisible(GetDlgItem(hwndDlg,IDC_SMILEY));

 

@@ -1940,7 +1940,6 @@ LABEL_SHOWWINDOW:
 

 	case GC_SHOWFILTERMENU:

 		{

-			RECT rc;

 			HWND hwnd = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_FILTER), hwndDlg, FilterWndProc, (LPARAM)si);

 			TranslateDialogDefault(hwnd);

 			GetWindowRect(GetDlgItem(hwndDlg, IDC_FILTER), &rc);

@@ -1949,38 +1948,25 @@ LABEL_SHOWWINDOW:
 		break;

 

 	case GC_SHOWCOLORCHOOSER:

-		{

-			BOOL bFG = lParam == IDC_COLOR ? TRUE : FALSE;

-			COLORCHOOSER * pCC = (COLORCHOOSER *)mir_alloc(sizeof(COLORCHOOSER));

-

-			RECT rc;

-			GetWindowRect(GetDlgItem(hwndDlg, bFG ? IDC_COLOR : IDC_BKGCOLOR), &rc);

-			pCC->hWndTarget = GetDlgItem(hwndDlg, IDC_MESSAGE);

-			pCC->pModule = pci->MM_FindModule(si->pszModule);

-			pCC->xPosition = rc.left+3;

-			pCC->yPosition = IsWindowVisible(GetDlgItem(hwndDlg, IDC_COLOR))?rc.top-1:rc.top+20;

-			pCC->bForeground = bFG;

-			pCC->si = si;

-

-			CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_COLORCHOOSER), hwndDlg, DlgProcColorToolWindow, (LPARAM) pCC);

-		}

+		pci->ColorChooser(si, lParam == IDC_COLOR, hwndDlg, GetDlgItem(hwndDlg, IDC_MESSAGE), GetDlgItem(hwndDlg, lParam));

 		break;

 

 	case GC_SCROLLTOBOTTOM:

-		{

+		if ((GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_LOG), GWL_STYLE) & WS_VSCROLL) != 0) {

 			SCROLLINFO si = { 0 };

-			if ((GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_LOG), GWL_STYLE) & WS_VSCROLL) != 0) {

-				CHARRANGE sel;

-				si.cbSize = sizeof(si);

-				si.fMask = SIF_PAGE | SIF_RANGE;

-				GetScrollInfo(GetDlgItem(hwndDlg, IDC_LOG), SB_VERT, &si);

-				si.fMask = SIF_POS;

-				si.nPos = si.nMax - si.nPage + 1;

-				SetScrollInfo(GetDlgItem(hwndDlg, IDC_LOG), SB_VERT, &si, TRUE);

-				sel.cpMin = sel.cpMax = GetRichTextLength(GetDlgItem(hwndDlg, IDC_LOG));

-				SendMessage(GetDlgItem(hwndDlg, IDC_LOG), EM_EXSETSEL, 0, (LPARAM) &sel);

-				PostMessage(GetDlgItem(hwndDlg, IDC_LOG), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);

-		}	}

+			si.cbSize = sizeof(si);

+			si.fMask = SIF_PAGE | SIF_RANGE;

+			GetScrollInfo(GetDlgItem(hwndDlg, IDC_LOG), SB_VERT, &si);

+

+			si.fMask = SIF_POS;

+			si.nPos = si.nMax - si.nPage + 1;

+			SetScrollInfo(GetDlgItem(hwndDlg, IDC_LOG), SB_VERT, &si, TRUE);

+

+			CHARRANGE sel;

+			sel.cpMin = sel.cpMax = GetRichTextLength(GetDlgItem(hwndDlg, IDC_LOG));

+			SendMessage(GetDlgItem(hwndDlg, IDC_LOG), EM_EXSETSEL, 0, (LPARAM) &sel);

+			PostMessage(GetDlgItem(hwndDlg, IDC_LOG), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);

+		}

 		break;

 

 	case WM_TIMER:

@@ -2363,10 +2349,9 @@ LABEL_SHOWWINDOW:
 			break;

 

 		case IDC_SMILEY:

-			{

-				RECT rc;

-				GetWindowRect(GetDlgItem(hwndDlg, IDC_SMILEY), &rc);

-

+			GetWindowRect(GetDlgItem(hwndDlg, IDC_SMILEY), &rc);

+			

+			if (SmileyAddInstalled) {

 				SMADD_SHOWSEL3 smaddInfo = { sizeof(smaddInfo) };

 				smaddInfo.hwndTarget = GetDlgItem(hwndDlg, IDC_MESSAGE);

 				smaddInfo.targetMessage = EM_REPLACESEL;

@@ -2377,9 +2362,7 @@ LABEL_SHOWWINDOW:
 				smaddInfo.yPosition = rc.top - 1;

 				smaddInfo.hContact = si->hContact;

 				smaddInfo.hwndParent = hwndDlg;

-

-				if (SmileyAddInstalled)

-					CallService(MS_SMILEYADD_SHOWSELECTION, 0, (LPARAM) &smaddInfo);

+				CallService(MS_SMILEYADD_SHOWSELECTION, 0, (LPARAM)&smaddInfo);

 			}

 			break;

 

diff --git a/src/core/stdchat/stdchat_10.vcxproj b/src/core/stdchat/stdchat_10.vcxproj
index 2367473f54..610b1baf71 100644
--- a/src/core/stdchat/stdchat_10.vcxproj
+++ b/src/core/stdchat/stdchat_10.vcxproj
@@ -201,7 +201,6 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="src\colorchooser.cpp" />

     <ClCompile Include="src\log.cpp" />

     <ClCompile Include="src\stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

diff --git a/src/core/stdchat/stdchat_10.vcxproj.filters b/src/core/stdchat/stdchat_10.vcxproj.filters
index 3db0ba41e8..1250407396 100644
--- a/src/core/stdchat/stdchat_10.vcxproj.filters
+++ b/src/core/stdchat/stdchat_10.vcxproj.filters
@@ -19,9 +19,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="src\colorchooser.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\log.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/src/core/stdchat/stdchat_12.vcxproj b/src/core/stdchat/stdchat_12.vcxproj
index a3d1589a8b..0912c9dd3d 100644
--- a/src/core/stdchat/stdchat_12.vcxproj
+++ b/src/core/stdchat/stdchat_12.vcxproj
@@ -204,7 +204,6 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="src\colorchooser.cpp" />

     <ClCompile Include="src\log.cpp" />

     <ClCompile Include="src\stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

diff --git a/src/core/stdchat/stdchat_12.vcxproj.filters b/src/core/stdchat/stdchat_12.vcxproj.filters
index 3db0ba41e8..1250407396 100644
--- a/src/core/stdchat/stdchat_12.vcxproj.filters
+++ b/src/core/stdchat/stdchat_12.vcxproj.filters
@@ -19,9 +19,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="src\colorchooser.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\log.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/src/miranda32_10.vcxproj b/src/miranda32_10.vcxproj
index 4ed44e12c8..9ce0ade5ad 100644
--- a/src/miranda32_10.vcxproj
+++ b/src/miranda32_10.vcxproj
@@ -301,6 +301,9 @@
     <ClCompile Include="modules\chat\clist.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

+    <ClCompile Include="modules\chat\colorchooser.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

     <ClCompile Include="modules\chat\log.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

diff --git a/src/miranda32_10.vcxproj.filters b/src/miranda32_10.vcxproj.filters
index 858975caad..b1caef1af9 100644
--- a/src/miranda32_10.vcxproj.filters
+++ b/src/miranda32_10.vcxproj.filters
@@ -627,6 +627,9 @@
     <ClCompile Include="modules\langpack\lpopts.cpp">

       <Filter>Modules\langpack</Filter>

     </ClCompile>

+    <ClCompile Include="modules\chat\colorchooser.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="resource.rc">

diff --git a/src/miranda32_12.vcxproj b/src/miranda32_12.vcxproj
index aba0a38ee2..f9ad51416b 100644
--- a/src/miranda32_12.vcxproj
+++ b/src/miranda32_12.vcxproj
@@ -305,6 +305,9 @@
     <ClCompile Include="modules\chat\clist.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

+    <ClCompile Include="modules\chat\colorchooser.cpp">

+      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

     <ClCompile Include="modules\chat\log.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

diff --git a/src/miranda32_12.vcxproj.filters b/src/miranda32_12.vcxproj.filters
index b7364b661c..6bce7c5112 100644
--- a/src/miranda32_12.vcxproj.filters
+++ b/src/miranda32_12.vcxproj.filters
@@ -636,6 +636,9 @@
     <ClCompile Include="modules\langpack\langpack.cpp">

       <Filter>Modules\langpack</Filter>

     </ClCompile>

+    <ClCompile Include="modules\chat\colorchooser.cpp">

+      <Filter>Modules\chat</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="resource.rc">

diff --git a/src/modules/chat/chat.h b/src/modules/chat/chat.h
index 09bdb7c3f4..68ef108dfb 100644
--- a/src/modules/chat/chat.h
+++ b/src/modules/chat/chat.h
@@ -68,6 +68,9 @@ INT_PTR  LeaveChat(WPARAM wParam, LPARAM lParam);
 int      PrebuildContactMenu(WPARAM wParam, LPARAM lParam);

 INT_PTR  PrebuildContactMenuSvc(WPARAM wParam, LPARAM lParam);

 

+// colorchooser.c

+void ColorChooser(SESSION_INFO *si, BOOL bFG, HWND hwndDlg, HWND hwndTarget, HWND hwndChooser);

+

 // options.c

 int    OptionsInit(void);

 int    OptionsUnInit(void);

diff --git a/src/core/stdchat/src/colorchooser.cpp b/src/modules/chat/colorchooser.cpp
index b7a1066e7d..7f20a1d6fd 100644
--- a/src/core/stdchat/src/colorchooser.cpp
+++ b/src/modules/chat/colorchooser.cpp
@@ -1,7 +1,9 @@
 /*

 Chat module plugin for Miranda IM

 

-Copyright (C) 2003 Jörgen Persson

+Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project,

+all portions of this codebase are copyrighted to the people

+listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -18,22 +20,29 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-

-// this color chooser window is inspired by PeaCow's smiley chooser window for the Smileyadd plugin

+#include "..\..\core\commonheaders.h"

 

 #include "chat.h"

-#include <math.h>

+

+struct COLORCHOOSER

+{

+	MODULEINFO *pModule;

+	int   xPosition, yPosition;

+	HWND  hWndTarget, hWndChooser;

+	BOOL  bForeground;

+	GCSessionInfoBase *si;

+};

 

 static int CalculateCoordinatesToButton(COLORCHOOSER * pCC, POINT pt)

 {

-	int iSquareRoot = (int)sqrt((double)pCC->pModule->nColorCount);

-	int nCols = iSquareRoot * iSquareRoot < pCC->pModule->nColorCount?iSquareRoot+1:iSquareRoot;

+	int iSquareRoot = (int)sqrt(static_cast<float>(pCC->pModule->nColorCount));

+	int nCols = iSquareRoot * iSquareRoot < pCC->pModule->nColorCount ? iSquareRoot + 1 : iSquareRoot;

 

 	int col = pt.x / 25;

-	int row = (pt.y-20) / 20;

+	int row = (pt.y - 20) / 20;

 	int pos = nCols * row + col;

 

-	if (pt.y < 20 && pos >= pCC->pModule->nColorCount) 

+	if (pt.y < 20 && pos >= pCC->pModule->nColorCount)

 		pos = -1;

 

 	return pos;

@@ -41,22 +50,22 @@ static int CalculateCoordinatesToButton(COLORCHOOSER * pCC, POINT pt)
 

 static RECT CalculateButtonToCoordinates(COLORCHOOSER * pCC, int buttonPosition)

 {

-	RECT pt;

-	int iSquareRoot = (int)sqrt((double)pCC->pModule->nColorCount);

-	int nCols = iSquareRoot * iSquareRoot < pCC->pModule->nColorCount?iSquareRoot+1:iSquareRoot;

+	int iSquareRoot = (int)sqrt(static_cast<float>(pCC->pModule->nColorCount));

+	int nCols = iSquareRoot * iSquareRoot < pCC->pModule->nColorCount ? iSquareRoot + 1 : iSquareRoot;

 

 	int row = buttonPosition / nCols;

 	int col = buttonPosition % nCols;

 

-	pt.left = col * 25+1;

+	RECT pt;

+	pt.left = col * 25 + 1;

 	pt.top = row * 20 + 20;

-	pt.right = pt.left + 25-1;

+	pt.right = pt.left + 25 - 1;

 	pt.bottom = pt.top + 20;

 

 	return pt;

 }

 

-INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	static COLORCHOOSER* pCC = NULL;

 	static int iCurrentHotTrack;

@@ -65,38 +74,33 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 	static int iColumns;

 	static HWND hPreviousActiveWindow;

 

-	switch(msg) {

+	switch (msg) {

 	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

 		{

-			RECT rc;

-			int iSquareRoot;

-			int width ;

-			int height;

-

-			TranslateDialogDefault(hwndDlg);

 			pCC = (COLORCHOOSER*) lParam;

 

 			iCurrentHotTrack = -2;

 			bChoosing = FALSE;

 

-			iSquareRoot = (int)sqrt((double)pCC->pModule->nColorCount);

+			int iSquareRoot = (int)sqrt(static_cast<float>(pCC->pModule->nColorCount));

 

-			iColumns = iSquareRoot * iSquareRoot == pCC->pModule->nColorCount?iSquareRoot:iSquareRoot+1;

+			iColumns = iSquareRoot * iSquareRoot == pCC->pModule->nColorCount ? iSquareRoot : iSquareRoot + 1;

 			iRows = iSquareRoot;

 

+			RECT rc;

 			rc.top = rc.left = 100;

 			rc.right =  100 +  iColumns * 25 + 1;

 			rc.bottom = iRows * 20 + 100 + 20;

 

 			AdjustWindowRectEx(&rc, GetWindowLongPtr(hwndDlg, GWL_STYLE), FALSE, GetWindowLongPtr(hwndDlg, GWL_EXSTYLE));

 

-			width = rc.right - rc.left;

-			height = rc.bottom - rc.top;

+			int width = rc.right - rc.left;

+			int height = rc.bottom - rc.top;

 

 			pCC->yPosition -= height;

 

-

-			SetDlgItemText(hwndDlg, IDC_COLORTEXT, pCC->bForeground?TranslateT("Text color"):TranslateT("Background color"));

+			SetDlgItemText(hwndDlg, IDC_COLORTEXT, pCC->bForeground ? TranslateT("Text color") : TranslateT("Background color"));

 			SetWindowPos(GetDlgItem(hwndDlg, IDC_COLORTEXT), NULL,  0, 0, width, 20, 0);

 			SetWindowPos(hwndDlg, NULL, pCC->xPosition, pCC->yPosition, width, height, SWP_SHOWWINDOW);

 		}

@@ -104,15 +108,15 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 	case WM_CTLCOLOREDIT:

 	case WM_CTLCOLORSTATIC:

-		if (( HWND )lParam == GetDlgItem( hwndDlg, IDC_COLORTEXT )) {

-			SetTextColor((HDC)wParam,RGB(60,60,150));

-			SetBkColor((HDC)wParam,GetSysColor(COLOR_WINDOW));

+		if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_COLORTEXT)) {

+			SetTextColor((HDC)wParam, RGB(60, 60, 150));

+			SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW));

 			return (INT_PTR)GetSysColorBrush(COLOR_WINDOW);

 		}

 		break;

 

 	case WM_COMMAND:

-		switch ( LOWORD( wParam )) {

+		switch (LOWORD(wParam)) {

 		case IDOK:

 			if (iCurrentHotTrack >= 0)

 				PostMessage(hwndDlg, WM_LBUTTONUP, 0, 0);

@@ -125,17 +129,18 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 	case WM_LBUTTONUP:

 		if (iCurrentHotTrack >= 0 && iCurrentHotTrack < pCC->pModule->nColorCount && pCC->hWndTarget != NULL) {

-			HWND hWindow;

 			CHARFORMAT2 cf;

 			cf.cbSize = sizeof(CHARFORMAT2);

 			cf.dwMask = 0;

 			cf.dwEffects = 0;

-			hWindow = GetParent( pCC->hWndTarget );

+			

+			HWND hWindow = GetParent(pCC->hWndTarget);

+			int ctrlId = GetDlgCtrlID(pCC->hWndChooser);

 

-			if ( pCC->bForeground ) {

+			if (pCC->bForeground) {

 				pCC->si->bFGSet = TRUE;

 				pCC->si->iFG = iCurrentHotTrack;

-				if ( IsDlgButtonChecked( hWindow, IDC_COLOR )) {

+				if (IsDlgButtonChecked(hWindow, ctrlId)) {

 					cf.dwMask = CFM_COLOR;

 					cf.crTextColor = pCC->pModule->crColors[iCurrentHotTrack];

 					SendMessage(pCC->hWndTarget, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

@@ -144,11 +149,13 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			else {

 				pCC->si->bBGSet = TRUE;

 				pCC->si->iBG = iCurrentHotTrack;

-				if ( IsDlgButtonChecked( hWindow, IDC_BKGCOLOR )) {

+				if (IsDlgButtonChecked(hWindow, ctrlId)) {

 					cf.dwMask = CFM_BACKCOLOR;

 					cf.crBackColor = pCC->pModule->crColors[iCurrentHotTrack];

 					SendMessage(pCC->hWndTarget, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

-		}	}	}

+				}

+			}

+		}

 		PostMessage(hwndDlg, WM_CLOSE, 0, 0);

 		break;

 

@@ -169,7 +176,7 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			pt.x = LOWORD(lParam);

 			pt.y = HIWORD(lParam);

 

-			if (iCurrentHotTrack == -2) 

+			if (iCurrentHotTrack == -2)

 				return 0; // prevent focussing when not drawn yet!

 

 			but = CalculateCoordinatesToButton(pCC, pt);

@@ -186,32 +193,28 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				if (iCurrentHotTrack >= 0) {

 					rect = CalculateButtonToCoordinates(pCC, iCurrentHotTrack);

 					DrawFocusRect(hdc, &rect);

-			}	}

+				}

+			}

 			ReleaseDC(hwndDlg, hdc);

 		}

 		break;

 

 	case WM_PAINT:

 		{

-			PAINTSTRUCT ps; 

-			HDC hdc;

-			RECT rc;

-			int i = 0;

+			PAINTSTRUCT ps;

 			int iThisRow = 1;

 			int iThisColumn = 0;

 

+			RECT rc;

 			GetClientRect(hwndDlg, &rc);

-

 			rc.top += 20;

 

-			hdc = BeginPaint(hwndDlg, &ps);

+			HDC hdc = BeginPaint(hwndDlg, &ps);

 

 			// fill background

 			FillRect(hdc, &rc, GetSysColorBrush(COLOR_WINDOW));

 

-			for (i; i < pCC->pModule->nColorCount; i++) {

-				HBRUSH hbr;

-

+			for (int i=0; i < pCC->pModule->nColorCount; i++) {

 				// decide place to draw the color block in the window

 				iThisColumn ++;

 				if (iThisColumn > iColumns) {

@@ -219,35 +222,34 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 					iThisRow++;

 				}

 

-				if ( pCC->bForeground && pCC->si->bFGSet && pCC->si->iFG == i ||

-					 !pCC->bForeground && pCC->si->bBGSet && pCC->si->iBG == i ) {

-					rc.top = (iThisRow-1) * 20+ 1 +20 ;

-					rc.left = (iThisColumn-1) * 25 + 1 + 1 ;

-					rc.bottom = iThisRow * 20- 1 + 20 ;

-					rc.right = iThisColumn * 25-1 ;

+				if (pCC->bForeground && pCC->si->bFGSet && pCC->si->iFG == i || !pCC->bForeground && pCC->si->bBGSet && pCC->si->iBG == i) {

+					rc.top = (iThisRow - 1) * 20 + 1 + 20 ;

+					rc.left = (iThisColumn - 1) * 25 + 1 + 1 ;

+					rc.bottom = iThisRow * 20 - 1 + 20 ;

+					rc.right = iThisColumn * 25 - 1 ;

 

-					DrawEdge(hdc, &rc, EDGE_RAISED, BF_TOP|BF_LEFT|BF_RIGHT|BF_BOTTOM);

+					DrawEdge(hdc, &rc, EDGE_RAISED, BF_TOP | BF_LEFT | BF_RIGHT | BF_BOTTOM);

 				}

 

-				rc.top = (iThisRow-1) * 20+ 3 +20 ;

-				rc.left = (iThisColumn-1) * 25 + 3 + 1 ;

-				rc.bottom = iThisRow * 20- 3 + 20 ;

-				rc.right = iThisColumn * 25-3 ;

+				rc.top = (iThisRow - 1) * 20 + 3 + 20 ;

+				rc.left = (iThisColumn - 1) * 25 + 3 + 1 ;

+				rc.bottom = iThisRow * 20 - 3 + 20 ;

+				rc.right = iThisColumn * 25 - 3 ;

 

 				FillRect(hdc, &rc, (HBRUSH)GetStockObject(BLACK_BRUSH));

 

-				hbr = CreateSolidBrush(pCC->pModule->crColors[i]);

+				HBRUSH hbr = CreateSolidBrush(pCC->pModule->crColors[i]);

 

-				rc.top = (iThisRow-1) * 20+4 +20;

-				rc.left = (iThisColumn-1) * 25+ 4 + 1;

-				rc.bottom = iThisRow * 20-4 + 20;

-				rc.right = iThisColumn * 25-4;

+				rc.top = (iThisRow - 1) * 20 + 4 + 20;

+				rc.left = (iThisColumn - 1) * 25 + 4 + 1;

+				rc.bottom = iThisRow * 20 - 4 + 20;

+				rc.right = iThisColumn * 25 - 4;

 

 				FillRect(hdc, &rc, hbr);

 				DeleteObject(hbr);

 			}

 

-			EndPaint(hwndDlg, &ps); 

+			EndPaint(hwndDlg, &ps);

 			iCurrentHotTrack = -1;

 		}

 		break;

@@ -258,9 +260,25 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		break;

 

 	case WM_DESTROY:

-		mir_free( pCC );

+		mir_free(pCC);

 		return TRUE;

 	}

 

 	return FALSE;

 }

+

+void ColorChooser(SESSION_INFO *si, BOOL bFG, HWND hwndDlg, HWND hwndTarget, HWND hwndChooser)

+{

+	RECT rc;

+	GetWindowRect(hwndChooser, &rc);

+	

+	COLORCHOOSER *pCC = (COLORCHOOSER *)mir_alloc(sizeof(COLORCHOOSER));

+	pCC->hWndTarget = hwndTarget;

+	pCC->pModule = ci.MM_FindModule(si->pszModule);

+	pCC->xPosition = rc.left + 3;

+	pCC->yPosition = IsWindowVisible(hwndChooser) ? rc.top - 1 : rc.top + 20;

+	pCC->bForeground = bFG;

+	pCC->hWndChooser = hwndChooser;

+	pCC->si = si;

+	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_COLORCHOOSER), hwndDlg, DlgProcColorToolWindow, (LPARAM)pCC);

+}

diff --git a/src/modules/chat/manager.cpp b/src/modules/chat/manager.cpp
index 675af06f8d..e5912e801c 100644
--- a/src/modules/chat/manager.cpp
+++ b/src/modules/chat/manager.cpp
@@ -1314,6 +1314,7 @@ INT_PTR SvcGetChatManager(WPARAM wParam, LPARAM lParam)
 	ci.IsHighlighted = IsHighlighted;

 	ci.RemoveFormatting = RemoveFormatting;

 	ci.ReloadSettings = LoadGlobalSettings;

+	ci.ColorChooser = ColorChooser;

 

 	ci.pLogIconBmpBits = pLogIconBmpBits;

 	ci.logIconBmpSize = logIconBmpSize;

diff --git a/src/resource.h b/src/resource.h
index a9496fb22c..f7c544191e 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -23,6 +23,7 @@
 #define IDI_NOTLOADED_GRAY              114

 #define IDD_ADDED                       115

 #define IDD_ENTER_STRING                116

+

 #define IDD_URLSEND                     119

 #define IDD_URLRECV                     120

 #define IDD_AUTHREQ                     121

@@ -78,6 +79,7 @@
 #define IDD_HISTORY_FIND                192

 #define IDI_SENDEMAIL                   193

 #define IDD_FILERECV                    194

+#define IDD_COLORCHOOSER                195

 #define IDD_PROFILEMANAGER              197

 #define IDI_MAINMENU                    198

 #define IDR_CLISTMENU                   199

@@ -217,6 +219,7 @@
 #define IDC_ABOUT                       1032

 #define IDC_MYNOTES                     1033

 #define IDC_URLS                        1037

+#define IDC_COLORTEXT                   1038

 #define IDC_REPLY                       1039

 #define IDC_URL                         1041

 #define IDC_FONTGROUP                   1042

diff --git a/src/resource.rc b/src/resource.rc
index 32aeba4aeb..346178c68c 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -810,6 +810,14 @@ BEGIN
     CONTROL         "Download more language packs",IDC_MORELANG,"Hyperlink",WS_GROUP | WS_TABSTOP | 0x1,9,173,283,10

 END

 

+IDD_COLORCHOOSER DIALOGEX 0, 0, 198, 150

+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_BORDER

+EXSTYLE WS_EX_TOPMOST

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    DEFPUSHBUTTON   "OK",IDOK,172,136,26,14,NOT WS_TABSTOP

+    CTEXT           "",IDC_COLORTEXT,0,0,197,12,SS_CENTERIMAGE

+END

 

 /////////////////////////////////////////////////////////////////////////////

 //