similar code reduced

9 files changed, 86 insertions, 152 deletions

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index ca737a06a7..9729a0bc30 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -112,6 +112,9 @@ struct MIR_APP_EXPORT LOGINFO : public MZeroedObject, public MNonCopyable
 	LOGINFO(const GCEVENT*);

 	~LOGINFO();

 

+	int getIcon() const;

+	int getIndex() const;

+

 	ptrW     ptszText;

 	ptrW     ptszNick;

 	ptrW     ptszUID;

diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h
index f18b2fa4c1..ba7b5aa886 100644
--- a/include/m_srmm_int.h
+++ b/include/m_srmm_int.h
@@ -194,12 +194,13 @@ public:
 	void StreamRtfEvents(RtfLogStreamData *dat, bool bAppend);

 	virtual void CreateRtfHeader(RtfLogStreamData *dat) = 0;

 	virtual bool CreateRtfEvent(RtfLogStreamData *dat, DB::EventInfo &dbei) = 0;

-	virtual void CreateRtfTail(RtfLogStreamData *dat);

+	void CreateRtfTail(RtfLogStreamData *dat);

 

 	void StreamChatRtfEvents(RtfChatLogStreamData *dat, bool bRedraw);

 	virtual void CreateChatRtfHeader(RtfChatLogStreamData *dat);

 	virtual void CreateChatRtfEvent(RtfChatLogStreamData *dat, const struct LOGINFO &lin);

-	virtual void CreateChatRtfTail(RtfChatLogStreamData *dat);

+	void CreateChatRtfMessage(RtfChatLogStreamData *dat, const struct LOGINFO &lin, CMStringA &buf);

+	void CreateChatRtfTail(RtfChatLogStreamData *dat);

 

 	virtual INT_PTR WndProc(UINT msg, WPARAM wParam, LPARAM lParam);

 

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 4a675fd3b0..9229294dcb 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index b4de117a31..03e1836c34 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/TabSRMM/src/chat_log.cpp b/plugins/TabSRMM/src/chat_log.cpp
index a5e18db220..dd1c11c5f7 100644
--- a/plugins/TabSRMM/src/chat_log.cpp
+++ b/plugins/TabSRMM/src/chat_log.cpp
@@ -34,41 +34,6 @@
  * the srmm module and then modified to fit the chat module.

  */

 

-static int EventToIndex(const LOGINFO &lin)

-{

-	switch (lin.iType) {

-	case GC_EVENT_MESSAGE:

-		if (lin.bIsMe)

-			return 10;

-		else

-			return 9;

-

-	case GC_EVENT_JOIN:

-		return 3;

-	case GC_EVENT_PART:

-		return 4;

-	case GC_EVENT_QUIT:

-		return 5;

-	case GC_EVENT_NICK:

-		return 7;

-	case GC_EVENT_KICK:

-		return 6;

-	case GC_EVENT_NOTICE:

-		return 8;

-	case GC_EVENT_TOPIC:

-		return 11;

-	case GC_EVENT_INFORMATION:

-		return 12;

-	case GC_EVENT_ADDSTATUS:

-		return 13;

-	case GC_EVENT_REMOVESTATUS:

-		return 14;

-	case GC_EVENT_ACTION:

-		return 15;

-	}

-	return 0;

-}

-

 static uint8_t EventToSymbol(const LOGINFO &lin)

 {

 	switch (lin.iType) {

@@ -98,41 +63,6 @@ static uint8_t EventToSymbol(const LOGINFO &lin)
 	return 0x73;

 }

 

-static int EventToIcon(const LOGINFO &lin)

-{

-	switch (lin.iType) {

-	case GC_EVENT_MESSAGE:

-		if (lin.bIsMe)

-			return ICON_MESSAGEOUT;

-		else

-			return ICON_MESSAGE;

-

-	case GC_EVENT_JOIN:

-		return ICON_JOIN;

-	case GC_EVENT_PART:

-		return ICON_PART;

-	case GC_EVENT_QUIT:

-		return ICON_QUIT;

-	case GC_EVENT_NICK:

-		return ICON_NICK;

-	case GC_EVENT_KICK:

-		return ICON_KICK;

-	case GC_EVENT_NOTICE:

-		return ICON_NOTICE;

-	case GC_EVENT_TOPIC:

-		return ICON_TOPIC;

-	case GC_EVENT_INFORMATION:

-		return ICON_INFO;

-	case GC_EVENT_ADDSTATUS:

-		return ICON_ADDSTATUS;

-	case GC_EVENT_REMOVESTATUS:

-		return ICON_REMSTATUS;

-	case GC_EVENT_ACTION:

-		return ICON_ACTION;

-	}

-	return 0;

-}

-

 static void Log_AppendRTF(RtfChatLogStreamData *streamData, const LOGINFO &lin, bool simpleMode, CMStringA &str, const wchar_t *line)

 {

 	int textCharsCount = 0;

@@ -175,7 +105,7 @@ static void Log_AppendRTF(RtfChatLogStreamData *streamData, const LOGINFO &lin,
 			case 'C':

 			case 'F':

 				if (!g_Settings.bStripFormat && !streamData->bStripFormat) {

-					int j = lin.bIsHighlighted ? 16 : EventToIndex(lin);

+					int j = lin.bIsHighlighted ? 16 : lin.getIndex();

 					if (*line == 'C')

 						res.AppendFormat("\\cf%u ", j + 1);

 					else

@@ -197,10 +127,8 @@ static void Log_AppendRTF(RtfChatLogStreamData *streamData, const LOGINFO &lin,
 				break;

 

 			case 'r':

-				if (!streamData->bStripFormat) {

-					int index = EventToIndex(lin);

-					res.AppendFormat("%s ", g_chatApi.Log_SetStyle(index));

-				}

+				if (!streamData->bStripFormat)

+					res.AppendFormat("%s ", g_chatApi.Log_SetStyle(lin.getIndex()));

 				break;

 			}

 		}

@@ -316,7 +244,7 @@ void CLogWindow::CreateChatRtfEvent(RtfChatLogStreamData *streamData, const LOGI
 	if (g_Settings.bLogSymbols)                // use symbols

 		str.AppendFormat("%s %c", g_chatApi.Log_SetStyle(17), EventToSymbol(lin));

 	else if (g_Settings.dwIconFlags) {

-		int iIndex = lin.bIsHighlighted ? ICON_HIGHLIGHT : EventToIcon(lin);

+		int iIndex = lin.bIsHighlighted ? ICON_HIGHLIGHT : lin.getIcon();

 		str.Append("\\f0\\fs14");

 		str.Append(g_chatApi.pLogIconBmpBits[iIndex]);

 	}

@@ -333,7 +261,7 @@ void CLogWindow::CreateChatRtfEvent(RtfChatLogStreamData *streamData, const LOGI
 			str.Append(szStyle);

 		}

 		else {

-			iii = lin.bIsHighlighted ? 16 : EventToIndex(lin);

+			iii = lin.bIsHighlighted ? 16 : lin.getIndex();

 			mir_snprintf(szStyle, "\\f0\\cf%u\\ul0\\highlight0\\b%d\\i%d\\ul%d\\fs%u",

 				iii + 1, F.lfWeight >= FW_BOLD ? 1 : 0, F.lfItalic, F.lfUnderline, 2 * abs(F.lfHeight) * 74 / g_chatApi.logPixelSY);

 			str.Append(szStyle);

@@ -391,17 +319,5 @@ void CLogWindow::CreateChatRtfEvent(RtfChatLogStreamData *streamData, const LOGI
 	}

 

 	// Insert the message

-	str.Append(g_chatApi.Log_SetStyle(lin.bIsHighlighted ? 16 : EventToIndex(lin)));

-	str.AppendChar(' ');

-

-

-	CMStringW wszCaption;

-	bool bTextUsed = Chat_GetDefaultEventDescr(streamData->si, &lin, wszCaption);

-	if (!wszCaption.IsEmpty())

-		Log_AppendRTF(streamData, lin, !bTextUsed, str, wszCaption);

-	if (!bTextUsed && lin.ptszText) {

-		if (!wszCaption.IsEmpty())

-			Log_AppendRTF(streamData, lin, false, str, L" ");

-		Log_AppendRTF(streamData, lin, false, str, lin.ptszText);

-	}

+	CreateChatRtfMessage(streamData, lin, str);

 }

diff --git a/src/mir_app/src/chat_log.cpp b/src/mir_app/src/chat_log.cpp
index 60a68c78cf..45e59c666f 100644
--- a/src/mir_app/src/chat_log.cpp
+++ b/src/mir_app/src/chat_log.cpp
@@ -30,54 +30,6 @@ char *pLogIconBmpBits[14];
 #define RTFCACHELINESIZE 128

 static char	CHAT_rtfFontsGlobal[OPTIONS_FONTCOUNT][RTFCACHELINESIZE];

 

-static int EventToIndex(const LOGINFO &lin)

-{

-	switch (lin.iType) {

-		case GC_EVENT_MESSAGE:

-			if (lin.bIsMe)

-				return 10;

-			else

-				return 9;

-

-		case GC_EVENT_JOIN: return 3;

-		case GC_EVENT_PART: return 4;

-		case GC_EVENT_QUIT: return 5;

-		case GC_EVENT_NICK: return 7;

-		case GC_EVENT_KICK: return 6;

-		case GC_EVENT_NOTICE: return 8;

-		case GC_EVENT_TOPIC: return 11;

-		case GC_EVENT_INFORMATION:return 12;

-		case GC_EVENT_ADDSTATUS: return 13;

-		case GC_EVENT_REMOVESTATUS: return 14;

-		case GC_EVENT_ACTION: return 15;

-	}

-	return 0;

-}

-

-static int EventToIcon(const LOGINFO &lin)

-{

-	switch (lin.iType) {

-		case GC_EVENT_MESSAGE:

-			if (lin.bIsMe)

-				return ICON_MESSAGEOUT;

-			else

-				return ICON_MESSAGE;

-

-		case GC_EVENT_JOIN: return ICON_JOIN;

-		case GC_EVENT_PART: return ICON_PART;

-		case GC_EVENT_QUIT: return ICON_QUIT;

-		case GC_EVENT_NICK: return ICON_NICK;

-		case GC_EVENT_KICK: return ICON_KICK;

-		case GC_EVENT_NOTICE: return ICON_NOTICE;

-		case GC_EVENT_TOPIC: return ICON_TOPIC;

-		case GC_EVENT_INFORMATION:return ICON_INFO;

-		case GC_EVENT_ADDSTATUS: return ICON_ADDSTATUS;

-		case GC_EVENT_REMOVESTATUS: return ICON_REMSTATUS;

-		case GC_EVENT_ACTION: return ICON_ACTION;

-	}

-	return 0;

-}

-

 char* Log_SetStyle(int style)

 {

 	if (style < OPTIONS_FONTCOUNT)

@@ -129,7 +81,7 @@ static int Log_AppendRTF(RtfChatLogStreamData *streamData, const LOGINFO &lin, b
 			case 'C':

 			case 'F':

 				if (!g_Settings->bStripFormat && !streamData->bStripFormat) {

-					int j = lin.bIsHighlighted ? 16 : EventToIndex(lin);

+					int j = lin.bIsHighlighted ? 16 : lin.getIndex();

 					if (*line == 'C')

 						mir_snprintf(szTemp, "\\cf%u ", j + 1);

 					else

@@ -153,10 +105,8 @@ static int Log_AppendRTF(RtfChatLogStreamData *streamData, const LOGINFO &lin, b
 				break;

 

 			case 'r':

-				if (!streamData->bStripFormat) {

-					int index = EventToIndex(lin);

-					mir_snprintf(szTemp, "%s ", Log_SetStyle(index));

-				}

+				if (!streamData->bStripFormat)

+					mir_snprintf(szTemp, "%s ", Log_SetStyle(lin.getIndex()));

 				break;

 			}

 

@@ -385,7 +335,7 @@ void CRtfLogWindow::CreateChatRtfEvent(RtfChatLogStreamData *streamData, const L
 

 	// Insert icon

 	if ((lin.iType & g_Settings->dwIconFlags) || lin.bIsHighlighted && (g_Settings->dwIconFlags & GC_EVENT_HIGHLIGHT)) {

-		int iIndex = (lin.bIsHighlighted && (g_Settings->dwIconFlags & GC_EVENT_HIGHLIGHT)) ? ICON_HIGHLIGHT : EventToIcon(lin);

+		int iIndex = (lin.bIsHighlighted && (g_Settings->dwIconFlags & GC_EVENT_HIGHLIGHT)) ? ICON_HIGHLIGHT : lin.getIcon();

 		buf.Append("\\f0\\fs14");

 		buf.Append(pLogIconBmpBits[iIndex]);

 	}

@@ -399,7 +349,7 @@ void CRtfLogWindow::CreateChatRtfEvent(RtfChatLogStreamData *streamData, const L
 			buf.AppendFormat("\\f0\\cf%u\\ul0\\highlight0\\b%d\\i%d\\fs%u", iii + 1, lf.lfWeight >= FW_BOLD ? 1 : 0, lf.lfItalic, 2 * abs(lf.lfHeight) * 74 / g_chatApi.logPixelSY);

 		}

 		else {

-			int iii = lin.bIsHighlighted ? 16 : EventToIndex(lin);

+			int iii = lin.bIsHighlighted ? 16 : lin.getIndex();

 			buf.AppendFormat("\\f0\\cf%u\\ul0\\highlight0\\b%d\\i%d\\fs%u", iii + 1, lf.lfWeight >= FW_BOLD ? 1 : 0, lf.lfItalic, 2 * abs(lf.lfHeight) * 74 / g_chatApi.logPixelSY);

 		}

 	}

@@ -432,12 +382,22 @@ void CRtfLogWindow::CreateChatRtfEvent(RtfChatLogStreamData *streamData, const L
 	}

 

 	// Insert the message

-	buf.AppendFormat("%s ", Log_SetStyle(lin.bIsHighlighted ? 16 : EventToIndex(lin)));

+	CreateChatRtfMessage(streamData, lin, buf);

+	

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// Chat event message

+

+void CRtfLogWindow::CreateChatRtfMessage(RtfChatLogStreamData *streamData, const LOGINFO &lin, CMStringA &buf)

+{

+	buf.AppendFormat("%s ", Log_SetStyle(lin.bIsHighlighted ? 16 : lin.getIndex()));

 

 	CMStringW wszCaption;

 	bool bTextUsed = Chat_GetDefaultEventDescr(streamData->si, &lin, wszCaption);

 	if (!wszCaption.IsEmpty())

 		Log_AppendRTF(streamData, lin, !bTextUsed, buf, wszCaption);

+

 	if (!bTextUsed && lin.ptszText) {

 		if (!wszCaption.IsEmpty())

 			Log_AppendRTF(streamData, lin, false, buf, L" ");

diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp
index eb0de25e12..be8ede8b01 100644
--- a/src/mir_app/src/chat_manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -73,6 +73,54 @@ LOGINFO::~LOGINFO()
 {

 }

 

+int LOGINFO::getIndex() const

+{

+	switch (iType) {

+	case GC_EVENT_MESSAGE:

+		if (bIsMe)

+			return 10;

+		else

+			return 9;

+

+	case GC_EVENT_JOIN: return 3;

+	case GC_EVENT_PART: return 4;

+	case GC_EVENT_QUIT: return 5;

+	case GC_EVENT_NICK: return 7;

+	case GC_EVENT_KICK: return 6;

+	case GC_EVENT_NOTICE: return 8;

+	case GC_EVENT_TOPIC: return 11;

+	case GC_EVENT_INFORMATION:return 12;

+	case GC_EVENT_ADDSTATUS: return 13;

+	case GC_EVENT_REMOVESTATUS: return 14;

+	case GC_EVENT_ACTION: return 15;

+	}

+	return 0;

+}

+

+int LOGINFO::getIcon() const

+{

+	switch (iType) {

+	case GC_EVENT_MESSAGE:

+		if (bIsMe)

+			return ICON_MESSAGEOUT;

+		else

+			return ICON_MESSAGE;

+

+	case GC_EVENT_JOIN: return ICON_JOIN;

+	case GC_EVENT_PART: return ICON_PART;

+	case GC_EVENT_QUIT: return ICON_QUIT;

+	case GC_EVENT_NICK: return ICON_NICK;

+	case GC_EVENT_KICK: return ICON_KICK;

+	case GC_EVENT_NOTICE: return ICON_NOTICE;

+	case GC_EVENT_TOPIC: return ICON_TOPIC;

+	case GC_EVENT_INFORMATION:return ICON_INFO;

+	case GC_EVENT_ADDSTATUS: return ICON_ADDSTATUS;

+	case GC_EVENT_REMOVESTATUS: return ICON_REMSTATUS;

+	case GC_EVENT_ACTION: return ICON_ACTION;

+	}

+	return 0;

+}

+

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

 //	Session Manager functions

 //	Keeps track of all sessions and its windows

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 4e24c3be80..85a560255c 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -852,11 +852,14 @@ Chat_IsMuted @941 NONAME
 ?GetDialog@CSrmmLogWindow@@QBEAAVCMsgDialog@@XZ @969 NONAME

 ?isHistory@EventInfo@DB@@QBE_NXZ @970 NONAME

 ?isSrmm@EventInfo@DB@@QBE_NXZ @971 NONAME

-?CreateRtfTail@CRtfLogWindow@@UAEXPAURtfLogStreamData@@@Z @972 NONAME

+?CreateRtfTail@CRtfLogWindow@@QAEXPAURtfLogStreamData@@@Z @972 NONAME

 ?StreamRtfEvents@CRtfLogWindow@@QAEXPAURtfLogStreamData@@_N@Z @973 NONAME

 ?CreateChatRtfEvent@CRtfLogWindow@@UAEXPAURtfChatLogStreamData@@ABULOGINFO@@@Z @974 NONAME

 ?CreateChatRtfHeader@CRtfLogWindow@@UAEXPAURtfChatLogStreamData@@@Z @975 NONAME

-?CreateChatRtfTail@CRtfLogWindow@@UAEXPAURtfChatLogStreamData@@@Z @976 NONAME

+?CreateChatRtfTail@CRtfLogWindow@@QAEXPAURtfChatLogStreamData@@@Z @976 NONAME

 ?StreamChatRtfEvents@CRtfLogWindow@@QAEXPAURtfChatLogStreamData@@_N@Z @977 NONAME

 ??0LOGINFO@@QAE@PBUGCEVENT@@@Z @978 NONAME

 ??1LOGINFO@@QAE@XZ @979 NONAME

+?CreateChatRtfMessage@CRtfLogWindow@@QAEXPAURtfChatLogStreamData@@ABULOGINFO@@AAV?$CMStringT@DV?$ChTraitsCRT@D@@@@@Z @980 NONAME

+?getIcon@LOGINFO@@QBEHXZ @981 NONAME

+?getIndex@LOGINFO@@QBEHXZ @982 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 1cb5054e48..8fae93a9fd 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -852,11 +852,14 @@ Chat_IsMuted @941 NONAME
 ?GetDialog@CSrmmLogWindow@@QEBAAEAVCMsgDialog@@XZ @969 NONAME

 ?isHistory@EventInfo@DB@@QEBA_NXZ @970 NONAME

 ?isSrmm@EventInfo@DB@@QEBA_NXZ @971 NONAME

-?CreateRtfTail@CRtfLogWindow@@UEAAXPEAURtfLogStreamData@@@Z @972 NONAME

+?CreateRtfTail@CRtfLogWindow@@QEAAXPEAURtfLogStreamData@@@Z @972 NONAME

 ?StreamRtfEvents@CRtfLogWindow@@QEAAXPEAURtfLogStreamData@@_N@Z @973 NONAME

 ?CreateChatRtfEvent@CRtfLogWindow@@UEAAXPEAURtfChatLogStreamData@@AEBULOGINFO@@@Z @974 NONAME

 ?CreateChatRtfHeader@CRtfLogWindow@@UEAAXPEAURtfChatLogStreamData@@@Z @975 NONAME

-?CreateChatRtfTail@CRtfLogWindow@@UEAAXPEAURtfChatLogStreamData@@@Z @976 NONAME

+?CreateChatRtfTail@CRtfLogWindow@@QEAAXPEAURtfChatLogStreamData@@@Z @976 NONAME

 ?StreamChatRtfEvents@CRtfLogWindow@@QEAAXPEAURtfChatLogStreamData@@_N@Z @977 NONAME

 ??0LOGINFO@@QEAA@PEBUGCEVENT@@@Z @978 NONAME

 ??1LOGINFO@@QEAA@XZ @979 NONAME

+?CreateChatRtfMessage@CRtfLogWindow@@QEAAXPEAURtfChatLogStreamData@@AEBULOGINFO@@AEAV?$CMStringT@DV?$ChTraitsCRT@D@@@@@Z @980 NONAME

+?getIcon@LOGINFO@@QEBAHXZ @981 NONAME

+?getIndex@LOGINFO@@QEBAHXZ @982 NONAME