Enhance GPU state management and tray icon setup

Refactor GPU detection and tray icon initialization.

Author: Tiflit

src/main.cpp

@@ -15,25 +15,54 @@ extern "C" {
     __declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 1;
 }
 
-// Global GPU state (used by win_helpers.cpp)
+// Global GPU states
 GpuState g_displayGpuState;
 GpuState g_renderGpuState;
 
+bool g_forceRenderGpu = true;   // User toggle
 HINSTANCE g_hInst = nullptr;
 
+void RefreshGpuState(HWND hwnd)
+{
+    DetectDisplayGPU(g_displayGpuState);
+
+    if (g_forceRenderGpu)
+        DetectRenderGPU(g_renderGpuState);
+    else
+        g_renderGpuState = {}; // Clear render GPU
+
+    // Choose active GPU
+    UINT activeVendor = (g_renderGpuState.vendor != 0)
+                        ? g_renderGpuState.vendor
+                        : g_displayGpuState.vendor;
+
+    HICON icon = LoadDisplayIcon(activeVendor, g_hInst);
+
+    NOTIFYICONDATAW nid = {};
+    nid.cbSize = sizeof(nid);
+    nid.hWnd   = hwnd;
+    nid.uID    = TRAY_ID;
+    nid.uFlags = NIF_ICON | NIF_TIP | NIF_SHOWTIP;
+    nid.hIcon  = icon;
+
+    std::wstring tip = BuildGpuTooltip(g_displayGpuState, g_renderGpuState);
+    wcsncpy_s(nid.szTip, tip.c_str(), _TRUNCATE);
+
+    Shell_NotifyIconW(NIM_MODIFY, &nid);
+}
+
 int WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR, int)
 {
     g_hInst = hInst;
 
-    // Prevent multiple instances
     HANDLE hMutex = CreateMutexW(nullptr, TRUE, L"GPUSwitcherMutex");
     if (GetLastError() == ERROR_ALREADY_EXISTS)
     {
         CloseHandle(hMutex);
         return 0;
     }
 
-    // Register hidden window class
+    // Register hidden window
     WNDCLASSW wc = {};
     wc.lpfnWndProc   = WndProc;
     wc.hInstance     = hInst;
@@ -49,33 +78,20 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR, int)
         nullptr, nullptr, hInst, nullptr
     );
 
-    // Detect GPUs
-    DetectDisplayGPU(g_displayGpuState);
-    DetectRenderGPU(g_renderGpuState);
-
-    // Choose active GPU for icon: prefer render GPU, fallback to display GPU
-    UINT activeVendor = (g_renderGpuState.vendor != 0)
-                        ? g_renderGpuState.vendor
-                        : g_displayGpuState.vendor;
-
-    HICON icon = LoadDisplayIcon(activeVendor, g_hInst);
-
-    // Build tooltip with both GPUs
-    std::wstring tip = BuildGpuTooltip(g_displayGpuState, g_renderGpuState);
-
-    // Add tray icon
+    // Add tray icon (temporary)
     NOTIFYICONDATAW nid = {};
     nid.cbSize           = sizeof(nid);
     nid.hWnd             = hwnd;
     nid.uID              = TRAY_ID;
     nid.uFlags           = NIF_ICON | NIF_MESSAGE | NIF_TIP | NIF_SHOWTIP;
     nid.uCallbackMessage = WM_TRAY;
-    nid.hIcon            = icon;
-
-    wcsncpy_s(nid.szTip, tip.c_str(), _TRUNCATE);
-
+    nid.hIcon            = LoadIconW(nullptr, IDI_APPLICATION);
+    wcscpy_s(nid.szTip, L"Initializing GPU detection...");
     Shell_NotifyIconW(NIM_ADD, &nid);
 
+    // Delay detection by 1 second
+    SetTimer(hwnd, 1, 1000, nullptr);
+
     // Message loop
     MSG msg;
     while (GetMessageW(&msg, nullptr, 0, 0))