DoRtfToTags fixed & moved into the core

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

3 files changed, 14 insertions, 300 deletions

diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h
index a368b899e4..f9e6b05de8 100644
--- a/src/core/stdchat/src/chat.h
+++ b/src/core/stdchat/src/chat.h
@@ -170,7 +170,6 @@ bool LoadMessageFont(LOGFONT *lf, COLORREF *colour);
 

 // message.c

 char* Message_GetFromStream(HWND hwndDlg, SESSION_INFO *si);

-TCHAR* DoRtfToTags( char* pszRtfText, SESSION_INFO *si);

 

 BOOL TabM_AddTab(const TCHAR *pszID, const char* pszModule);

 BOOL TabM_RemoveAll(void);

diff --git a/src/core/stdchat/src/message.cpp b/src/core/stdchat/src/message.cpp
index c7d96fa2a5..943aa24055 100644
--- a/src/core/stdchat/src/message.cpp
+++ b/src/core/stdchat/src/message.cpp
@@ -22,291 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "chat.h"

 #include <math.h>

 

-static int RTFColorToIndex(int *pIndex, int iCol, SESSION_INFO *si)

-{

-	MODULEINFO *pMod = pci->MM_FindModule(si->pszModule);

-	for (int i = 0; i < pMod->nColorCount; i++)

-		if (pIndex[i] == iCol)

-			return i;

-

-	return -1;

-}

-

-static void CreateColorMap(char* Text, int *pIndex, SESSION_INFO *si)

-{

-	int iIndex = 1;

-

-	static const char* lpszFmt = "\\red%[^ \x5b\\]\\green%[^ \x5b\\]\\blue%[^ \x5b;];";

-	char szRed[10], szGreen[10], szBlue[10];

-

-	char *p1 = strstr(Text, "\\colortbl");

-	if (!p1)

-		return;

-

-	char *pEnd = strchr(p1, '}');

-	char *p2 = strstr(p1, "\\red");

-

-	while (p2 && p2 < pEnd) {

-		if (sscanf(p2, lpszFmt, &szRed, &szGreen, &szBlue) > 0) {

-			MODULEINFO *pMod = pci->MM_FindModule(si->pszModule);

-			for (int i = 0; i < pMod->nColorCount; i++)

-				if (pMod->crColors[i] == RGB(atoi(szRed), atoi(szGreen), atoi(szBlue)))

-					pIndex[i] = iIndex;

-		}

-		iIndex++;

-		p1 = p2;

-		p1++;

-		p2 = strstr(p1, "\\red");

-	}

-}

-

-static int ReadInteger( const char* p, int* result )

-{

-	char temp[10];

-	int i=0;

-	while (isdigit(*p))

-		temp[i++] = *p++;

-	temp[i] = 0;

-

-	if ( result != NULL )

-		*result = atoi( temp );

-

-	return i;

-}

-

-TCHAR* DoRtfToTags(char* pszText, SESSION_INFO *si)

-{

-	char *p1;

-	int*  pIndex;

-	int i, iRemoveChars, cp = CP_ACP;

-	char InsertThis[50];

-	BOOL bJustRemovedRTF = TRUE;

-	BOOL bTextHasStarted = FALSE;

-	int iUcMode = 0;

-

-	if (!pszText)

-		return FALSE;

-

-	// create an index of colors in the module and map them to

-	// corresponding colors in the RTF color table

-	pIndex = (int *)mir_alloc(sizeof(int)* pci->MM_FindModule(si->pszModule)->nColorCount);

-	for (i = 0; i < pci->MM_FindModule(si->pszModule)->nColorCount; i++)

-		pIndex[i] = -1;

-

-	CreateColorMap(pszText, pIndex, si);

-

-	// scan the file for rtf commands and remove or parse them

-	p1 = strstr(pszText, "\\pard");

-	if (p1 == NULL) {

-		mir_free(pIndex);

-		return FALSE;

-	}

-

-	p1 += 5;

-

-	memmove(pszText, p1, strlen(p1) + 1);

-	p1 = pszText;

-

-	// iterate through all characters, if rtf control character found then take action

-	while (*p1 != '\0') {

-		InsertThis[0] = 0;

-		iRemoveChars = 0;

-

-		switch (*p1) {

-		case '\\':

-			if (!memcmp(p1, "\\cf", 3)) { // foreground color

-				int iCol, iInd;

-				iRemoveChars = 3 + ReadInteger(p1 + 3, &iCol);

-				iInd = RTFColorToIndex(pIndex, iCol, si);

-				bJustRemovedRTF = TRUE;

-

-//				if (bTextHasStarted || iInd >= 0)

-//					mir_snprintf(InsertThis, SIZEOF(InsertThis), (iInd >= 0) ? "%%c%02u" : "%%C", iInd);

-			}

-			else if (!memcmp(p1, "\\highlight", 10)) { //background color

-				int iCol, iInd;

-				iRemoveChars = 10 + ReadInteger(p1 + 10, &iCol);

-				iInd = RTFColorToIndex(pIndex, iCol, si);

-				bJustRemovedRTF = TRUE;

-

-//				if (bTextHasStarted || iInd >= 0)

-//					mir_snprintf(InsertThis, SIZEOF(InsertThis), (iInd >= 0) ? "%%f%02u" : "%%F", iInd);

-			}

-			else if (!memcmp(p1, "\\lang", 5)) { // language id

-				bTextHasStarted = bJustRemovedRTF = TRUE;

-				iRemoveChars = 5 + ReadInteger(p1 + 5, NULL);

-			}

-			else if (!memcmp(p1, "\\par", 4)) { // newline

-				bTextHasStarted = bJustRemovedRTF = TRUE;

-				iRemoveChars = 4;

-				strcpy(InsertThis, "\n");

-			}

-			else if (!memcmp(p1, "\\line", 5)) { // newline

-				bTextHasStarted = bJustRemovedRTF = TRUE;

-				iRemoveChars = 5;

-				strcpy(InsertThis, "\n");

-			}

-			else if (!memcmp(p1, "\\bullet", 7)) {

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = TRUE;

-				iRemoveChars = 7;

-				strcpy(InsertThis, "\xE2\x80\xA2");

-			}

-			else if (!memcmp(p1, "\\b", 2)) { //bold

-				bTextHasStarted = bJustRemovedRTF = TRUE;

-				iRemoveChars = (p1[2] != '0') ? 2 : 3;

-				mir_snprintf(InsertThis, SIZEOF(InsertThis), (p1[2] != '0') ? "%%b" : "%%B");

-			}

-			else if (!memcmp(p1, "\\i", 2)) { // italics

-				bTextHasStarted = bJustRemovedRTF = TRUE;

-				iRemoveChars = (p1[2] != '0') ? 2 : 3;

-				mir_snprintf(InsertThis, SIZEOF(InsertThis), (p1[2] != '0') ? "%%i" : "%%I");

-			}

-			else if (!memcmp(p1, "\\uc", 3)) { // number of Unicode chars

-				bTextHasStarted = bJustRemovedRTF = TRUE;

-				iUcMode = p1[3] - '0';

-				iRemoveChars = 4;

-			}

-			else if (!memcmp(p1, "\\ul", 3)) { // underlined

-				bTextHasStarted = bJustRemovedRTF = TRUE;

-				if (p1[3] == 'n')

-					iRemoveChars = 7;

-				else if (p1[3] == '0')

-					iRemoveChars = 4;

-				else

-					iRemoveChars = 3;

-				mir_snprintf(InsertThis, SIZEOF(InsertThis), (p1[3] != '0' && p1[3] != 'n') ? "%%u" : "%%U");

-			}

-			else if (p1[1] == 'f' && isdigit(p1[2])) { // unicode char

-				bTextHasStarted = bJustRemovedRTF = TRUE;

-				iRemoveChars = 2 + ReadInteger(p1 + 2, NULL);

-			}

-			else if (!memcmp(p1, "\\tab", 4)) { // tab

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = TRUE;

-				iRemoveChars = 4;

-				strcpy(InsertThis, " ");

-			}

-			else if (!memcmp(p1, "\\endash", 7)) {

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = TRUE;

-				iRemoveChars = 7;

-				strcpy(InsertThis, "\xE2\x80\x93");

-			}

-			else if (!memcmp(p1, "\\emdash", 7)) {

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = TRUE;

-				iRemoveChars = 7;

-				strcpy(InsertThis, "\xE2\x80\x94");

-			}

-			else if (!memcmp(p1, "\\lquote", 7)) {

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = TRUE;

-				iRemoveChars = 7;

-				strcpy(InsertThis, "\xE2\x80\x98");

-			}

-			else if (!memcmp(p1, "\\rquote", 7)) {

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = TRUE;

-				iRemoveChars = 7;

-				strcpy(InsertThis, "\xE2\x80\x99");

-			}

-			else if (!memcmp(p1, "\\ldblquote", 10)) {

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = TRUE;

-				iRemoveChars = 10;

-				strcpy(InsertThis, "\xe2\x80\x9c");

-			}

-			else if (!memcmp(p1, "\\rdblquote", 10)) {

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = TRUE;

-				iRemoveChars = 10;

-				strcpy(InsertThis, "\xe2\x80\x9d");

-			}

-			else if (p1[1] == '\\' || p1[1] == '{' || p1[1] == '}') { // escaped characters

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = FALSE;

-				iRemoveChars = 2;

-				mir_snprintf(InsertThis, SIZEOF(InsertThis), "%c", p1[1]);

-			}

-			else if (p1[1] == '~') { // non-breaking space

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = FALSE;

-				iRemoveChars = 2;

-				strcpy(InsertThis, "\xC2\xA0");

-			}

-			else if (p1[1] == '\'') { // special character

-				char tmp[4], *p3 = tmp;

-				bTextHasStarted = TRUE;

-				bJustRemovedRTF = FALSE;

-				if (p1[2] != ' ' && p1[2] != '\\') {

-					*p3++ = p1[2];

-					iRemoveChars = 3;

-					if (p1[3] != ' ' && p1[3] != '\\') {

-						*p3++ = p1[3];

-						iRemoveChars++;

-					}

-					*p3 = 0;

-					sscanf(tmp, "%x", InsertThis);

-

-					InsertThis[1] = 0;

-				}

-				else iRemoveChars = 2;

-			}

-			else if (bJustRemovedRTF) { // remove unknown RTF command

-				int j = 1;

-				bJustRemovedRTF = TRUE;

-				while (p1[j] != ' ' && p1[j] != '\\' && p1[j] != '\0')

-					j++;

-				iRemoveChars = j;

-			}

-			break;

-

-		case '{': // other RTF control characters

-		case '}':

-			iRemoveChars = 1;

-			break;

-

-		case '\r': case '\n':

-			bTextHasStarted = TRUE;

-			bJustRemovedRTF = FALSE;

-			iRemoveChars = 1;

-			break;

-

-		case '%': // escape chat -> protocol control character

-			bTextHasStarted = TRUE;

-			bJustRemovedRTF = FALSE;

-			iRemoveChars = 1;

-			strcpy(InsertThis, "%%");

-			break;

-		case ' ': // remove spaces following a RTF command

-			if (bJustRemovedRTF)

-				iRemoveChars = 1;

-			bJustRemovedRTF = FALSE;

-			bTextHasStarted = TRUE;

-			break;

-

-		default: // other text that should not be touched

-			bTextHasStarted = TRUE;

-			bJustRemovedRTF = FALSE;

-			break;

-		}

-

-		// move the memory and paste in new commands instead of the old RTF

-		if (InsertThis[0] || iRemoveChars) {

-			size_t len = strlen(InsertThis);

-			memmove(p1 + len, p1 + iRemoveChars, strlen(p1) - iRemoveChars + 1);

-			memcpy(p1, InsertThis, len);

-			p1 += len;

-		}

-		else p1++;

-	}

-

-	mir_free(pIndex);

-

-	return mir_utf8decodeW(pszText);

-}

-

 static DWORD CALLBACK Message_StreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG * pcb)

 {

 	static DWORD dwRead;

diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index 340ddcbe58..87309e530c 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -2366,20 +2366,22 @@ LABEL_SHOWWINDOW:
 

 		case IDOK:

 			if (IsWindowEnabled(GetDlgItem(hwndDlg, IDOK))) {

-				char *pszRtf = Message_GetFromStream(hwndDlg, si);

+				ptrA pszRtf(Message_GetFromStream(hwndDlg, si));

 				if (pszRtf == NULL)

 					break;

+

+				MODULEINFO *mi = pci->MM_FindModule(si->pszModule);

+				if (mi == NULL)

+					break;

+				

 				pci->SM_AddCommand(si->ptszID, si->pszModule, pszRtf);

-				TCHAR *ptszText = DoRtfToTags(pszRtf, si);

-				TCHAR *p1 = _tcschr(ptszText, '\0');

 

-				//remove trailing linebreaks

-				while (p1 > ptszText && (*p1 == '\0' || *p1 == '\r' || *p1 == '\n')) {

-					*p1 = '\0';

-					p1--;

-				}

+				CMString ptszText(ptrT(mir_utf8decodeT(pszRtf)));

+				pci->DoRtfToTags(ptszText, mi->nColorCount, mi->crColors);

+				ptszText.Trim();

+				ptszText.Replace(_T("%"), _T("%%"));

 

-				if (pci->MM_FindModule(si->pszModule)->bAckMsg) {

+				if (mi->bAckMsg) {

 					EnableWindow(GetDlgItem(hwndDlg, IDC_MESSAGE), FALSE);

 					SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_SETREADONLY, TRUE, 0);

 				}

@@ -2388,8 +2390,7 @@ LABEL_SHOWWINDOW:
 				EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);

 

 				pci->DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_MESSAGE, NULL, ptszText, 0);

-				mir_free(pszRtf);

-				mir_free(ptszText);

+				

 				SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE));

 			}

 			break;

@@ -2452,9 +2453,8 @@ LABEL_SHOWWINDOW:
 			break;

 

 		case IDC_CHANMGR:

-			if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_CHANMGR)))

-				break;

-			pci->DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_CHANMGR, NULL, NULL, 0);

+			if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_CHANMGR)))

+				pci->DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_CHANMGR, NULL, NULL, 0);

 			break;

 

 		case IDC_FILTER: