Upload FastSeekWpf/App.xaml.cs

FastSeekWpf/App.xaml.cs

@@ -4,6 +4,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows;
 using System.Windows.Interop;
+using FastSeekWpf.Core;
 using FastSeekWpf.NativeInterop;
 
 namespace FastSeekWpf;
@@ -13,6 +14,7 @@ public partial class App : Application
     private const string MutexName = "FastSeekWpf_SingleInstance_Mutex";
     private const uint WM_TOGGLE_WINDOW = Win32Api.WM_USER + 3;
     private Mutex? _mutex;
+    private bool _ownsMutex;
     private volatile bool _shutdown;
     private MainWindow? _mainWindow;
     private Thread? _hotkeyThread;
@@ -20,25 +22,29 @@ public partial class App : Application
 
     private void OnStartup(object sender, StartupEventArgs e)
     {
+        Logger.Log("=== App startup ===");
+
         // Single-instance guard
         _mutex = new Mutex(true, MutexName, out bool createdNew);
         if (!createdNew)
         {
+            Logger.Log("Another instance is running. Sending toggle message.");
             IntPtr hwnd = Win32Api.FindWindowW(null, "FastSeek");
             if (hwnd != IntPtr.Zero)
                 Win32Api.PostMessageW(hwnd, WM_TOGGLE_WINDOW, IntPtr.Zero, IntPtr.Zero);
+            else
+                Logger.Log("Could not find existing window to toggle.");
             Shutdown();
             return;
         }
+        _ownsMutex = true;
+        Logger.Log("Mutex acquired. Starting main window.");
 
         _mainWindow = new MainWindow();
         _mainWindow.Show();
-        _mainWindow.Hide(); // Start hidden, wait for hotkey
-
-        // Create manual reset event for waking GetMessageW thread
-        _hotkeyWakeEvent = CreateEventW(IntPtr.Zero, false, false, null);
+        // DO NOT hide on startup — let the user see the window immediately
 
-        // Start global hotkey thread (Alt+Space)
+        // Start global hotkey thread (Ctrl+Shift+Space = MOD_CONTROL|MOD_SHIFT, VK_SPACE)
         _hotkeyThread = new Thread(HotkeyLoop)
         {
             IsBackground = true,
@@ -55,23 +61,32 @@ public partial class App : Application
         if (_hotkeyWakeEvent != IntPtr.Zero)
             SetEvent(_hotkeyWakeEvent);
         _hotkeyThread?.Join(1000);
-        _mutex?.ReleaseMutex();
+        if (_ownsMutex)
+            _mutex?.ReleaseMutex();
         _mutex?.Dispose();
         if (_hotkeyWakeEvent != IntPtr.Zero)
             CloseHandle(_hotkeyWakeEvent);
+        Logger.Log("=== App exit ===");
     }
 
     private void HotkeyLoop(object? param)
     {
         IntPtr targetHwnd = (IntPtr)(param ?? IntPtr.Zero);
-        if (targetHwnd == IntPtr.Zero) return;
+        if (targetHwnd == IntPtr.Zero)
+        {
+            Logger.Log("HotkeyLoop: targetHwnd is zero, exiting.");
+            return;
+        }
 
-        // Register Alt+Space (MOD_ALT=0x0001, VK_SPACE=0x20)
-        if (!Win32Api.RegisterHotKey(IntPtr.Zero, 1, 0x0001, 0x20))
+        // Register Ctrl+Shift+Space (MOD_CONTROL=0x0002, MOD_SHIFT=0x0004)
+        uint modifiers = 0x0002 | 0x0004;
+        if (!Win32Api.RegisterHotKey(IntPtr.Zero, 1, modifiers, 0x20))
         {
-            Debug.WriteLine($"RegisterHotKey failed: {Marshal.GetLastWin32Error()}");
+            int err = Marshal.GetLastWin32Error();
+            Logger.Log($"RegisterHotKey failed: error {err}. Hotkey will not work.");
             return;
         }
+        Logger.Log("Hotkey registered: Ctrl+Shift+Space");
 
         try
         {
@@ -83,6 +98,7 @@ public partial class App : Application
 
                 if (msg.message == Win32Api.WM_HOTKEY)
                 {
+                    Logger.Log("Hotkey pressed, toggling window.");
                     Win32Api.PostMessageW(targetHwnd, WM_TOGGLE_WINDOW, IntPtr.Zero, IntPtr.Zero);
                 }
                 else
@@ -95,6 +111,7 @@ public partial class App : Application
         finally
         {
             Win32Api.UnregisterHotKey(IntPtr.Zero, 1);
+            Logger.Log("Hotkey unregistered.");
         }
     }