summaryrefslogtreecommitdiff
path: root/plugins/TabSRMM
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/TabSRMM')
-rw-r--r--plugins/TabSRMM/src/chat.h2
-rw-r--r--plugins/TabSRMM/src/chat_log.cpp115
-rw-r--r--plugins/TabSRMM/src/chat_main.cpp3
-rw-r--r--plugins/TabSRMM/src/chat_manager.cpp20
-rw-r--r--plugins/TabSRMM/src/msgs.h2
5 files changed, 38 insertions, 104 deletions
diff --git a/plugins/TabSRMM/src/chat.h b/plugins/TabSRMM/src/chat.h
index 8e64d6c09b..abb39a9634 100644
--- a/plugins/TabSRMM/src/chat.h
+++ b/plugins/TabSRMM/src/chat.h
@@ -118,6 +118,8 @@ SESSION_INFO* SM_FindSessionAutoComplete(const char* pszModule, SESSION_INFO* cu
BOOL SM_ReconfigureFilters();
+void OnCreateNick(const SESSION_INFO *si, const LOGINFO *lin, CMStringW &wszNick);
+
int UM_CompareItem(const USERINFO *u1, const USERINFO *u2);
// tools.c
diff --git a/plugins/TabSRMM/src/chat_log.cpp b/plugins/TabSRMM/src/chat_log.cpp
index 9af0f40605..837a457a76 100644
--- a/plugins/TabSRMM/src/chat_log.cpp
+++ b/plugins/TabSRMM/src/chat_log.cpp
@@ -133,18 +133,9 @@ static int EventToIcon(LOGINFO *lin)
return 0;
}
-static void Log_AppendRTF(LOGSTREAMDATA *streamData, BOOL simpleMode, CMStringA &str, const wchar_t *fmt, ...)
+static void Log_AppendRTF(LOGSTREAMDATA *streamData, bool simpleMode, CMStringA &str, const wchar_t *line)
{
int textCharsCount = 0;
- wchar_t *line = (wchar_t *)_alloca(8001 * sizeof(wchar_t));
-
- va_list va;
- va_start(va, fmt);
- int lineLen = mir_vsnwprintf(line, 8000, fmt, va);
- if (lineLen < 0)
- lineLen = 8000;
- line[lineLen] = 0;
- va_end(va);
CMStringA res;
@@ -234,94 +225,14 @@ static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)
if (streamData == nullptr || streamData->lin == nullptr)
return;
- CMStringW wszNick;
- if (streamData->lin->ptszNick) {
- if (g_Settings.bLogLimitNames && mir_wstrlen(streamData->lin->ptszNick) > 20) {
- wszNick.Append(streamData->lin->ptszNick, 20);
- wszNick.Append(L"...");
- }
- else wszNick.Append(streamData->lin->ptszNick);
-
- if (g_Settings.bClickableNicks) {
- wszNick.Insert(0, CLICKNICK_BEGIN);
- wszNick.Append(CLICKNICK_END);
- }
-
- if (streamData->lin->ptszUserInfo && streamData->lin->iType != GC_EVENT_TOPIC)
- wszNick.AppendFormat(L" (%s)", streamData->lin->ptszUserInfo);
- }
-
- switch (streamData->lin->iType) {
- case GC_EVENT_MESSAGE:
- if (streamData->lin->ptszText)
- Log_AppendRTF(streamData, FALSE, str, L"%s", streamData->lin->ptszText);
- break;
- case GC_EVENT_ACTION:
- if (streamData->lin->ptszNick && streamData->lin->ptszText) {
- Log_AppendRTF(streamData, TRUE, str, L"%s ", streamData->lin->ptszNick);
- Log_AppendRTF(streamData, FALSE, str, L"%s", streamData->lin->ptszText);
- }
- break;
- case GC_EVENT_JOIN:
- if (!wszNick.IsEmpty()) {
- if (!streamData->lin->bIsMe)
- /* replace nick of a newcomer with a link */
- Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has joined"), wszNick.c_str());
- else
- Log_AppendRTF(streamData, TRUE, str, TranslateT("You have joined %s"), streamData->si->ptszName);
- }
- break;
- case GC_EVENT_PART:
- if (!wszNick.IsEmpty())
- Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has left"), wszNick.c_str());
- if (streamData->lin->ptszText)
- Log_AppendRTF(streamData, FALSE, str, L": %s", streamData->lin->ptszText);
- break;
- case GC_EVENT_QUIT:
- if (!wszNick.IsEmpty())
- Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has disconnected"), wszNick.c_str());
- if (streamData->lin->ptszText)
- Log_AppendRTF(streamData, FALSE, str, L": %s", streamData->lin->ptszText);
- break;
- case GC_EVENT_NICK:
- if (!wszNick.IsEmpty() && streamData->lin->ptszText) {
- if (!streamData->lin->bIsMe)
- Log_AppendRTF(streamData, TRUE, str, TranslateT("%s is now known as %s"), wszNick.c_str(), streamData->lin->ptszText);
- else
- Log_AppendRTF(streamData, TRUE, str, TranslateT("You are now known as %s"), streamData->lin->ptszText);
- }
- break;
- case GC_EVENT_KICK:
- if (!wszNick.IsEmpty() && streamData->lin->ptszStatus)
- Log_AppendRTF(streamData, TRUE, str, TranslateT("%s kicked %s"), streamData->lin->ptszStatus, wszNick.c_str());
-
- if (streamData->lin->ptszText)
- Log_AppendRTF(streamData, FALSE, str, L": %s", streamData->lin->ptszText);
- break;
- case GC_EVENT_NOTICE:
- if (!wszNick.IsEmpty() && streamData->lin->ptszText) {
- Log_AppendRTF(streamData, TRUE, str, TranslateT("Notice from %s: "), wszNick.c_str());
- Log_AppendRTF(streamData, FALSE, str, L"%s", streamData->lin->ptszText);
- }
- break;
- case GC_EVENT_TOPIC:
- if (streamData->lin->ptszText)
- Log_AppendRTF(streamData, FALSE, str, TranslateT("The topic is '%s%s'"), streamData->lin->ptszText, L"%r");
- if (!wszNick.IsEmpty())
- Log_AppendRTF(streamData, TRUE, str, (streamData->lin->ptszUserInfo) ? TranslateT(" (set by %s on %s)") : TranslateT(" (set by %s)"), wszNick.c_str(), streamData->lin->ptszUserInfo);
- break;
- case GC_EVENT_INFORMATION:
- if (streamData->lin->ptszText)
- Log_AppendRTF(streamData, FALSE, str, (streamData->lin->bIsMe) ? L"--> %s" : L"%s", streamData->lin->ptszText);
- break;
- case GC_EVENT_ADDSTATUS:
- if (!wszNick.IsEmpty() && streamData->lin->ptszText && streamData->lin->ptszStatus)
- Log_AppendRTF(streamData, TRUE, str, TranslateT("%s enables '%s' status for %s"), streamData->lin->ptszText, streamData->lin->ptszStatus, wszNick.c_str());
- break;
- case GC_EVENT_REMOVESTATUS:
- if (!wszNick.IsEmpty() && streamData->lin->ptszText && streamData->lin->ptszStatus)
- Log_AppendRTF(streamData, TRUE, str, TranslateT("%s disables '%s' status for %s"), streamData->lin->ptszText, streamData->lin->ptszStatus, wszNick.c_str());
- break;
+ CMStringW wszCaption;
+ bool bTextUsed = Chat_GetDefaultEventDescr(streamData->si, streamData->lin, wszCaption);
+ if (!wszCaption.IsEmpty())
+ Log_AppendRTF(streamData, !bTextUsed, str, wszCaption);
+ if (!bTextUsed && streamData->lin->ptszText) {
+ if (!wszCaption.IsEmpty())
+ Log_AppendRTF(streamData, false, str, L": ");
+ Log_AppendRTF(streamData, false, str, streamData->lin->ptszText);
}
}
@@ -468,7 +379,7 @@ char* Log_CreateRTF(LOGSTREAMDATA *streamData)
wcsncpy_s(szOldTimeStamp, g_chatApi.MakeTimeStamp(g_Settings.pszTimeStamp, si->LastTime), _TRUNCATE);
if (!g_Settings.bShowTimeIfChanged || si->LastTime == 0 || mir_wstrcmp(szTimeStamp, szOldTimeStamp)) {
si->LastTime = lin->time;
- Log_AppendRTF(streamData, TRUE, str, L"%s", szTimeStamp);
+ Log_AppendRTF(streamData, TRUE, str, szTimeStamp);
}
str.Append("\\tab ");
}
@@ -488,19 +399,19 @@ char* Log_CreateRTF(LOGSTREAMDATA *streamData)
str.Append(pszIndicator);
CMStringW pszTemp(lin->bIsMe ? g_Settings.pszOutgoingNick : g_Settings.pszIncomingNick);
- pszTemp.Replace(L"%n", L"%s");
if (!lin->bIsMe) {
if (g_Settings.bClickableNicks)
- pszTemp.Replace(L"%s", CLICKNICK_BEGIN L"%s" CLICKNICK_END);
+ pszTemp.Replace(L"%n", CLICKNICK_BEGIN L"%n" CLICKNICK_END);
if (g_Settings.bColorizeNicksInLog && pszIndicator[0])
str.AppendFormat("\\cf%u ", OPTIONS_FONTCOUNT + Utils::rtf_clrs.getCount() + streamData->crCount + crNickIndex);
}
+ pszTemp.Replace(L"%n", lin->ptszNick);
if (g_Settings.bNewLineAfterNames)
pszTemp.AppendChar('\n');
- Log_AppendRTF(streamData, TRUE, str, pszTemp, lin->ptszNick);
+ Log_AppendRTF(streamData, TRUE, str, pszTemp);
str.AppendChar(' ');
}
diff --git a/plugins/TabSRMM/src/chat_main.cpp b/plugins/TabSRMM/src/chat_main.cpp
index ecea5d89e5..45a64cb83d 100644
--- a/plugins/TabSRMM/src/chat_main.cpp
+++ b/plugins/TabSRMM/src/chat_main.cpp
@@ -353,7 +353,8 @@ int Chat_Load()
CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENW("Message sessions") L"/" LPGENW("Group chats"), FONTMODE_ALTER, &g_plugin };
Chat_CustomizeApi(&data);
-
+
+ g_chatApi.CreateNick = OnCreateNick;
g_chatApi.MM_CreateModule = MM_CreateModule;
g_chatApi.OnCreateModule = OnCreateModule;
g_chatApi.OnNewUser = OnNewUser;
diff --git a/plugins/TabSRMM/src/chat_manager.cpp b/plugins/TabSRMM/src/chat_manager.cpp
index b1c6a78e9a..1639b446e1 100644
--- a/plugins/TabSRMM/src/chat_manager.cpp
+++ b/plugins/TabSRMM/src/chat_manager.cpp
@@ -118,3 +118,23 @@ SESSION_INFO* SM_FindSessionAutoComplete(const char* pszModule, SESSION_INFO* cu
return pResult;
}
+
+void OnCreateNick(const SESSION_INFO *si, const LOGINFO *lin, CMStringW &wszNick)
+{
+ if (lin->ptszNick) {
+ if (g_Settings.bLogLimitNames && mir_wstrlen(lin->ptszNick) > 20) {
+ wszNick.Append(lin->ptszNick, 20);
+ wszNick.Append(L"...");
+ }
+ else wszNick.Append(lin->ptszNick);
+
+ int logMode = (si->pDlg) ? si->pDlg->m_iLogMode : 1;
+ if (g_Settings.bClickableNicks && !logMode && !lin->bSimple) {
+ wszNick.Insert(0, CLICKNICK_BEGIN);
+ wszNick.Append(CLICKNICK_END);
+ }
+
+ if (lin->ptszUserInfo && lin->iType != GC_EVENT_TOPIC)
+ wszNick.AppendFormat(L" (%s)", lin->ptszUserInfo);
+ }
+}
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 60d429910d..31da231d74 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -409,7 +409,6 @@ class CMsgDialog : public CSrmmBaseDialog
int m_originalSplitterY;
SIZE m_minEditBoxSize;
int m_nTypeMode;
- int m_iLogMode;
DWORD m_nLastTyping;
DWORD m_lastMessage;
DWORD m_dwTickLastEvent;
@@ -460,6 +459,7 @@ protected:
public:
char *m_szProto;
int m_iTabID;
+ int m_iLogMode;
BYTE m_bShowTyping;
bool m_bIsHistory, m_bNotOnList, m_bIsIdle;
bool m_bActualHistory;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 19:30:02 +0000