From f72638c4700b2f790d3d71d19360763a330a907a Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 5 Feb 2020 21:39:06 +0300
Subject: fixes #2200 ([0.95.11 x64] IRC-style colors (ctrl-k) regression)

---
 plugins/TabSRMM/src/msgdialog.cpp | 44 +++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index a44bb25bb5..af564e8b6f 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1916,20 +1916,9 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 
 		if (isCtrl && !isAlt) {
 			switch (wParam) {
-			case 0x02:               // bold
-				if (m_SendFormat)
-					m_btnBold.Click();
-				return 0;
-			case 0x09:
-				if (m_SendFormat)
-					m_btnItalic.Click();
-				return 0;
-			case 21:
-				if (m_SendFormat)
-					m_btnUnderline.Click();
-				return 0;
 			case 0x0b:
-				m_message.SetText(L"");
+				if (!isChat())
+					m_message.SetText(L"");
 				return 0;
 			}
 		}
@@ -1977,19 +1966,24 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 		if (wParam == VK_CAPITAL || wParam == VK_NUMLOCK)
 			m_message.OnChange(&m_message);
 
-		// tab-autocomplete
-		if (isChat() && wParam == VK_TAB && !isCtrl && !isShift) {
-			m_message.SendMsg(WM_SETREDRAW, FALSE, 0);
-			bool fCompleted = TabAutoComplete();
-			m_message.SendMsg(WM_SETREDRAW, TRUE, 0);
-			RedrawWindow(m_message.GetHwnd(), nullptr, nullptr, RDW_INVALIDATE);
-			if (!fCompleted && !PluginConfig.m_bAllowTab) {
-				if ((GetSendButtonState(GetHwnd()) != PBS_DISABLED))
-					SetFocus(m_btnOk.GetHwnd());
-				else
-					SetFocus(m_pLog->GetHwnd());
-				return 0;
+		if (isChat()) {
+			// tab-autocomplete
+			if (wParam == VK_TAB && !isCtrl && !isShift) {
+				m_message.SendMsg(WM_SETREDRAW, FALSE, 0);
+				bool fCompleted = TabAutoComplete();
+				m_message.SendMsg(WM_SETREDRAW, TRUE, 0);
+				RedrawWindow(m_message.GetHwnd(), nullptr, nullptr, RDW_INVALIDATE);
+				if (!fCompleted && !PluginConfig.m_bAllowTab) {
+					if ((GetSendButtonState(GetHwnd()) != PBS_DISABLED))
+						SetFocus(m_btnOk.GetHwnd());
+					else
+						SetFocus(m_pLog->GetHwnd());
+					return 0;
+				}
 			}
+
+			if (ProcessHotkeys(wParam, isShift, isCtrl, isAlt))
+				return 0;
 		}
 
 		if (wParam != VK_RIGHT && wParam != VK_LEFT) {
-- 
cgit v1.2.3