🛠️ Remove interger calculations, only comparing sorted sets.

Author: Neurs

HotkeysLoad.cs

@@ -11,21 +11,21 @@ internal partial class HotkeysLoad
         private static readonly List<IntPtr> yeetedWindows = [];
         private static readonly List<IntPtr> enumWindowsResult = [];
 
-        private static readonly List<int> modifierKeys = [
-            (int)VirtualKey.LeftControl,
-            (int)VirtualKey.RightControl,
-            (int)VirtualKey.Control,
-            (int)VirtualKey.LeftShift,
-            (int)VirtualKey.RightShift,
-            (int)VirtualKey.Shift,
-            (int)VirtualKey.LeftMenu,
-            (int)VirtualKey.RightMenu,
-            (int)VirtualKey.Menu,
-            (int)VirtualKey.LeftWindows,
-            (int)VirtualKey.RightWindows];
-
-        private static readonly HashSet<int> currentKeys = [];
-        private static readonly List<int> assignedHotkeys = [];
+        private static readonly List<VirtualKey> modifierKeys = [
+            VirtualKey.LeftControl,
+            VirtualKey.RightControl,
+            VirtualKey.Control,
+            VirtualKey.LeftShift,
+            VirtualKey.RightShift,
+            VirtualKey.Shift,
+            VirtualKey.LeftMenu,
+            VirtualKey.RightMenu,
+            VirtualKey.Menu,
+            VirtualKey.LeftWindows,
+            VirtualKey.RightWindows];
+
+        private static readonly SortedSet<VirtualKey> currentKeys = [];
+        private static readonly List<SortedSet<VirtualKey>> assignedHotkeys = [];
         private static HotkeyEvent pointedEvent = delegate { };
 
         public delegate void HotkeyEvent(int Id);
@@ -39,19 +39,17 @@ public static void RegisterHotkeys(HotkeyEvent hotkeyEvent)
             KeyboardHookHandler.SetupHook(DownKeyEvent, UpKeyEvent);
         }
 
-        private static bool DownKeyEvent(int key)
+        private static bool DownKeyEvent(VirtualKey key)
         {
-            int index = assignedHotkeys.IndexOf(key);
+            int index = assignedHotkeys.FindIndex(set => set.SetEquals([key]));
             if (index != -1 && !currentKeys.Intersect(modifierKeys).Any())
             {
                 pointedEvent(index);
                 return true;
             }
 
             currentKeys.Add(key);
-
-            int combined = currentKeys.Sum();
-            index = assignedHotkeys.IndexOf(combined);
+            index = assignedHotkeys.FindIndex(set => set.SetEquals(currentKeys));
 
             if (index != -1)
             {
@@ -62,7 +60,7 @@ private static bool DownKeyEvent(int key)
             return false;
         }
 
-        private static bool UpKeyEvent(int key)
+        private static bool UpKeyEvent(VirtualKey key)
         {
             currentKeys.Remove(key);
             return false;
@@ -140,10 +138,10 @@ private static void ConfigParse()
         }
         private static void InitHotkey(string name, JObject config)
         {
-            int hotkey = 0;
+            SortedSet<VirtualKey> hotkey = [];
             foreach (string? key in config[name]!.Select(v => (string?)v))
             {
-                hotkey += (int)Enum.Parse<VirtualKey>(key!);
+                hotkey.Add(Enum.Parse<VirtualKey>(key!));
             }
 
             assignedHotkeys.Add(hotkey);

KeyboardHookHandler.cs

@@ -33,7 +33,7 @@ public static void RemoveHook()
             UnhookWindowsHookEx(_hookID);
         }
 
-        public delegate bool KeyCallbackEvent(int key);
+        public delegate bool KeyCallbackEvent(VirtualKey key);
 
         public delegate IntPtr LowLevelKeyboardProc(
         int nCode, IntPtr wParam, IntPtr lParam);
@@ -47,11 +47,11 @@ private static IntPtr HookCallback(
             {
                 if (wParam == WM_KEYDOWN)
                 {
-                    res = keydownEvent(Marshal.ReadInt32(lParam));
+                    res = keydownEvent((VirtualKey)Marshal.ReadInt32(lParam));
                 }
                 if (wParam == WM_KEYUP)
                 {
-                    res = keyupEvent(Marshal.ReadInt32(lParam));
+                    res = keyupEvent((VirtualKey)Marshal.ReadInt32(lParam));
                 }
             }
             return res ? 1 : CallNextHookEx(_hookID, nCode, wParam, lParam);