From 04669d713f872e046644f19ade7eeac001fdf535 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 21 Oct 2019 18:27:13 +0300
Subject: tabSRMM: fixes problem with TAB in group chats

---
 plugins/TabSRMM/src/functions.h       | 4 ----
 plugins/TabSRMM/src/hotkeyhandler.cpp | 4 ++--
 plugins/TabSRMM/src/msgdialog.cpp     | 2 +-
 plugins/TabSRMM/src/msglog.cpp        | 4 ++--
 plugins/TabSRMM/src/msgs.h            | 1 +
 5 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'plugins/TabSRMM')

diff --git a/plugins/TabSRMM/src/functions.h b/plugins/TabSRMM/src/functions.h
index 061a885d57..dc0c9a27a8 100644
--- a/plugins/TabSRMM/src/functions.h
+++ b/plugins/TabSRMM/src/functions.h
@@ -144,10 +144,6 @@ int   TN_OptionsInitialize(WPARAM wParam, LPARAM lParam);
 int   TN_ModuleDeInit();
 void  TN_TypingMessage(MCONTACT hContact, int iMode);
 
-// hotkeys
-
-LRESULT ProcessHotkeysByMsgFilter(const CCtrlBase&, UINT msg, WPARAM wParam, LPARAM lParam);
-
 void TSAPI DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, DWORD dwIdle);
 
 /*
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index b32cf7abea..36f00dd3bb 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -68,7 +68,7 @@ static HOTKEYDESC _hotkeydescs[] = {
 	{ "tabsrmm_close_other", LPGEN("Close other tabs"), TABSRMM_HK_SECTION_GENERIC, nullptr, HOTKEYCODE(HOTKEYF_ALT | HOTKEYF_CONTROL, 'W'), 0, TABSRMM_HK_CLOSE_OTHER },
 };
 
-LRESULT ProcessHotkeysByMsgFilter(const CCtrlBase &pCtrl, UINT msg, WPARAM wParam, LPARAM lParam)
+LRESULT CMsgDialog::ProcessHotkeysByMsgFilter(const CCtrlBase &pCtrl, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	MSGFILTER mf;
 	mf.nmhdr.code = EN_MSGFILTER;
@@ -77,7 +77,7 @@ LRESULT ProcessHotkeysByMsgFilter(const CCtrlBase &pCtrl, UINT msg, WPARAM wPara
 	mf.lParam = lParam;
 	mf.wParam = wParam;
 	mf.msg = msg;
-	return SendMessage(pCtrl.GetParent()->GetHwnd(), WM_NOTIFY, 0, (LPARAM)&mf);
+	return OnFilter(&mf);
 }
 
 static INT_PTR HotkeyProcessor(WPARAM, LPARAM lParam)
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 0005e8ef3b..503ddf53cf 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1989,8 +1989,8 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 					SetFocus(m_btnOk.GetHwnd());
 				else
 					SetFocus(m_pLog->GetHwnd());
+				return 0;
 			}
-			return 0;
 		}
 
 		if (wParam != VK_RIGHT && wParam != VK_LEFT) {
diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index c358875db2..fe3b57a980 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -1120,14 +1120,14 @@ INT_PTR CLogWindow::WndProc(UINT msg, WPARAM wParam, LPARAM lParam)
 
 	case WM_SYSKEYUP:
 		if (wParam == VK_MENU) {
-			ProcessHotkeysByMsgFilter(m_rtf, msg, wParam, lParam);
+			m_pDlg.ProcessHotkeysByMsgFilter(m_rtf, msg, wParam, lParam);
 			return 0;
 		}
 		break;
 
 	case WM_SYSKEYDOWN:
 		m_pDlg.m_bkeyProcessed = false;
-		if (ProcessHotkeysByMsgFilter(m_rtf, msg, wParam, lParam)) {
+		if (m_pDlg.ProcessHotkeysByMsgFilter(m_rtf, msg, wParam, lParam)) {
 			m_pDlg.m_bkeyProcessed = true;
 			return 0;
 		}
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index f3c2323869..ab9b757df0 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -339,6 +339,7 @@ class CMsgDialog : public CSrmmBaseDialog
 	void    LoadOwnAvatar(void);
 	void    LoadSplitter(void);
 	void    PlayIncomingSound(void) const;
+	LRESULT ProcessHotkeysByMsgFilter(const CCtrlBase &pCtrl, UINT msg, WPARAM wParam, LPARAM lParam);
 	void    ReplayQueue(void);
 	void    SaveAvatarToFile(HBITMAP hbm, int isOwnPic);
 	void 	  SendHBitmapAsFile(HBITMAP hbmp) const;
-- 
cgit v1.2.3