DoRtfToTags fixed & moved into the core

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

8 files changed, 15 insertions, 311 deletions

diff --git a/plugins/Scriver/scriver_10.vcxproj b/plugins/Scriver/scriver_10.vcxproj
index 5d468959be..c3d9ac9697 100644
--- a/plugins/Scriver/scriver_10.vcxproj
+++ b/plugins/Scriver/scriver_10.vcxproj
@@ -220,9 +220,6 @@
     <ClCompile Include="src\chat\manager.cpp">

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

     </ClCompile>

-    <ClCompile Include="src\chat\message.cpp">

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

-    </ClCompile>

     <ClCompile Include="src\chat\options.cpp">

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

     </ClCompile>

diff --git a/plugins/Scriver/scriver_10.vcxproj.filters b/plugins/Scriver/scriver_10.vcxproj.filters
index d4c413c760..e9eb42ac80 100644
--- a/plugins/Scriver/scriver_10.vcxproj.filters
+++ b/plugins/Scriver/scriver_10.vcxproj.filters
@@ -72,9 +72,6 @@
     <ClCompile Include="src\chat\manager.cpp">

       <Filter>Source Files\chat</Filter>

     </ClCompile>

-    <ClCompile Include="src\chat\message.cpp">

-      <Filter>Source Files\chat</Filter>

-    </ClCompile>

     <ClCompile Include="src\chat\options.cpp">

       <Filter>Source Files\chat</Filter>

     </ClCompile>

diff --git a/plugins/Scriver/scriver_12.vcxproj b/plugins/Scriver/scriver_12.vcxproj
index c3ce7c7125..0159ca5a74 100644
--- a/plugins/Scriver/scriver_12.vcxproj
+++ b/plugins/Scriver/scriver_12.vcxproj
@@ -223,9 +223,6 @@
     <ClCompile Include="src\chat\manager.cpp">

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

     </ClCompile>

-    <ClCompile Include="src\chat\message.cpp">

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

-    </ClCompile>

     <ClCompile Include="src\chat\options.cpp">

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

     </ClCompile>

diff --git a/plugins/Scriver/scriver_12.vcxproj.filters b/plugins/Scriver/scriver_12.vcxproj.filters
index d4c413c760..e9eb42ac80 100644
--- a/plugins/Scriver/scriver_12.vcxproj.filters
+++ b/plugins/Scriver/scriver_12.vcxproj.filters
@@ -72,9 +72,6 @@
     <ClCompile Include="src\chat\manager.cpp">

       <Filter>Source Files\chat</Filter>

     </ClCompile>

-    <ClCompile Include="src\chat\message.cpp">

-      <Filter>Source Files\chat</Filter>

-    </ClCompile>

     <ClCompile Include="src\chat\options.cpp">

       <Filter>Source Files\chat</Filter>

     </ClCompile>

diff --git a/plugins/Scriver/src/chat/chat.h b/plugins/Scriver/src/chat/chat.h
index 0c382107ea..ff3e798807 100644
--- a/plugins/Scriver/src/chat/chat.h
+++ b/plugins/Scriver/src/chat/chat.h
@@ -99,9 +99,6 @@ TCHAR*        my_strstri(const TCHAR* s1, const TCHAR* s2) ;
 UINT          CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO *si, TCHAR* pszUID, TCHAR* pszWordText);

 void          DestroyGCMenu(HMENU *hMenu, int iIndex);

 

-// message.c

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

-

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

 

 #define DEFLOGFILENAME _T("%miranda_logpath%\\%proto%\\%userid%.log")

diff --git a/plugins/Scriver/src/chat/message.cpp b/plugins/Scriver/src/chat/message.cpp
deleted file mode 100644
index fe57ca5b57..0000000000
--- a/plugins/Scriver/src/chat/message.cpp
+++ /dev/null
@@ -1,289 +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.

-*/

-

-#include "../commonheaders.h"

-

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

-{

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

-

-	int iIndex = 1;

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

-{

-	if (!pszText)

-		return FALSE;

-

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

-	// corresponding colors in the RTF color table

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

-	int *pIndex = (int *)mir_alloc(sizeof(int)*mi->nColorCount);

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

-		pIndex[i] = -1;

-

-	CreateColorMap(pszText, pIndex, si);

-

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

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

-	if (p1 == NULL) {

-		mir_free(pIndex);

-		return FALSE;

-	}

-

-	p1 += 5;

-

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

-	p1 = pszText;

-

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

-	BOOL bJustRemovedRTF = TRUE;

-	BOOL bTextHasStarted = FALSE;

-	char InsertThis[50];

-

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

-		InsertThis[0] = 0;

-		int iRemoveChars = 0;

-

-		switch (*p1) {

-		case '\\':

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

-				int iCol;

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

-				bJustRemovedRTF = TRUE;

-

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

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

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

-				bJustRemovedRTF = TRUE;

-

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

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

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

-			mir_snprintf(InsertThis, SIZEOF(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) {

-			memmove(p1 + mir_strlen(InsertThis), p1 + iRemoveChars, mir_strlen(p1) - iRemoveChars + 1);

-			memcpy(p1, InsertThis, mir_strlen(InsertThis));

-			p1 += mir_strlen(InsertThis);

-		}

-		else p1++;

-	}

-

-	mir_free(pIndex);

-	return mir_utf8decodeT(pszText);

-}

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index a642d0719a..9e5bdf5861 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -1702,7 +1702,13 @@ LABEL_SHOWWINDOW:
 

 		case IDOK:

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

-				char *pszRtf = GetRichTextRTF(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE));

+				ptrA pszRtf(GetRichTextRTF(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE)));

+				if (pszRtf == NULL)

+					break;

+

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

+				if (mi == NULL)

+					break;

 

 				TCmdList *cmdListNew = tcmdlist_last(si->cmdList);

 				while (cmdListNew != NULL && cmdListNew->temporary) {

@@ -1711,10 +1717,13 @@ LABEL_SHOWWINDOW:
 				}

 

 				si->cmdList = tcmdlist_append(si->cmdList, pszRtf, 20, FALSE);

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

-				rtrimt(ptszText);

 

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

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

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

+				ptszText.Trim();

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

+

+				if (mi->bAckMsg) {

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

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

 				}

@@ -1723,8 +1732,6 @@ 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_CHAT_MESSAGE));

 			}

 			break;

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index db496d27a3..c580683474 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -2885,6 +2885,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 
 				DoRtfToTags(si->dat, ptszText, mi->nColorCount, mi->crColors);
 				ptszText.Trim();
+				ptszText.Replace(_T("%"), _T("%%"));
 
 				if (mi && mi->bAckMsg) {
 					Utils::enableDlgControl(hwndDlg, IDC_CHAT_MESSAGE, false);
@@ -2902,7 +2903,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 				bool fSound = true;
 				if (ptszText[0] == '/' || si->iType == GCW_SERVER)
 					fSound = false;
-				pci->DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_MESSAGE, NULL, ptszText.GetBuffer(), 0);
+				pci->DoEventHookAsync(hwndDlg, si->ptszID, si->pszModule, GC_USER_MESSAGE, NULL, ptszText, 0);
 				mi->idleTimeStamp = time(0);
 				mi->lastIdleCheck = 0;
 				pci->SM_BroadcastMessage(si->pszModule, GC_UPDATESTATUSBAR, 0, 1, TRUE);