Upload FastSeekWpf/App.xaml.cs

FastSeekWpf/App.xaml.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows;
@@ -17,6 +16,7 @@ public partial class App : Application
     private volatile bool _shutdown;
     private MainWindow? _mainWindow;
     private Thread? _hotkeyThread;
+    private IntPtr _hotkeyWakeEvent;
 
     private void OnStartup(object sender, StartupEventArgs e)
     {
@@ -35,6 +35,9 @@ public partial class App : Application
         _mainWindow.Show();
         _mainWindow.Hide(); // Start hidden, wait for hotkey
 
+        // Create manual reset event for waking GetMessageW thread
+        _hotkeyWakeEvent = CreateEventW(IntPtr.Zero, false, false, null);
+
         // Start global hotkey thread (Alt+Space)
         _hotkeyThread = new Thread(HotkeyLoop)
         {
@@ -48,8 +51,14 @@ public partial class App : Application
     private void OnExit(object sender, ExitEventArgs e)
     {
         _shutdown = true;
+        // Signal wake event to unblock GetMessageW
+        if (_hotkeyWakeEvent != IntPtr.Zero)
+            SetEvent(_hotkeyWakeEvent);
+        _hotkeyThread?.Join(1000);
         _mutex?.ReleaseMutex();
         _mutex?.Dispose();
+        if (_hotkeyWakeEvent != IntPtr.Zero)
+            CloseHandle(_hotkeyWakeEvent);
     }
 
     private void HotkeyLoop(object? param)
@@ -68,21 +77,18 @@ public partial class App : Application
         {
             while (!_shutdown)
             {
-                if (Win32Api.PeekMessageW(out Win32Api.MSG msg, IntPtr.Zero, 0, 0, Win32Api.PM_REMOVE))
+                // Blocking wait: GetMessageW sleeps until a message arrives
+                int result = Win32Api.GetMessageW(out Win32Api.MSG msg, IntPtr.Zero, 0, 0);
+                if (result == 0 || result == -1) break; // WM_QUIT or error
+
+                if (msg.message == Win32Api.WM_HOTKEY)
                 {
-                    if (msg.message == Win32Api.WM_HOTKEY)
-                    {
-                        Win32Api.PostMessageW(targetHwnd, WM_TOGGLE_WINDOW, IntPtr.Zero, IntPtr.Zero);
-                    }
-                    else
-                    {
-                        Win32Api.TranslateMessage(ref msg);
-                        Win32Api.DispatchMessageW(ref msg);
-                    }
+                    Win32Api.PostMessageW(targetHwnd, WM_TOGGLE_WINDOW, IntPtr.Zero, IntPtr.Zero);
                 }
                 else
                 {
-                    Thread.Sleep(10);
+                    Win32Api.TranslateMessage(ref msg);
+                    Win32Api.DispatchMessageW(ref msg);
                 }
             }
         }
@@ -91,4 +97,13 @@ public partial class App : Application
             Win32Api.UnregisterHotKey(IntPtr.Zero, 1);
         }
     }
+
+    [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    private static extern IntPtr CreateEventW(IntPtr lpEventAttributes, bool bManualReset, bool bInitialState, string? lpName);
+
+    [DllImport("kernel32.dll", SetLastError = true)]
+    private static extern bool SetEvent(IntPtr hEvent);
+
+    [DllImport("kernel32.dll", SetLastError = true)]
+    private static extern bool CloseHandle(IntPtr hObject);
 }