From 66142639448faf340baed0ac857240eb66f9fae2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 12 Sep 2024 16:51:46 +0300 Subject: =?UTF-8?q?fixes=20#4651=20(NewStory+tabSRMM:=20=D0=A4=D0=BE=D1=80?= =?UTF-8?q?=D0=BC=D0=B0=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0=20=D0=BF=D0=BE-?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BD=D0=BE=D0=BC=D1=83=20=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=B2=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D0=B2=D0=B0=D1=82=D0=B0=D1=85=20=D0=B8=20=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D0=B0=D1=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/IRCG/src/channelList.cpp | 3 +- protocols/IRCG/src/commandmonitor.cpp | 14 ++--- protocols/IRCG/src/input.cpp | 2 - protocols/IRCG/src/ircproto.cpp | 1 - protocols/IRCG/src/output.cpp | 3 - protocols/IRCG/src/services.cpp | 104 +++++++++++++++------------------- protocols/IRCG/src/stdafx.h | 16 +++--- protocols/IRCG/src/tools.cpp | 75 ++++++++---------------- 8 files changed, 85 insertions(+), 133 deletions(-) (limited to 'protocols/IRCG') diff --git a/protocols/IRCG/src/channelList.cpp b/protocols/IRCG/src/channelList.cpp index c2de0eaa10..3669b9e942 100644 --- a/protocols/IRCG/src/channelList.cpp +++ b/protocols/IRCG/src/channelList.cpp @@ -293,8 +293,9 @@ public: wszTopic.Delete(0, iEnd); } + wszTopic = DoColorCodes(wszTopic); lvItem.iSubItem = 3; - lvItem.pszText = DoColorCodes(wszTopic, TRUE, FALSE); + lvItem.pszText = wszTopic.GetBuffer(); m_list.SetItem(&lvItem); int percent = 100; diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp index 28350171b2..4daf29d855 100644 --- a/protocols/IRCG/src/commandmonitor.cpp +++ b/protocols/IRCG/src/commandmonitor.cpp @@ -221,7 +221,7 @@ int CIrcProto::AddOutgoingMessageToDB(MCONTACT hContact, const wchar_t *msg) if (m_iStatus == ID_STATUS_OFFLINE || m_iStatus == ID_STATUS_CONNECTING) return 0; - CMStringW S = DoColorCodes(msg, TRUE, FALSE); + CMStringW S = DoColorCodes(msg); DBEVENTINFO dbei = {}; dbei.szModule = m_szModuleName; @@ -682,7 +682,7 @@ bool CIrcProto::OnIrc_PRIVMSG(const CIrcMessage *pmsg) bool bIsChannel = IsChannel(pmsg->parameters[0]); if (pmsg->m_bIncoming && !bIsChannel) { - mess = DoColorCodes(mess, TRUE, FALSE); + mess = DoColorCodes(mess); CONTACT user = { pmsg->prefix.sNick, pmsg->prefix.sUser, pmsg->prefix.sHost, false, false, false }; @@ -772,8 +772,6 @@ bool CIrcProto::IsCTCP(const CIrcMessage *pmsg) if (IsChannel(pmsg->parameters[0])) { if (mess.GetLength() > 1) { mess.Delete(0, 1); - if (!pmsg->m_bIncoming) - mess.Replace(L"%%", L"%"); DoEvent(GC_EVENT_ACTION, pmsg->parameters[0], pmsg->m_bIncoming ? pmsg->prefix.sNick : m_info.sNick, mess, nullptr, nullptr, NULL, true, pmsg->m_bIncoming ? false : true); } @@ -1173,7 +1171,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage *pmsg) CONTACT user = { pmsg->prefix.sNick, pmsg->prefix.sUser, pmsg->prefix.sHost, false, false, false }; MCONTACT hContact = CList_FindContact(&user); if (hContact) - setWString(hContact, "MirVer", DoColorCodes(GetWordAddress(mess, 1), TRUE, FALSE)); + setWString(hContact, "MirVer", DoColorCodes(GetWordAddress(mess, 1))); } // if the whois window is visible and the ctcp reply belongs to the user in it, then show the reply in the whois window @@ -1182,7 +1180,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage *pmsg) if (mir_wstrcmpi(szTemp, pmsg->prefix.sNick) == 0) { if (pmsg->m_bIncoming && (command == L"version" || command == L"userinfo" || command == L"time")) { SetActiveWindow(m_whoisDlg->GetHwnd()); - m_whoisDlg->m_Reply.SetText(DoColorCodes(GetWordAddress(mess, 1), TRUE, FALSE)); + m_whoisDlg->m_Reply.SetText(DoColorCodes(GetWordAddress(mess, 1))); return true; } if (pmsg->m_bIncoming && command == L"ping") { @@ -1194,7 +1192,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage *pmsg) else mir_snwprintf(szTmp, TranslateT("%u seconds"), s); - m_whoisDlg->m_Reply.SetText(DoColorCodes(szTmp, TRUE, FALSE)); + m_whoisDlg->m_Reply.SetText(DoColorCodes(szTmp)); return true; } } @@ -1742,7 +1740,7 @@ bool CIrcProto::OnIrc_ERROR(const CIrcMessage *pmsg) if (pmsg->m_bIncoming && !m_disableErrorPopups && m_iDesiredStatus != ID_STATUS_OFFLINE) { CMStringW S; if (pmsg->parameters.getCount() > 0) - S = DoColorCodes(pmsg->parameters[0], TRUE, FALSE); + S = DoColorCodes(pmsg->parameters[0]); else S = TranslateT("Unknown"); Clist_TrayNotifyW(m_szModuleName, TranslateT("IRC error"), S, NIIF_ERROR, 15000); diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp index 4245d8764f..1030a67043 100644 --- a/protocols/IRCG/src/input.cpp +++ b/protocols/IRCG/src/input.cpp @@ -490,7 +490,6 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo return true; CMStringW S = L"/ME " + DoIdentifiers(GetWordAddress(text, 1), window); - S.Replace(L"%", L"%%"); Chat_SendUserMessage(m_szModuleName, S); return true; } @@ -500,7 +499,6 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo return true; CMStringW S = DoIdentifiers(GetWordAddress(text, 1), window); - S.Replace(L"%", L"%%"); Chat_SendUserMessage(m_szModuleName, S); return true; } diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 8d8c4bd23f..05a2001da9 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -516,7 +516,6 @@ HANDLE CIrcProto::SendFile(MCONTACT hContact, const wchar_t*, wchar_t** ppszFile // need to make sure that %'s are doubled to avoid having chat interpret as color codes CMStringW sFileCorrect = dci->sFile; - sFileCorrect.Replace(L"%", L"%%"); // is it an reverse filetransfer (receiver acts as server) if (dci->bReverse) { diff --git a/protocols/IRCG/src/output.cpp b/protocols/IRCG/src/output.cpp index be429f5571..0c43081131 100644 --- a/protocols/IRCG/src/output.cpp +++ b/protocols/IRCG/src/output.cpp @@ -109,9 +109,6 @@ BOOL CIrcProto::ShowMessage(const CIrcMessage* pmsg) { CMStringW mess = FormatOutput(pmsg); - if (!pmsg->m_bIncoming) - mess.Replace(L"%%", L"%"); - int iTemp = _wtoi(pmsg->sCommand); //To active window diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 2fccbe141d..ab45a31c83 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -352,76 +352,64 @@ static wchar_t* DoPrintColor(wchar_t *pDest, int iFG, int iBG) return pDest; } +///////////////////////////////////////////////////////////////////////////////////////// + static void DoChatFormatting(CMStringW &wszText) { int iFG = -1, iBG = -1; wchar_t InsertThis[50]; + CMStringW tmp; - for (int i = 0; i < wszText.GetLength(); i++) { - if (wszText[i] != '%') + for (const wchar_t *p = wszText; *p; p++) { + if (*p != '[') { + tmp.AppendChar(*p); continue; + } - switch (wszText[i + 1]) { - case 'B': - case 'b': - wszText.Delete(i, 2); - wszText.Insert(i, irc::BOLD); - break; - case 'I': - case 'i': - wszText.Delete(i, 2); - wszText.Insert(i, irc::ITALICS); - break; - case 'U': - case 'u': - wszText.Delete(i, 2); - wszText.Insert(i, irc::UNDERLINE); - break; - - case 'c': - wszText.Delete(i, 2); - iFG = _wtoi(wszText.GetString() + i); - wszText.Delete(i, (iFG < 10) ? 1 : 2); - - iFG = (iFG < 0 || iFG >= _countof(mapSrmm2irc)) ? -1 : mapSrmm2irc[iFG]; - wszText.Insert(i, DoPrintColor(InsertThis, iFG, iBG)); - break; + p++; + bool bEnable = true; + if (*p == '/') { + p++; + bEnable = false; + } - case 'C': - if (wszText[i + 2] == '%' && wszText[i + 3] == 'F') { - wszText.Delete(i, 4); - iBG = -1; - } - else wszText.Delete(i, 2); + if (!wcsncmp(p, L"b]", 2)) { + tmp.AppendChar(irc::BOLD); + p++; + } + else if (!wcsncmp(p, L"i]", 2)) { + tmp.AppendChar(irc::ITALICS); + p++; + } + else if (!wcsncmp(p, L"u]", 2)) { + tmp.AppendChar(irc::UNDERLINE); + p++; + } + else if (!wcsncmp(p, L"color=", 6)) { + if (1 != swscanf(p + 6, L"%08X", &iFG)) + iFG = -1; + tmp.Append(DoPrintColor(InsertThis, iFG, iBG)); + p = wcschr(p, ']'); + } + else if (!wcsncmp(p, L"color]", 6) && !bEnable) { iFG = -1; - wszText.Insert(i, DoPrintColor(InsertThis, iFG, iBG)); - break; - - case 'f': - wszText.Delete(i, 2); - iBG = _wtoi(wszText.GetString() + i); - wszText.Delete(i, (iBG < 10) ? 1 : 2); - - iBG = (iBG < 0 || iBG >= _countof(mapSrmm2irc)) ? -1 : mapSrmm2irc[iBG]; - wszText.Insert(i, DoPrintColor(InsertThis, iFG, iBG)); - break; - - case 'F': - wszText.Delete(i, 2); + tmp.Append(DoPrintColor(InsertThis, iFG, iBG)); + p += 6; + } + else if (!wcsncmp(p, L"bkcolor=", 8)) { + if (1 != swscanf(p + 6, L"%08X", &iBG)) + iBG = -1; + tmp.Append(DoPrintColor(InsertThis, iFG, iBG)); + p = wcschr(p, ']'); + } + else if (!wcsncmp(p, L"bkcolor]", 8) && !bEnable) { iBG = -1; - wszText.Insert(i, DoPrintColor(InsertThis, iFG, iBG)); - break; - - case '%': - wszText.Delete(i, 1); - i++; - break; - - default: - wszText.Delete(i, 2); - break; + tmp.Append(DoPrintColor(InsertThis, iFG, iBG)); + p += 8; } + else tmp.AppendChar('['); // sometimes a banana is just a banana } + wszText = tmp; } int __cdecl CIrcProto::GCEventHook(WPARAM, LPARAM lParam) diff --git a/protocols/IRCG/src/stdafx.h b/protocols/IRCG/src/stdafx.h index f83906cfcd..04751ac5eb 100644 --- a/protocols/IRCG/src/stdafx.h +++ b/protocols/IRCG/src/stdafx.h @@ -207,14 +207,14 @@ void UninitContactMenus(void); void InitIcons(void); // tools.cpp -int __stdcall WCCmp(const wchar_t* wild, const wchar_t* string); -char* __stdcall IrcLoadFile(wchar_t * szPath); -CMStringW __stdcall GetWord(const wchar_t* text, int index); -const wchar_t* __stdcall GetWordAddress(const wchar_t* text, int index); -void __stdcall RemoveLinebreaks(CMStringW& Message); -wchar_t* __stdcall DoColorCodes(const wchar_t* text, bool bStrip, bool bReplacePercent); - -CMStringA __stdcall GetWord(const char* text, int index); +int WCCmp(const wchar_t* wild, const wchar_t* string); +char* IrcLoadFile(wchar_t * szPath); +CMStringW GetWord(const wchar_t* text, int index); +const wchar_t* GetWordAddress(const wchar_t* text, int index); +void RemoveLinebreaks(CMStringW& Message); +CMStringW DoColorCodes(const wchar_t* text, bool bStrip = true); + +CMStringA GetWord(const char* text, int index); __forceinline const wchar_t* s2null(const CMStringW &str) { diff --git a/protocols/IRCG/src/tools.cpp b/protocols/IRCG/src/tools.cpp index f32a001092..6e71adfc53 100644 --- a/protocols/IRCG/src/tools.cpp +++ b/protocols/IRCG/src/tools.cpp @@ -274,60 +274,43 @@ static const wchar_t* DoEnterNumber(const wchar_t *text, int &res) return text; } -wchar_t* __stdcall DoColorCodes(const wchar_t *text, bool bStrip, bool bReplacePercent) +CMStringW DoColorCodes(const wchar_t *text, bool bStrip) { - static wchar_t szTemp[4000]; szTemp[0] = 0; - wchar_t* p = szTemp; + CMStringW ret; bool bBold = false; bool bUnderline = false; bool bItalics = false; - int iFG = -1, iBG = -1; - + int iFG = -1, iBG = -1, numColors = 0; + COLORREF *pClrTable = Srmm_GetColorTable(&numColors); + if (!text) - return szTemp; + return ret; while (*text != 0) { switch (*text) { - case '%': // escape - *p++ = '%'; - if (bReplacePercent) - *p++ = '%'; - text++; - break; - case irc::BOLD: - if (!bStrip) { - *p++ = '%'; - *p++ = bBold ? 'B' : 'b'; - } bBold = !bBold; + if (!bStrip) + ret.Append(bBold ? L"[b]" : L"[/b]"); text++; break; case irc::RESET: - if (!bStrip) { - *p++ = '%'; - *p++ = 'r'; - } bUnderline = bItalics = bBold = false; text++; break; case irc::ITALICS: - if (!bStrip) { - *p++ = '%'; - *p++ = bItalics ? 'I' : 'i'; - } bItalics = !bItalics; + if (!bStrip) + ret.Append(bItalics ? L"[i]" : L"[/i]"); text++; break; case irc::UNDERLINE: - if (!bStrip) { - *p++ = '%'; - *p++ = bUnderline ? 'U' : 'u'; - } bUnderline = !bUnderline; + if (!bStrip) + ret.Append(bUnderline ? L"[u]" : L"[/u]"); text++; break; @@ -343,41 +326,29 @@ wchar_t* __stdcall DoColorCodes(const wchar_t *text, bool bStrip, bool bReplaceP // create tag for chat.dll if (!bStrip) { - wchar_t buf[10]; if (iFG != iOldFG) { - *p++ = '%'; if (iFG == -1) - *p++ = 'C'; - else { - *p++ = 'c'; - mir_snwprintf(buf, L"%02u", iFG); - *p++ = buf[0]; - *p++ = buf[1]; - } + ret.Append(L"[/color]"); + else if (iFG < numColors) + ret.Append(L"[color=%08X]", pClrTable[iFG]); } if (iBG != iOldBG) { - *p++ = '%'; - if (iBG == -1) - *p++ = 'F'; - else { - *p++ = 'f'; - mir_snwprintf(buf, L"%02u", iBG); - *p++ = buf[0]; - *p++ = buf[1]; - } + if (iFG == -1) + ret.Append(L"[/bkcolor]"); + else if (iFG < numColors) + ret.Append(L"[bkcolor=%08X]", pClrTable[iFG]); } } break; default: - *p++ = *text++; + ret.AppendChar(*text++); break; } } - *p = 0; - return szTemp; + return ret; } INT_PTR CIrcProto::DoEvent(int iEvent, const wchar_t *pszWindow, const wchar_t *pszNick, @@ -389,7 +360,7 @@ INT_PTR CIrcProto::DoEvent(int iEvent, const wchar_t *pszWindow, const wchar_t * CMStringW sText; if (pszText) - sText = DoColorCodes(pszText, FALSE, TRUE); + sText = DoColorCodes(pszText, false); GCEVENT gce = {}; if (pszWindow) @@ -537,7 +508,7 @@ int CIrcProto::SetChannelSBText(CMStringW sWindow, CHANNELINFO *wi) } if (wi->pszTopic) sTemp += wi->pszTopic; - sTemp = DoColorCodes(sTemp, TRUE, FALSE); + sTemp = DoColorCodes(sTemp); Chat_SetStatusbarText(Chat_Find(sWindow, m_szModuleName), sTemp); return 0; } -- cgit v1.2.3