Add WindowProcDelegateManager for tray icon events

Introduces WindowProcDelegateManager to manage window procedure delegates in Windows platform code. TrayIcon now registers and unregisters its window procedure delegate for handling tray icon events, improving encapsulation and event management.

Author: lijy91

src/CMakeLists.txt

@@ -23,17 +23,17 @@ file(GLOB CAPI_SOURCES "capi/*.cpp" "capi/*.c")
 
 # Platform-specific source files
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    file(GLOB PLATFORM_SOURCES "platform/linux/*_linux.cpp")
+    file(GLOB PLATFORM_SOURCES "platform/linux/*.cpp")
     # Find packages for Linux
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
     pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
     pkg_check_modules(XI REQUIRED IMPORTED_TARGET xi)
     pkg_check_modules(AYATANA_APPINDICATOR REQUIRED IMPORTED_TARGET ayatana-appindicator3-0.1)
 elseif(APPLE)
-    file(GLOB PLATFORM_SOURCES "platform/macos/*_macos.mm")
+    file(GLOB PLATFORM_SOURCES "platform/macos/*.mm")
 elseif(WIN32)
-    file(GLOB PLATFORM_SOURCES "platform/windows/*_windows.cpp")
+    file(GLOB PLATFORM_SOURCES "platform/windows/*.cpp")
 else()
     set(PLATFORM_SOURCES "")
 endif()

src/platform/windows/tray_icon_windows.cpp

@@ -1,5 +1,7 @@
+// clang-format off
 #include <windows.h>
 #include <shellapi.h>
+// clang-format on
 #include <memory>
 #include <string>
 
@@ -10,6 +12,7 @@
 #include "../../tray_icon.h"
 #include "../../tray_icon_event.h"
 #include "string_utils_windows.h"
+#include "window_proc_delegate_manager.h"
 
 namespace nativeapi {
 
@@ -36,8 +39,14 @@ class TrayIcon::Impl {
     nid_.uID = icon_id_;
     nid_.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
     nid_.uCallbackMessage = WM_USER + 1;  // Custom message for tray icon events
+
+    window_proc_id_ = WindowProcDelegateManager::GetInstance().RegisterDelegate(
+        [this](HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) {
+          return HandleWindowProc(hwnd, message, wparam, lparam);
+        });
   }
 
+
   // Windows-specific method to set internal data
   void SetWindowsData(HWND hwnd, UINT icon_id) {
     hwnd_ = hwnd;
@@ -91,6 +100,7 @@ class TrayIcon::Impl {
   }
 
   ~Impl() {
+    WindowProcDelegateManager::GetInstance().UnregisterDelegate(window_proc_id_);
     if (hwnd_) {
       Shell_NotifyIconW(NIM_DELETE, &nid_);
     }
@@ -99,6 +109,16 @@ class TrayIcon::Impl {
     }
   }
 
+  // Handle window procedure delegate
+  std::optional<LRESULT> HandleWindowProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) {
+    if (message == WM_USER + 1 && wparam == icon_id_) {
+      // This is handled by HandleWindowsMessage, but we need to return a value
+      return 0;
+    }
+    return std::nullopt; // Let default window procedure handle it
+  }
+
+  int window_proc_id_;
   HWND hwnd_;
   UINT icon_id_;
   NOTIFYICONDATAW nid_;

src/platform/windows/window_proc_delegate_manager.cpp

@@ -0,0 +1,38 @@
+#include "window_proc_delegate_manager.h"
+
+namespace nativeapi {
+
+WindowProcDelegateManager& WindowProcDelegateManager::GetInstance() {
+  static WindowProcDelegateManager instance;
+  return instance;
+}
+
+int WindowProcDelegateManager::RegisterDelegate(WindowProcDelegate delegate) {
+  if (!delegate) {
+    return -1;
+  }
+
+  std::lock_guard<std::mutex> lock(mutex_);
+
+  int id = next_id_++;
+  delegates_[id] = std::move(delegate);
+  return id;
+}
+
+bool WindowProcDelegateManager::UnregisterDelegate(int id) {
+  if (id < 0) {
+    return false;
+  }
+
+  std::lock_guard<std::mutex> lock(mutex_);
+
+  auto it = delegates_.find(id);
+  if (it != delegates_.end()) {
+    delegates_.erase(it);
+    return true;
+  }
+
+  return false;
+}
+
+}  // namespace nativeapi

src/platform/windows/window_proc_delegate_manager.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include <windows.h>
+#include <functional>
+#include <mutex>
+#include <optional>
+#include <unordered_map>
+
+namespace nativeapi {
+
+using WindowProcDelegate =
+    std::function<std::optional<LRESULT>(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)>;
+
+class WindowProcDelegateManager {
+ public:
+  // Get the singleton instance
+  static WindowProcDelegateManager& GetInstance();
+
+  // Register a delegate
+  // Returns a unique ID if registration was successful, -1 if failed
+  int RegisterDelegate(WindowProcDelegate delegate);
+
+  // Unregister the delegate by ID
+  // Returns true if a delegate was found and removed, false if no delegate was
+  // found
+  bool UnregisterDelegate(int id);
+
+ private:
+  mutable std::mutex mutex_;
+  std::unordered_map<int, WindowProcDelegate> delegates_;
+  int next_id_ = 1;
+};
+
+}  // namespace nativeapi