Support the use of Windows key & four-combination hotkey

Flow.Launcher.Infrastructure/DialogJump/DialogJump.cs

@@ -9,7 +9,7 @@
 using Flow.Launcher.Infrastructure.DialogJump.Models;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using NHotkey;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.UI.Accessibility;
@@ -162,22 +162,22 @@
                 }
                 if (!_locationChangeHook.IsNull)
                 {
                     PInvoke.UnhookWinEvent(_locationChangeHook);
                     _locationChangeHook = HWINEVENTHOOK.Null;
                 }
                 if (!_destroyChangeHook.IsNull)
                 {
                     PInvoke.UnhookWinEvent(_destroyChangeHook);
                     _destroyChangeHook = HWINEVENTHOOK.Null;
                 }
                 if (!_hideChangeHook.IsNull)
                 {
                     PInvoke.UnhookWinEvent(_hideChangeHook);
                     _hideChangeHook = HWINEVENTHOOK.Null;
                 }
                 if (!_dialogEndChangeHook.IsNull)
                 {
                     PInvoke.UnhookWinEvent(_dialogEndChangeHook);
                     _dialogEndChangeHook = HWINEVENTHOOK.Null;
                 }
 
@@ -318,7 +318,7 @@
                         if (API.PluginModified(explorer.Metadata.ID) || // Plugin is modified
                             explorer.Metadata.Disabled) continue; // Plugin is disabled
 
                         var explorerWindow = explorer.Plugin.CheckExplorerWindow(hWnd);
                         if (explorerWindow != null)
                         {
                             _dialogJumpExplorers[explorer] = explorerWindow;
@@ -455,7 +455,7 @@
 
         #region Hotkey
 
-        public static void OnToggleHotkey(object sender, HotkeyEventArgs args)
+        public static void ToggleHotkey()
         {
             _ = Task.Run(async () =>
             {

Flow.Launcher.Infrastructure/Hotkey/GlobalHotkey.cs

@@ -37,25 +37,53 @@
         public static SpecialKeyState CheckModifiers()
         {
             SpecialKeyState state = new SpecialKeyState();
-            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_SHIFT) & 0x8000) != 0)
+            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_LSHIFT) & 0x8000) != 0)
             {
                 //SHIFT is pressed
+                state.LeftShiftPressed = true;
                 state.ShiftPressed = true;
             }
-            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_CONTROL) & 0x8000) != 0)
+            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_RSHIFT) & 0x8000) != 0)
+            {
+                //SHIFT is pressed
+                state.RightShiftPressed = true;
+                state.ShiftPressed = true;
+            }
+
+            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_LCONTROL) & 0x8000) != 0)
+            {
+                //CONTROL is pressed
+                state.LeftCtrlPressed = true;
+                state.CtrlPressed = true;
+            }
+            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_RCONTROL) & 0x8000) != 0)
             {
                 //CONTROL is pressed
+                state.RightCtrlPressed = true;
                 state.CtrlPressed = true;
             }
-            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_MENU) & 0x8000) != 0)
+            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_LMENU) & 0x8000) != 0)
             {
                 //ALT is pressed
+                state.LeftAltPressed = true;
                 state.AltPressed = true;
             }
-            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_LWIN) & 0x8000) != 0 ||
-                (PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_RWIN) & 0x8000) != 0)
+            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_RMENU) & 0x8000) != 0)
+            {
+                //ALT is pressed
+                state.RightAltPressed = true;
+                state.AltPressed = true;
+            }
+            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_LWIN) & 0x8000) != 0)
+            {
+                //WIN is pressed
+                state.LWinPressed = true;
+                state.WinPressed = true;
+            }
+            if ((PInvoke.GetKeyState((int)VIRTUAL_KEY.VK_RWIN) & 0x8000) != 0)
             {
                 //WIN is pressed
+                state.RWinPressed = true;
                 state.WinPressed = true;
             }