windows/QuickLook
1
0
Fork 0
mirror of https://github.com/QL-Win/QuickLook.git synced 2026-02-28 01:00:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code Cleanup

Browse Source
This commit is contained in:
ema
2024-12-30 15:23:18 +08:00
parent 82987b0848
commit d96c6e21ce
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
QuickLook/Helpers/GlobalKeyboardHook.cs
View File

@@ -29,7 +29,7 @@ internal class GlobalKeyboardHook : IDisposable
private static GlobalKeyboardHook _instance;
private User32.KeyboardHookProc _callback;
private IntPtr _hhook = IntPtr.Zero;
private nint _hHook = IntPtr.Zero;
protected GlobalKeyboardHook()
{
@@ -49,7 +49,7 @@ internal class GlobalKeyboardHook : IDisposable
internal static GlobalKeyboardHook GetInstance()
{
return _instance ?? (_instance = new GlobalKeyboardHook());
return _instance ??= new GlobalKeyboardHook();
}
private void Hook()
@@ -57,14 +57,14 @@ internal class GlobalKeyboardHook : IDisposable
_callback = HookProc;
var hInstance = Kernel32.LoadLibrary("user32.dll");
_hhook = User32.SetWindowsHookEx(User32.WH_KEYBOARD_LL, _callback, hInstance, 0);
_hHook = User32.SetWindowsHookEx(User32.WH_KEYBOARD_LL, _callback, hInstance, 0);
}
private void Unhook()
{
if (_callback == null) return;
User32.UnhookWindowsHookEx(_hhook);
User32.UnhookWindowsHookEx(_hHook);
_callback = null;
}
@@ -72,10 +72,10 @@ internal class GlobalKeyboardHook : IDisposable
private int HookProc(int code, int wParam, ref User32.KeyboardHookStruct lParam)
{
if (code < 0)
return User32.CallNextHookEx(_hhook, code, wParam, ref lParam);
return User32.CallNextHookEx(_hHook, code, wParam, ref lParam);
if (IsWindowsKeyPressed())
return User32.CallNextHookEx(_hhook, code, wParam, ref lParam);
return User32.CallNextHookEx(_hHook, code, wParam, ref lParam);
var key = (Keys)lParam.vkCode;
key = AddModifiers(key);
@@ -87,7 +87,7 @@ internal class GlobalKeyboardHook : IDisposable
else if (wParam == User32.WM_KEYUP || wParam == User32.WM_SYSKEYUP)
KeyUp?.Invoke(this, kea);
return kea.Handled ? 1 : User32.CallNextHookEx(_hhook, code, wParam, ref lParam);
return kea.Handled ? 1 : User32.CallNextHookEx(_hHook, code, wParam, ref lParam);
}
private bool IsWindowsKeyPressed()

8
QuickLook/KeystrokeDispatcher.cs
View File

@@ -43,11 +43,11 @@ internal class KeystrokeDispatcher : IDisposable
{
InstallKeyHook(KeyDownEventHandler, KeyUpEventHandler);
_validKeys = new HashSet<Keys>(new[]
{
_validKeys = new HashSet<Keys>(
[
Keys.Up, Keys.Down, Keys.Left, Keys.Right,
Keys.Enter, Keys.Space, Keys.Escape
});
]);
}
public void Dispose()
@@ -169,6 +169,6 @@ internal class KeystrokeDispatcher : IDisposable
internal static KeystrokeDispatcher GetInstance()
{
return _instance ?? (_instance = new KeystrokeDispatcher());
return _instance ??= new KeystrokeDispatcher();
}
}