chat's component COLORCHOOSER standardized in the core

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

4 files changed, 31 insertions, 333 deletions

diff --git a/plugins/Scriver/src/chat/chat.h b/plugins/Scriver/src/chat/chat.h
index 324daba31f..e3bde037eb 100644
--- a/plugins/Scriver/src/chat/chat.h
+++ b/plugins/Scriver/src/chat/chat.h
@@ -73,22 +73,9 @@ struct GlobalLogSettings : public GlobalLogSettingsBase
 };

 extern GlobalLogSettings g_Settings;

 

-typedef struct{

-	MODULEINFO*   pModule;

-	int           xPosition;

-	int           yPosition;

-	HWND          hWndTarget;

-	BOOL          bForeground;

-	SESSION_INFO *si;

-}

-	COLORCHOOSER;

-

 // main.c

 void UpgradeCheck(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);

 void   LoadMsgLogBitmaps(void);

diff --git a/plugins/Scriver/src/chat/colorchooser.cpp b/plugins/Scriver/src/chat/colorchooser.cpp
deleted file mode 100644
index 0eff2d4b3a..0000000000
--- a/plugins/Scriver/src/chat/colorchooser.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-/*

-Chat module plugin for Miranda IM

-

-Copyright (C) 2003 Jörgen Persson

-Copyright 2003-2009 Miranda ICQ/IM project,

-

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

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-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 "../commonheaders.h"

-

-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 col = pt.x / 25;

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

-	int pos = nCols * row + col;

-

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

-		pos = -1;

-

-	return pos;

-}

-

-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 row = buttonPosition / nCols;

-	int col = buttonPosition % nCols;

-

-	pt.left = col * 25 + 1;

-	pt.top = row * 20 + 20;

-	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 COLORCHOOSER* pCC = NULL;

-	static int iCurrentHotTrack;

-	static BOOL bChoosing;

-	static int iRows;

-	static int iColumns;

-	static HWND hPreviousActiveWindow;

-

-	switch (msg) {

-	case WM_INITDIALOG:

-		TranslateDialogDefault(hwndDlg);

-		{

-			pCC = (COLORCHOOSER*)lParam;

-

-			iCurrentHotTrack = -2;

-			bChoosing = FALSE;

-

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

-

-			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));

-

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

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

-

-			pCC->yPosition -= height;

-

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

-			SetWindowPos(GetDlgItem(hwndDlg, IDC_CHAT_COLORTEXT), NULL, 0, 0, width, 20, 0);

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

-		}

-		break;

-

-	case WM_CTLCOLOREDIT:

-	case WM_CTLCOLORSTATIC:

-		if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_CHAT_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)) {

-		case IDOK:

-			if (iCurrentHotTrack >= 0)

-				PostMessage(hwndDlg, WM_LBUTTONUP, 0, 0);

-			break;

-		case IDCANCEL:

-			DestroyWindow(hwndDlg);

-			break;

-		}

-		break;

-

-	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);

-

-			if (pCC->bForeground) {

-				pCC->si->bFGSet = TRUE;

-				pCC->si->iFG = iCurrentHotTrack;

-				if (IsDlgButtonChecked(hWindow, IDC_CHAT_COLOR)) {

-					cf.dwMask = CFM_COLOR;

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

-					if (pCC->pModule->bSingleFormat)

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

-					else

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

-				}

-			}

-			else {

-				pCC->si->bBGSet = TRUE;

-				pCC->si->iBG = iCurrentHotTrack;

-				if (IsDlgButtonChecked(hWindow, IDC_CHAT_BKGCOLOR)) {

-					cf.dwMask = CFM_BACKCOLOR;

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

-					if (pCC->pModule->bSingleFormat)

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

-					else

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

-				}

-			}

-		}

-		PostMessage(hwndDlg, WM_CLOSE, 0, 0);

-		break;

-

-	case WM_ACTIVATE:

-		if (wParam == WA_INACTIVE)

-			PostMessage(hwndDlg, WM_CLOSE, 0, 0);

-		else if ((wParam == WA_ACTIVE) || (wParam == WA_CLICKACTIVE))

-			hPreviousActiveWindow = (HWND)lParam;

-		break;

-

-	case WM_MOUSEMOVE:

-		{

-			HDC hdc = GetDC(hwndDlg);

-			POINT pt;

-			RECT rect;

-			int but;

-

-			pt.x = LOWORD(lParam);

-			pt.y = HIWORD(lParam);

-

-			if (iCurrentHotTrack == -2)

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

-

-			but = CalculateCoordinatesToButton(pCC, pt);

-

-			// weird stuff

-			if (but != iCurrentHotTrack) {

-				if (iCurrentHotTrack >= 0) {

-					rect = CalculateButtonToCoordinates(pCC, iCurrentHotTrack);

-					DrawFocusRect(hdc, &rect);

-					iCurrentHotTrack = -1;

-				}

-				iCurrentHotTrack = but;

-

-				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;

-		int iThisRow = 1;

-		int iThisColumn = 0;

-

-		GetClientRect(hwndDlg, &rc);

-

-		rc.top += 20;

-

-		hdc = BeginPaint(hwndDlg, &ps);

-

-		// fill background

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

-

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

-		{

-			HBRUSH hbr;

-

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

-			iThisColumn ++;

-				if (iThisColumn > iColumns) {

-				iThisColumn = 1;

-				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 ;

-

-					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 ;

-

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

-

-				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;

-

-				FillRect(hdc, &rc, hbr);

-				DeleteObject(hbr);

-			}

-

-			EndPaint(hwndDlg, &ps);

-			iCurrentHotTrack = -1;

-		}

-		break;

-

-	case WM_CLOSE:

-			SetFocus(pCC->hWndTarget);

-			DestroyWindow(hwndDlg);

-		break;

-

-	case WM_DESTROY:

-		mir_free( pCC );

-		return TRUE;

-	}

-

-	return FALSE;

-}

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 12ab38d527..9b1d60e7d5 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -1058,6 +1058,7 @@ static void __cdecl phase2(void *lParam)
 static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

 {

 	static HMENU hToolbarMenu;

+	RECT rc;

 

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

 	if (!si && uMsg != WM_INITDIALOG)

@@ -1256,7 +1257,6 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 

 		if (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED) {

 			int dlgWidth, dlgHeight;

-			RECT rc;

 			dlgWidth = LOWORD(lParam);

 			dlgHeight = HIWORD(lParam);

 			GetClientRect(hwndDlg, &rc);

@@ -1526,7 +1526,6 @@ LABEL_SHOWWINDOW:
 	case GC_SPLITTERMOVED:

 		if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_CHAT_SPLITTERX)) {

 			POINT pt;

-			RECT rc;

 			GetClientRect(hwndDlg, &rc);

 			pt.x = wParam; pt.y = 0;

 			ScreenToClient(hwndDlg, &pt);

@@ -1541,7 +1540,6 @@ LABEL_SHOWWINDOW:
 		}

 		else if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_CHAT_SPLITTERY)) {

 			POINT pt;

-			RECT rc;

 			GetClientRect(hwndDlg, &rc);

 			pt.x = 0; pt.y = wParam;

 			ScreenToClient(hwndDlg, &pt);

@@ -1573,7 +1571,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_CHAT_FILTER), &rc);

@@ -1582,36 +1579,24 @@ LABEL_SHOWWINDOW:
 		break;

 

 	case GC_SHOWCOLORCHOOSER:

-		{

-			RECT rc;

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

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

-			GetWindowRect(GetDlgItem(hwndDlg, bFG ? IDC_CHAT_COLOR : IDC_CHAT_BKGCOLOR), &rc);

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

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

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

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

-			pCC->bForeground = bFG;

-			pCC->si = si;

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

-		}

-		break;

+		pci->ColorChooser(si, lParam == IDC_CHAT_COLOR, hwndDlg, GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), GetDlgItem(hwndDlg, lParam));
+		break;
 

 	case GC_SCROLLTOBOTTOM:

-		{

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

 			SCROLLINFO si = { 0 };

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

-				CHARRANGE sel;

-				si.cbSize = sizeof(si);

-				si.fMask = SIF_PAGE | SIF_RANGE;

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

-				si.fMask = SIF_POS;

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

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

-				sel.cpMin = sel.cpMax = GetRichTextLength(GetDlgItem(hwndDlg, IDC_CHAT_LOG), CP_ACP, FALSE);

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

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

-			}

+			si.cbSize = sizeof(si);

+			si.fMask = SIF_PAGE | SIF_RANGE;

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

+

+			si.fMask = SIF_POS;

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

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

+

+			CHARRANGE sel;

+			sel.cpMin = sel.cpMax = GetRichTextLength(GetDlgItem(hwndDlg, IDC_CHAT_LOG), CP_ACP, FALSE);

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

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

 		}

 		break;

 

@@ -1785,24 +1770,21 @@ LABEL_SHOWWINDOW:
 			break;

 

 		case IDC_CHAT_SMILEY:

-			{

-				RECT rc;

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

-

-				SMADD_SHOWSEL3 smaddInfo;

-				smaddInfo.cbSize = sizeof(SMADD_SHOWSEL3);

-				smaddInfo.hwndParent = GetParent(hwndDlg);

-				smaddInfo.hwndTarget = GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE);

-				smaddInfo.targetMessage = EM_REPLACESEL;

-				smaddInfo.targetWParam = TRUE;

-				smaddInfo.Protocolname = si->pszModule;

-				//smaddInfo.Direction = 3;

-				smaddInfo.Direction = 0;

-				smaddInfo.xPosition = rc.left;

-				smaddInfo.yPosition = rc.bottom;

-				smaddInfo.hContact = si->hContact;

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

-			}

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

+

+			SMADD_SHOWSEL3 smaddInfo;

+			smaddInfo.cbSize = sizeof(SMADD_SHOWSEL3);

+			smaddInfo.hwndParent = GetParent(hwndDlg);

+			smaddInfo.hwndTarget = GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE);

+			smaddInfo.targetMessage = EM_REPLACESEL;

+			smaddInfo.targetWParam = TRUE;

+			smaddInfo.Protocolname = si->pszModule;

+			//smaddInfo.Direction = 3;

+			smaddInfo.Direction = 0;

+			smaddInfo.xPosition = rc.left;

+			smaddInfo.yPosition = rc.bottom;

+			smaddInfo.hContact = si->hContact;

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

 			break;

 

 		case IDC_CHAT_HISTORY:

diff --git a/plugins/Scriver/src/resource.h b/plugins/Scriver/src/resource.h
index b6d02a3b40..b516adfe7f 100644
--- a/plugins/Scriver/src/resource.h
+++ b/plugins/Scriver/src/resource.h
@@ -63,7 +63,6 @@
 #define IDI_REMSTATUS                   442

 #define IDI_ACTION                      443

 #define IDR_MENU                        451

-#define IDD_COLORCHOOSER                452

 #define IDI_STATUS3                     453

 #define IDI_STATUS2                     454

 #define IDI_STATUS4                     455