Add One-Hand mice wheel scroll diff and merge (#2435) (7). Use WH_MOU…

…SE instead of WM_MOUSE_LL (2)
WinMerge · Oct 12, 2024 · 3c9dda6 · 3c9dda6
1 parent 28c99cc
commit 3c9dda6
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/Src/DirView.cpp b/Src/DirView.cpp
@@ -49,7 +49,7 @@
 #include "SyntaxColors.h"
 #include "Shell.h"
 #include "DirTravel.h"
-#include "LowLevelMouseHook.h"
+#include "MouseHook.h"
 #include <numeric>
 #include <functional>
 

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
@@ -64,7 +64,7 @@
 #include "RegKey.h"
 #include "Win_VersionHelper.h"
 #include "BCMenu.h"
-#include "LowLevelMouseHook.h"
+#include "MouseHook.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
@@ -945,8 +945,8 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="LowLevelMouseHook.cpp" />
     <ClCompile Include="MergeDocDiffCopy.cpp" />
+    <ClCompile Include="MouseHook.cpp" />
     <ClCompile Include="MyReBar.cpp" />
     <ClCompile Include="PropCompareWebPage.cpp" />
     <ClCompile Include="PropEditorCompareMerge.cpp" />
@@ -1448,7 +1448,7 @@
     <ClInclude Include="AboutDlg.h" />
     <ClInclude Include="BasicFlatStatusBar.h" />
     <ClInclude Include="ClipboardHistory.h" />
-    <ClInclude Include="LowLevelMouseHook.h" />
+    <ClInclude Include="MouseHook.h" />
     <ClInclude Include="MenuBar.h" />
     <ClInclude Include="Common\cio.h" />
     <ClInclude Include="Common\DebugNew.h" />

diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
@@ -738,6 +738,9 @@
     <ClCompile Include="TitleBarHelper.cpp">
       <Filter>MFCGui\Common\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="MouseHook.cpp">
+      <Filter>MFCGui\Main\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="charsets.h">
@@ -1412,6 +1415,9 @@
     <ClInclude Include="TitleBarHelper.h">
       <Filter>MFCGui\Common\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="MouseHook.h">
+      <Filter>MFCGui\Main\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\binarydiff.ico">

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
@@ -33,7 +33,7 @@
 #include "Shell.h"
 #include "SelectPluginDlg.h"
 #include "Constants.h"
-#include "LowLevelMouseHook.h"
+#include "MouseHook.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

diff --git a/Src/LowLevelMouseHook.cpp → Src/MouseHook.cpp b/Src/LowLevelMouseHook.cpp → Src/MouseHook.cpp
@@ -1,5 +1,5 @@
 #include <StdAfx.h>
-#include "LowLevelMouseHook.h"
+#include "MouseHook.h"
 
 void CALLBACK CMouseHook::TimerProc(HWND unnamedParam1, UINT unnamedParam2, UINT_PTR id, DWORD unnamedParam4HWND)
 {
@@ -8,7 +8,7 @@ void CALLBACK CMouseHook::TimerProc(HWND unnamedParam1, UINT unnamedParam2, UINT
 	m_bIgnoreRBUp = false;
 }
 
-LRESULT CALLBACK CMouseHook::LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK CMouseHook::MouseProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
 	if (nCode < 0)
 		return CallNextHookEx(m_hMouseHook, nCode, wParam, lParam);
@@ -172,7 +172,7 @@ LRESULT CALLBACK CMouseHook::LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM
 
 void CMouseHook::SetMouseHook()
 {
-	m_hMouseHook = SetWindowsHookEx(WH_MOUSE, LowLevelMouseProc, GetModuleHandle(nullptr), GetCurrentThreadId());
+	m_hMouseHook = SetWindowsHookEx(WH_MOUSE, MouseProc, GetModuleHandle(nullptr), GetCurrentThreadId());
 }
 
 void CMouseHook::UnhookMouseHook()

diff --git a/Src/LowLevelMouseHook.h → Src/MouseHook.h b/Src/LowLevelMouseHook.h → Src/MouseHook.h
@@ -5,7 +5,7 @@ class CMouseHook
 	static void UnhookMouseHook();
 	static bool IsRightWheelScrolling() { return m_bIgnoreRBUp; }
 private:
-	static LRESULT CALLBACK LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam);
+	static LRESULT CALLBACK MouseProc(int nCode, WPARAM wParam, LPARAM lParam);
 	static void CALLBACK TimerProc(HWND unnamedParam1, UINT unnamedParam2, UINT_PTR id, DWORD unnamedParam4HWND);
 	inline static HHOOK m_hMouseHook;
 	inline static bool m_bIgnoreRBUp;