Refactor tray icon event handling to use event listeners API

Replace legacy click callbacks with event listener system for tray
icons. Add TrayIconClickedEvent, TrayIconRightClickedEvent, and
TrayIconDoubleClickedEvent. Update C/C++ APIs and examples to use new
event types and listener functions. Remove deprecated
SetOnLeftClick/SetOnRightClick/SetOnDoubleClick methods.

Author: lijy91

examples/tray_icon_c_example/main.c

@@ -28,18 +28,20 @@ void on_menu_item_clicked(const void* event, void* user_data) {
   }
 }
 
-
-
-void on_tray_left_click(void* user_data) {
-  printf("Tray icon left clicked!\n");
+void on_tray_clicked(const void* event, void* user_data) {
+  const native_tray_icon_clicked_event_t* clicked_event = (const native_tray_icon_clicked_event_t*)event;
+  printf("Tray icon clicked! ID=%ld, Button='%s'\n", clicked_event->tray_icon_id,
+         clicked_event->button);
 }
 
-void on_tray_right_click(void* user_data) {
-  printf("Tray icon right clicked!\n");
+void on_tray_right_clicked(const void* event, void* user_data) {
+  const native_tray_icon_right_clicked_event_t* right_clicked_event = (const native_tray_icon_right_clicked_event_t*)event;
+  printf("Tray icon right clicked! ID=%ld\n", right_clicked_event->tray_icon_id);
 }
 
-void on_tray_double_click(void* user_data) {
-  printf("Tray icon double clicked!\n");
+void on_tray_double_clicked(const void* event, void* user_data) {
+  const native_tray_icon_double_clicked_event_t* double_clicked_event = (const native_tray_icon_double_clicked_event_t*)event;
+  printf("Tray icon double clicked! ID=%ld\n", double_clicked_event->tray_icon_id);
 }
 
 void on_menu_opened(const void* event, void* user_data) {
@@ -161,10 +163,10 @@ int main() {
   // Set the context menu
   native_tray_icon_set_context_menu(tray_icon, menu);
 
-  // Set up tray icon event handlers
-  native_tray_icon_set_on_left_click(tray_icon, on_tray_left_click, NULL);
-  native_tray_icon_set_on_right_click(tray_icon, on_tray_right_click, NULL);
-  native_tray_icon_set_on_double_click(tray_icon, on_tray_double_click, NULL);
+  // Set up tray icon event listeners using new API
+  native_tray_icon_add_listener(tray_icon, NATIVE_TRAY_ICON_EVENT_CLICKED, on_tray_clicked, NULL);
+  native_tray_icon_add_listener(tray_icon, NATIVE_TRAY_ICON_EVENT_RIGHT_CLICKED, on_tray_right_clicked, NULL);
+  native_tray_icon_add_listener(tray_icon, NATIVE_TRAY_ICON_EVENT_DOUBLE_CLICKED, on_tray_double_clicked, NULL);
 
   // Show the tray icon
   if (native_tray_icon_show(tray_icon)) {
@@ -203,7 +205,7 @@ int main() {
   native_tray_icon_list_free(tray_list);
 
   printf("\n=== Tray icon and menu are now active ===\n");
-  printf("- Left click the tray icon to see left click message\n");
+  printf("- Click the tray icon to see click message\n");
   printf("- Right click the tray icon to open context menu\n");
   printf("- Double click the tray icon to see double click message\n");
   printf("- Use menu items to interact with the application\n");

examples/tray_icon_example/main.cpp

@@ -6,6 +6,7 @@
 #include "../../src/tray_icon.h"
 #include "../../src/tray_manager.h"
 #include "../../src/menu.h"
+#include "../../src/tray_icon_event.h"
 
 #ifdef __APPLE__
 #import <Cocoa/Cocoa.h>
@@ -47,21 +48,24 @@ int main() {
     // Try to set a system icon (using a system-provided icon)
     trayIcon->SetIcon("NSImageNameStatusAvailable");
 
-    // Set up click handlers
-    trayIcon->SetOnLeftClick([]() {
+    // Set up event listeners
+    trayIcon->AddListener<TrayIconClickedEvent>([](const TrayIconClickedEvent& event) {
         std::cout << "*** TRAY ICON LEFT CLICKED! ***" << std::endl;
         std::cout << "This is the left click handler working!" << std::endl;
+        std::cout << "Tray icon ID: " << event.GetTrayIconId() << std::endl;
     });
 
-    trayIcon->SetOnRightClick([&trayIcon]() {
+    trayIcon->AddListener<TrayIconRightClickedEvent>([](const TrayIconRightClickedEvent& event) {
         std::cout << "*** TRAY ICON RIGHT CLICKED! ***" << std::endl;
         std::cout << "This is the right click handler working!" << std::endl;
+        std::cout << "Tray icon ID: " << event.GetTrayIconId() << std::endl;
         // Context menu will be shown automatically
     });
 
-    trayIcon->SetOnDoubleClick([]() {
+    trayIcon->AddListener<TrayIconDoubleClickedEvent>([](const TrayIconDoubleClickedEvent& event) {
         std::cout << "*** TRAY ICON DOUBLE CLICKED! ***" << std::endl;
         std::cout << "This is the double click handler working!" << std::endl;
+        std::cout << "Tray icon ID: " << event.GetTrayIconId() << std::endl;
     });
 
     // Create context menu

examples/window_example/main.cpp

@@ -14,6 +14,9 @@ using nativeapi::MenuItemSubmenuClosedEvent;
 using nativeapi::MenuItemSubmenuOpenedEvent;
 using nativeapi::MenuItemType;
 using nativeapi::TrayIcon;
+using nativeapi::TrayIconClickedEvent;
+using nativeapi::TrayIconRightClickedEvent;
+using nativeapi::TrayIconDoubleClickedEvent;
 using nativeapi::TrayManager;
 using nativeapi::Window;
 using nativeapi::WindowManager;
@@ -264,23 +267,26 @@ int main() {
     // Set the context menu to the tray icon
     tray_icon.SetContextMenu(context_menu);
 
-    // Set up click handlers
-    tray_icon.SetOnLeftClick([]() {
+    // Set up event listeners
+    tray_icon.AddListener<TrayIconClickedEvent>([](const TrayIconClickedEvent& event) {
       std::cout << "*** TRAY ICON LEFT CLICKED! ***" << std::endl;
       std::cout << "This is the left click handler working!" << std::endl;
+      std::cout << "Tray icon ID: " << event.GetTrayIconId() << std::endl;
     });
 
-    tray_icon.SetOnRightClick([&tray_icon]() {
+    tray_icon.AddListener<TrayIconRightClickedEvent>([](const TrayIconRightClickedEvent& event) {
       std::cout << "*** TRAY ICON RIGHT CLICKED! ***" << std::endl;
       std::cout << "This is the right click handler working!" << std::endl;
+      std::cout << "Tray icon ID: " << event.GetTrayIconId() << std::endl;
       // Context menu will be shown automatically on right-click
       // But we can also manually show it if needed:
       // tray_icon.ShowContextMenu();
     });
 
-    tray_icon.SetOnDoubleClick([]() {
+    tray_icon.AddListener<TrayIconDoubleClickedEvent>([](const TrayIconDoubleClickedEvent& event) {
       std::cout << "*** TRAY ICON DOUBLE CLICKED! ***" << std::endl;
       std::cout << "This is the double click handler working!" << std::endl;
+      std::cout << "Tray icon ID: " << event.GetTrayIconId() << std::endl;
     });
   } else {
     std::cerr << "Failed to create tray." << std::endl;

include/nativeapi.h

@@ -12,6 +12,7 @@
 #include "../src/keyboard_monitor.h"
 #include "../src/menu.h"
 #include "../src/tray_icon.h"
+#include "../src/tray_icon_event.h"
 #include "../src/tray_manager.h"
 #include "../src/window.h"
 #include "../src/window_event.h"

src/capi/tray_icon_c.cpp

@@ -1,23 +1,23 @@
 #include "tray_icon_c.h"
 #include "../tray_icon.h"
+#include "../tray_icon_event.h"
 #include <cstring>
 #include <map>
 #include <memory>
 
 using namespace nativeapi;
 
-// Internal structure to manage C callbacks
-struct TrayIconCallbackData {
-  native_tray_icon_left_click_callback_t left_click_callback;
-  native_tray_icon_right_click_callback_t right_click_callback;
-  native_tray_icon_double_click_callback_t double_click_callback;
-  void* left_click_user_data;
-  void* right_click_user_data;
-  void* double_click_user_data;
+// Internal structure to manage C event listeners
+struct TrayIconListenerData {
+  native_tray_icon_event_type_t event_type;
+  native_tray_icon_event_callback_t callback;
+  void* user_data;
+  size_t listener_id;
 };
 
-// Global map to store callback data
-static std::map<native_tray_icon_t, std::shared_ptr<TrayIconCallbackData>> g_tray_icon_callbacks;
+// Global maps to store listener data
+static std::map<native_tray_icon_t, std::vector<std::shared_ptr<TrayIconListenerData>>> g_tray_icon_listeners;
+static size_t g_next_listener_id = 1;
 
 // TrayIcon C API Implementation
 
@@ -43,11 +43,11 @@ native_tray_icon_t native_tray_icon_create_from_native(void* native_tray) {
 
 void native_tray_icon_destroy(native_tray_icon_t tray_icon) {
   if (!tray_icon) return;
-  
-  // Clean up callbacks
-  auto it = g_tray_icon_callbacks.find(tray_icon);
-  if (it != g_tray_icon_callbacks.end()) {
-    g_tray_icon_callbacks.erase(it);
+
+  // Clean up listeners
+  auto it = g_tray_icon_listeners.find(tray_icon);
+  if (it != g_tray_icon_listeners.end()) {
+    g_tray_icon_listeners.erase(it);
   }
 
   // Note: The actual TrayIcon object is managed by shared_ptr
@@ -215,93 +215,95 @@ bool native_tray_icon_is_visible(native_tray_icon_t tray_icon) {
   }
 }
 
-void native_tray_icon_set_on_left_click(native_tray_icon_t tray_icon, native_tray_icon_left_click_callback_t callback, void* user_data) {
-  if (!tray_icon) return;
-  
-  try {
-    auto tray_icon_ptr = static_cast<TrayIcon*>(tray_icon);
-    
-    // Get or create callback data
-    auto it = g_tray_icon_callbacks.find(tray_icon);
-    if (it == g_tray_icon_callbacks.end()) {
-      g_tray_icon_callbacks[tray_icon] = std::make_shared<TrayIconCallbackData>();
-    }
-    
-    auto callback_data = g_tray_icon_callbacks[tray_icon];
-    callback_data->left_click_callback = callback;
-    callback_data->left_click_user_data = user_data;
-    
-    if (callback) {
-      tray_icon_ptr->SetOnLeftClick([callback_data]() {
-        if (callback_data && callback_data->left_click_callback) {
-          callback_data->left_click_callback(callback_data->left_click_user_data);
-        }
-      });
-    } else {
-      tray_icon_ptr->SetOnLeftClick(nullptr);
-    }
-  } catch (...) {
-    // Ignore exceptions
-  }
-}
+int native_tray_icon_add_listener(native_tray_icon_t tray_icon, native_tray_icon_event_type_t event_type, native_tray_icon_event_callback_t callback, void* user_data) {
+  if (!tray_icon || !callback) return -1;
 
-void native_tray_icon_set_on_right_click(native_tray_icon_t tray_icon, native_tray_icon_right_click_callback_t callback, void* user_data) {
-  if (!tray_icon) return;
-  
   try {
     auto tray_icon_ptr = static_cast<TrayIcon*>(tray_icon);
-    
-    // Get or create callback data
-    auto it = g_tray_icon_callbacks.find(tray_icon);
-    if (it == g_tray_icon_callbacks.end()) {
-      g_tray_icon_callbacks[tray_icon] = std::make_shared<TrayIconCallbackData>();
-    }
-    
-    auto callback_data = g_tray_icon_callbacks[tray_icon];
-    callback_data->right_click_callback = callback;
-    callback_data->right_click_user_data = user_data;
-    
-    if (callback) {
-      tray_icon_ptr->SetOnRightClick([callback_data]() {
-        if (callback_data && callback_data->right_click_callback) {
-          callback_data->right_click_callback(callback_data->right_click_user_data);
-        }
-      });
-    } else {
-      tray_icon_ptr->SetOnRightClick(nullptr);
+
+    // Create listener data
+    auto listener_data = std::make_shared<TrayIconListenerData>();
+    listener_data->event_type = event_type;
+    listener_data->callback = callback;
+    listener_data->user_data = user_data;
+    listener_data->listener_id = g_next_listener_id++;
+
+    // Get or create listener list for this tray icon
+    auto& listeners = g_tray_icon_listeners[tray_icon];
+
+    // Add event listener based on type
+    size_t cpp_listener_id = 0;
+    switch (event_type) {
+      case NATIVE_TRAY_ICON_EVENT_CLICKED:
+        cpp_listener_id = tray_icon_ptr->AddListener<TrayIconClickedEvent>(
+          [listener_data](const TrayIconClickedEvent& event) {
+            if (listener_data && listener_data->callback) {
+              native_tray_icon_clicked_event_t c_event;
+              c_event.tray_icon_id = event.GetTrayIconId();
+              strncpy(c_event.button, event.GetButton().c_str(), sizeof(c_event.button) - 1);
+              c_event.button[sizeof(c_event.button) - 1] = '\0';
+              listener_data->callback(&c_event, listener_data->user_data);
+            }
+          });
+        break;
+
+      case NATIVE_TRAY_ICON_EVENT_RIGHT_CLICKED:
+        cpp_listener_id = tray_icon_ptr->AddListener<TrayIconRightClickedEvent>(
+          [listener_data](const TrayIconRightClickedEvent& event) {
+            if (listener_data && listener_data->callback) {
+              native_tray_icon_right_clicked_event_t c_event;
+              c_event.tray_icon_id = event.GetTrayIconId();
+              listener_data->callback(&c_event, listener_data->user_data);
+            }
+          });
+        break;
+
+      case NATIVE_TRAY_ICON_EVENT_DOUBLE_CLICKED:
+        cpp_listener_id = tray_icon_ptr->AddListener<TrayIconDoubleClickedEvent>(
+          [listener_data](const TrayIconDoubleClickedEvent& event) {
+            if (listener_data && listener_data->callback) {
+              native_tray_icon_double_clicked_event_t c_event;
+              c_event.tray_icon_id = event.GetTrayIconId();
+              listener_data->callback(&c_event, listener_data->user_data);
+            }
+          });
+        break;
+
+      default:
+        return -1;
     }
+
+    // Store the C++ listener ID in our data structure
+    listener_data->listener_id = cpp_listener_id;
+    listeners.push_back(listener_data);
+
+    return static_cast<int>(cpp_listener_id);
   } catch (...) {
-    // Ignore exceptions
+    return -1;
   }
 }
 
-void native_tray_icon_set_on_double_click(native_tray_icon_t tray_icon, native_tray_icon_double_click_callback_t callback, void* user_data) {
-  if (!tray_icon) return;
-  
+bool native_tray_icon_remove_listener(native_tray_icon_t tray_icon, int listener_id) {
+  if (!tray_icon) return false;
+
   try {
     auto tray_icon_ptr = static_cast<TrayIcon*>(tray_icon);
-    
-    // Get or create callback data
-    auto it = g_tray_icon_callbacks.find(tray_icon);
-    if (it == g_tray_icon_callbacks.end()) {
-      g_tray_icon_callbacks[tray_icon] = std::make_shared<TrayIconCallbackData>();
-    }
-    
-    auto callback_data = g_tray_icon_callbacks[tray_icon];
-    callback_data->double_click_callback = callback;
-    callback_data->double_click_user_data = user_data;
-    
-    if (callback) {
-      tray_icon_ptr->SetOnDoubleClick([callback_data]() {
-        if (callback_data && callback_data->double_click_callback) {
-          callback_data->double_click_callback(callback_data->double_click_user_data);
+
+    // Find and remove the listener
+    auto it = g_tray_icon_listeners.find(tray_icon);
+    if (it != g_tray_icon_listeners.end()) {
+      auto& listeners = it->second;
+      for (auto lit = listeners.begin(); lit != listeners.end(); ++lit) {
+        if (static_cast<int>((*lit)->listener_id) == listener_id) {
+          tray_icon_ptr->RemoveListener((*lit)->listener_id);
+          listeners.erase(lit);
+          return true;
         }
-      });
-    } else {
-      tray_icon_ptr->SetOnDoubleClick(nullptr);
+      }
     }
+    return false;
   } catch (...) {
-    // Ignore exceptions
+    return false;
   }
 }