#37 优化屏幕锁定时按键拦截机制

Author: zd

src/ComputerLock/Platforms/SystemKeyHook.cs

@@ -6,7 +6,7 @@ namespace ComputerLock.Platforms;
 /// </summary>
 internal class SystemKeyHook : WindowsInputHook
 {
-    private Hotkey? _ignoreHotkey; // 使用单个Hotkey变量来存储需要忽略的快捷键
+    private Hotkey? _ignoreHotkey;   // 使用单个Hotkey变量来存储需要忽略的快捷键
 
     protected override int HookType => WinApi.WH_KEYBOARD_LL;
 
@@ -19,98 +19,73 @@ public void SetIgnoreHotkey(Hotkey? hotKey)
 
     protected override int HookCallback(int nCode, int wParam, IntPtr lParam)
     {
-        if (nCode >= 0)
+        if (nCode < 0 || !(wParam == WinApi.WM_KEYDOWN || wParam == WinApi.WM_SYSKEYDOWN))
         {
-            int vkCode = Marshal.ReadInt32(lParam);
+            return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);
+        }
 
-            // 仅在按下阶段进行拦截判断；抬起阶段放行避免影响 WM_HOTKEY 触发
-            if (!(wParam == WinApi.WM_KEYDOWN || wParam == WinApi.WM_SYSKEYDOWN))
-            {
-                return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);
-            }
+        int vkCode = Marshal.ReadInt32(lParam);
 
-            if (_ignoreHotkey == null)
-            {
-                if (IsSystemKey(vkCode))
-                {
-                    OnUserInput?.Invoke(this, EventArgs.Empty);
-                    return 1; // 阻止事件传递
-                }
-                return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam); // 其他按键放行
-            }
-
-            // 属于需要放行的热键组成部分（修饰键或主键）则放行
-            if (IsPartOfIgnoreHotkey(vkCode))
+        if (_ignoreHotkey == null)
+        {
+            if (IsBlockedSystemKey(vkCode))
             {
-                return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);
+                OnUserInput?.Invoke(this, EventArgs.Empty);
+                return 1;
             }
 
-            // 拦截非必要修饰键
-            if (IsModifierKey(vkCode) && !IsModifierRequired(vkCode))
-            {
-                return 1; // 阻止事件传递
-            }
+            return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);
+        }
 
-            // 不是忽略热键
-            if (vkCode != (int)_ignoreHotkey.Key)
-            {
-                return 1; // 阻止事件传递
-            }
+        if (IsPartOfIgnoreHotkey(vkCode))
+        {
+            return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);
         }
-        return WinApi.CallNextHookEx(_hookId, nCode, wParam, lParam);
-    }
 
-    private bool IsSystemKey(int vkCode)
-    {
-        return vkCode == WinApi.VK_LWIN || vkCode == WinApi.VK_RWIN ||
-               vkCode == WinApi.VK_LSHIFT || vkCode == WinApi.VK_RSHIFT ||
-               vkCode == WinApi.VK_LCONTROL || vkCode == WinApi.VK_RCONTROL ||
-               vkCode == WinApi.VK_TAB;
+        OnUserInput?.Invoke(this, EventArgs.Empty);
+        return 1;
     }
 
+    #region 快捷键辅助方法
+
     private bool IsPartOfIgnoreHotkey(int vkCode)
     {
-        bool isPartOfIgnoreHotkey = false;
+        bool isPart = false;
+
         if (_ignoreHotkey!.Modifiers.HasFlag(HotkeyModifiers.Control))
         {
-            isPartOfIgnoreHotkey |= (vkCode == WinApi.VK_LCONTROL || vkCode == WinApi.VK_RCONTROL);
+            isPart |= (vkCode == WinApi.VK_LCONTROL || vkCode == WinApi.VK_RCONTROL);
         }
 
         if (_ignoreHotkey.Modifiers.HasFlag(HotkeyModifiers.Shift))
         {
-            isPartOfIgnoreHotkey |= (vkCode == WinApi.VK_LSHIFT || vkCode == WinApi.VK_RSHIFT);
+            isPart |= (vkCode == WinApi.VK_LSHIFT || vkCode == WinApi.VK_RSHIFT);
         }
 
         if (_ignoreHotkey.Modifiers.HasFlag(HotkeyModifiers.Alt))
         {
-            isPartOfIgnoreHotkey |= (vkCode == WinApi.VK_LMENU || vkCode == WinApi.VK_RMENU);
+            isPart |= (vkCode == WinApi.VK_LMENU || vkCode == WinApi.VK_RMENU);
         }
 
-        isPartOfIgnoreHotkey |= (vkCode == (int)_ignoreHotkey.Key);
-        return isPartOfIgnoreHotkey;
-    }
+        isPart |= (vkCode == (int)_ignoreHotkey.Key);
 
-    private bool IsModifierKey(int vkCode)
-    {
-        return vkCode == WinApi.VK_LCONTROL || vkCode == WinApi.VK_RCONTROL ||
-               vkCode == WinApi.VK_LSHIFT || vkCode == WinApi.VK_RSHIFT ||
-               vkCode == WinApi.VK_LMENU || vkCode == WinApi.VK_RMENU;
+        return isPart;
     }
 
-    private bool IsModifierRequired(int vkCode)
+    #endregion
+
+    #region 密码解锁辅助方法
+
+    /// <summary>
+    /// 拦截单独的系统键
+    /// </summary>
+    private bool IsBlockedSystemKey(int vkCode)
     {
-        if (vkCode == WinApi.VK_LCONTROL || vkCode == WinApi.VK_RCONTROL)
-        {
-            return _ignoreHotkey!.Modifiers.HasFlag(HotkeyModifiers.Control);
-        }
-        if (vkCode == WinApi.VK_LSHIFT || vkCode == WinApi.VK_RSHIFT)
-        {
-            return _ignoreHotkey!.Modifiers.HasFlag(HotkeyModifiers.Shift);
-        }
-        if (vkCode == WinApi.VK_LMENU || vkCode == WinApi.VK_RMENU)
-        {
-            return _ignoreHotkey!.Modifiers.HasFlag(HotkeyModifiers.Alt);
-        }
-        return false;
+        return vkCode == WinApi.VK_LWIN || vkCode == WinApi.VK_RWIN || // Win键
+               vkCode == WinApi.VK_LCONTROL || vkCode == WinApi.VK_RCONTROL || // Ctrl
+               vkCode == WinApi.VK_LSHIFT || vkCode == WinApi.VK_RSHIFT || // Shift
+               vkCode == WinApi.VK_LMENU || vkCode == WinApi.VK_RMENU || // Alt
+               vkCode == WinApi.VK_TAB;                                  // Tab
     }
-}
+    #endregion
+}