fixes #4675 (Не работают кнопки форматирования в StdMsg/Scriver)

5 files changed, 71 insertions, 61 deletions

diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp
index 11be2dc8ae..07e53b5969 100644
--- a/src/mir_app/src/chat_manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -774,7 +774,6 @@ static void ResetApi()
 

 	g_chatApi.SetOffline = ::SetOffline;

 	g_chatApi.SetAllOffline = ::SetAllOffline;

-	g_chatApi.DoRtfToTags = ::DoRtfToTags;

 

 	g_chatApi.LoadMsgDlgFont = ::LoadMsgDlgFont;

 	g_chatApi.MakeTimeStamp = ::MakeTimeStamp;

diff --git a/src/mir_app/src/chat_rtf.cpp b/src/mir_app/src/chat_rtf.cpp
index e581146cf4..1ba9ed4995 100644
--- a/src/mir_app/src/chat_rtf.cpp
+++ b/src/mir_app/src/chat_rtf.cpp
@@ -30,58 +30,37 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 static wchar_t tszRtfBreaks[] = L" \\\n\r";

 

-static void CreateColorMap(CMStringW &Text, int iCount, COLORREF *pSrc, int *pDst)

+static void CreateColorMap(const wchar_t *pszText, std::vector<COLORREF> &res)

 {

-	const wchar_t *pszText = Text;

-	int iIndex = 1;

-

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

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

-

 	const wchar_t *p1 = wcsstr(pszText, L"\\colortbl");

 	if (!p1)

 		return;

 

 	const wchar_t *pEnd = wcschr(p1, '}');

 

-	const wchar_t *p2 = wcsstr(p1, L"\\red");

+	for (const wchar_t *p2 = wcsstr(p1, L"\\red"); p2 && p2 < pEnd; p2 = wcsstr(p1, L"\\red")) {

+		int iRed, iGreen, iBlue;

+		if (swscanf(p2, L"\\red%d\\green%d\\blue%d;", &iRed, &iGreen, &iBlue) > 0)

+			res.push_back(RGB(iRed, iGreen, iBlue));

 

-	for (int i = 0; i < iCount; i++)

-		pDst[i] = -1;

-

-	while (p2 && p2 < pEnd) {

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

-			for (int i = 0; i < iCount; i++) {

-				if (pSrc[i] == RGB(_wtoi(szRed), _wtoi(szGreen), _wtoi(szBlue)))

-					pDst[i] = iIndex;

-			}

-		}

-		iIndex++;

-		p1 = p2;

-		p1++;

-

-		p2 = wcsstr(p1, L"\\red");

+		p1 = p2 + 1;

 	}

 }

 

-static int GetRtfIndex(int iCol, int iCount, int *pIndex)

-{

-	for (int i = 0; i < iCount; i++)

-		if (pIndex[i] == iCol)

-			return i;

-

-	return -1;

-}

-

-int DoRtfToTags(CMStringW &pszText, int iNumColors, COLORREF *pColors)

+bool CSrmmBaseDialog::DoRtfToTags(CMStringW &pszText) const

 {

 	if (pszText.IsEmpty())

 		return FALSE;

 

+	// used to filter out attributes which are already set for the default message input area font

+	LOGFONTW lf;

+	COLORREF inputBg, inputFg;

+	GetInputFont(lf, inputBg, inputFg);

+

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

 	// corresponding colors in the RTF color table

-	int *pIndex = (int*)_alloca(iNumColors * sizeof(int));

-	CreateColorMap(pszText, iNumColors, pColors, pIndex);

+	std::vector<COLORREF> colorTable;

+	CreateColorMap(pszText, colorTable);

 

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

 	int idx = pszText.Find(L"\\pard");

@@ -92,7 +71,7 @@ int DoRtfToTags(CMStringW &pszText, int iNumColors, COLORREF *pColors)
 	}

 	else idx += 5;

 

-	bool bInsideColor = false, bInsideUl = false;

+	bool bInsideUl = false, bStart = true;

 	CMStringW res;

 

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

@@ -101,65 +80,85 @@ int DoRtfToTags(CMStringW &pszText, int iNumColors, COLORREF *pColors)
 		case '\\':

 			if (p[1] == '\\' || p[1] == '{' || p[1] == '}') { // escaped characters

 				res.AppendChar(p[1]);

+				bStart = false;

 				p += 2; break;

 			}

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

 				res.AppendChar(0xA0);

+				bStart = false;

 				p += 2; break;

 			}

 

 			if (!wcsncmp(p, L"\\cf", 3)) { // foreground color

-				int iCol = _wtoi(p + 3);

-				int iInd = GetRtfIndex(iCol, iNumColors, pIndex);

-				bInsideColor = iInd > 0;

-			}

-			else if (!wcsncmp(p, L"\\highlight", 10)) { //background color

-				wchar_t szTemp[20];

-				int iCol = _wtoi(p + 10);

-				mir_snwprintf(szTemp, L"%d", iCol);

+				COLORREF cr = colorTable[_wtoi(p + 3) - 1];

+				if (cr != inputFg)

+					res.AppendFormat(L"[color=%06X]", cr);

+				else if (!bStart)

+					res.Append(L"[/color]");

+			}

+			else if (!wcsncmp(p, L"\\highlight", 10)) { // background color

+				COLORREF cr = colorTable[_wtoi(p + 10) - 1];

+				if (cr != inputBg)

+					res.AppendFormat(L"[bkcolor=%06X]", cr);

+				else if (!bStart)

+					res.AppendFormat(L"[/bkcolor]");

 			}

 			else if (!wcsncmp(p, L"\\line", 5)) { // soft line break;

 				res.AppendChar('\n');

+				bStart = false;

 			}

 			else if (!wcsncmp(p, L"\\endash", 7)) {

 				res.AppendChar(0x2013);

+				bStart = false;

 			}

 			else if (!wcsncmp(p, L"\\emdash", 7)) {

 				res.AppendChar(0x2014);

+				bStart = false;

 			}

 			else if (!wcsncmp(p, L"\\bullet", 7)) {

 				res.AppendChar(0x2022);

+				bStart = false;

 			}

 			else if (!wcsncmp(p, L"\\ldblquote", 10)) {

 				res.AppendChar(0x201C);

+				bStart = false;

 			}

 			else if (!wcsncmp(p, L"\\rdblquote", 10)) {

 				res.AppendChar(0x201D);

+				bStart = false;

 			}

 			else if (!wcsncmp(p, L"\\lquote", 7)) {

 				res.AppendChar(0x2018);

+				bStart = false;

 			}

 			else if (!wcsncmp(p, L"\\rquote", 7)) {

 				res.AppendChar(0x2019);

+				bStart = false;

 			}

 			else if (!wcsncmp(p, L"\\b", 2)) { //bold

-				res.Append((p[2] != '0') ? L"[b]" : L"[/b]");

+				// only allow bold if the font itself isn't a bold one, otherwise just strip it..

+				if (lf.lfWeight != FW_BOLD && m_bSendFormat)

+					res.Append((p[2] != '0') ? L"[b]" : L"[/b]");

 			}

 			else if (!wcsncmp(p, L"\\i", 2)) { // italics

-				res.Append((p[2] != '0') ? L"[i]" : L"[/i]");

+				if (!lf.lfItalic && m_bSendFormat)

+					res.Append((p[2] != '0') ? L"[i]" : L"[/i]");

 			}

 			else if (!wcsncmp(p, L"\\strike", 7)) { // strike-out

-				res.Append((p[7] != '0') ? L"[s]" : L"[/s]");

+				if (!lf.lfStrikeOut && m_bSendFormat)

+					res.Append((p[7] != '0') ? L"[s]" : L"[/s]");

 			}

 			else if (!wcsncmp(p, L"\\ul", 3)) { // underlined

-				if (p[3] == 0 || wcschr(tszRtfBreaks, p[3])) {

-					res.Append(L"[u]");

-					bInsideUl = true;

-				}

-				else if (!wcsncmp(p + 3, L"none", 4)) {

-					if (bInsideUl)

-						res.Append(L"[/u]");

-					bInsideUl = false;

+				if (!lf.lfUnderline && m_bSendFormat) {

+					if (p[3] == 0 || wcschr(tszRtfBreaks, p[3])) {

+						res.Append(L"[u]");

+						bInsideUl = true;

+					}

+					else if (!wcsncmp(p + 3, L"none", 4)) {

+						if (bInsideUl)

+							res.Append(L"[/u]");

+						bInsideUl = false;

+					}

 				}

 			}

 			else if (!wcsncmp(p, L"\\tab", 4)) { // tab

@@ -167,15 +166,21 @@ int DoRtfToTags(CMStringW &pszText, int iNumColors, COLORREF *pColors)
 			}

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

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

-					wchar_t tmp[10], *t = tmp;

-					*t++ = p[2];

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

-						*t++ = p[3];

-					*t = 0;

+					wchar_t tmp[10];

+

+					if (p[3] != ' ' && p[3] != '\\') {

+						wcsncpy(tmp, p + 2, 3);

+						tmp[3] = 0;

+					}

+					else {

+						wcsncpy(tmp, p + 2, 2);

+						tmp[2] = 0;

+					}

 

 					// convert string containing char in hex format to int.

 					wchar_t *stoppedHere;

 					res.AppendChar(wcstol(tmp, &stoppedHere, 16));

+					bStart = false;

 				}

 			}

 

@@ -192,6 +197,7 @@ int DoRtfToTags(CMStringW &pszText, int iNumColors, COLORREF *pColors)
 

 		default: // other text that should not be touched

 			res.AppendChar(*p++);

+			bStart = false;

 			break;

 		}

 	}

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 08e527e0fa..f6235f268c 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -985,3 +985,5 @@ g_hevEventSetJson @1109 NONAME
 ?process@MJsonWebSocket@@EAEXPBEI@Z @1123 NONAME

 _Proto_CanDeleteHistory@8 @1124 NONAME

 ?OnCacheInit@PROTO_INTERFACE@@UAEXXZ @1125 NONAME

+?DoRtfToTags@CSrmmBaseDialog@@IBE_NAAV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@@Z @1126 NONAME

+?bUseGroup@Chat@@3V?$CMOption@_N@@A @1127 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index c4850e24ff..a09d88051d 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -985,3 +985,5 @@ g_hevEventSetJson @1103 NONAME
 ?process@MJsonWebSocket@@EEAAXPEBE_K@Z @1117 NONAME

 Proto_CanDeleteHistory @1118 NONAME

 ?OnCacheInit@PROTO_INTERFACE@@UEAAXXZ @1119 NONAME

+?DoRtfToTags@CSrmmBaseDialog@@IEBA_NAEAV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@@Z @1120 NONAME

+?bUseGroup@Chat@@3V?$CMOption@_N@@A @1121 NONAME

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index ebac38fdb4..6788f1f424 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -1114,3 +1114,4 @@ void CSrmmBaseDialog::SetQuoteEvent(MEVENT hEvent)
 		Resize();

 	}

 }

+