Refactor menu ID generation to use IdAllocator

Replaces platform-specific atomic ID generators and registries with a unified IdAllocator for Menu and MenuItem objects across Linux, macOS, and Windows. Simplifies event emission by passing direct object pointers instead of registry lookups. This change improves consistency and maintainability of menu ID management.

Author: lijy91

src/menu.h

@@ -8,15 +8,16 @@
 #include "foundation/event.h"
 #include "foundation/event_emitter.h"
 #include "foundation/geometry.h"
+#include "foundation/id_allocator.h"
 #include "foundation/native_object_provider.h"
 #include "menu_event.h"
 
 namespace nativeapi {
 
 class Image;
 
-typedef long MenuId;
-typedef long MenuItemId;
+typedef IdAllocator::IdType MenuId;
+typedef IdAllocator::IdType MenuItemId;
 
 /**
  * @brief Enumeration of different menu item types.

src/menu_event.h

@@ -3,12 +3,13 @@
 #include <string>
 
 #include "foundation/event.h"
+#include "foundation/id_allocator.h"
 
 namespace nativeapi {
 
 // Forward declarations for menu types
-typedef long MenuId;
-typedef long MenuItemId;
+typedef IdAllocator::IdType MenuId;
+typedef IdAllocator::IdType MenuItemId;
 
 /**
  * @brief Menu opened event.

src/platform/linux/menu_linux.cpp

@@ -1,82 +1,63 @@
 #include <gtk/gtk.h>
 #include <algorithm>
-#include <atomic>
 #include <cctype>
 #include <iostream>
 #include <memory>
 #include <optional>
 #include <string>
-#include <unordered_map>
 #include <vector>
+#include "../../foundation/id_allocator.h"
 #include "../../image.h"
 #include "../../menu.h"
 #include "../../menu_event.h"
 
 namespace nativeapi {
 
-// Global ID generators
-static std::atomic<MenuItemId> g_next_menu_item_id{1};
-static std::atomic<MenuId> g_next_menu_id{1};
-
-// Global registry to map native objects to C++ objects for event emission
-static std::unordered_map<MenuItemId, MenuItem*> g_menu_item_registry;
-static std::unordered_map<MenuId, Menu*> g_menu_registry;
-
 // GTK signal handlers → Event emission
 static void OnGtkMenuItemActivate(GtkMenuItem* /*item*/, gpointer user_data) {
-  MenuItemId item_id = static_cast<MenuItemId>(GPOINTER_TO_SIZE(user_data));
-  auto it = g_menu_item_registry.find(item_id);
-  if (it == g_menu_item_registry.end()) {
+  MenuItem* menu_item = static_cast<MenuItem*>(user_data);
+  if (!menu_item) {
     return;
   }
-  MenuItem* menu_item = it->second;
   std::string text = "";
   if (auto label = menu_item->GetLabel(); label.has_value()) {
     text = *label;
   }
-  menu_item->EmitSync(MenuItemClickedEvent(item_id, text));
+  menu_item->EmitSync(MenuItemClickedEvent(menu_item->id, text));
 }
 
 static void OnGtkMenuShow(GtkWidget* /*menu*/, gpointer user_data) {
-  MenuId menu_id = static_cast<MenuId>(GPOINTER_TO_SIZE(user_data));
-  auto it = g_menu_registry.find(menu_id);
-  if (it == g_menu_registry.end()) {
+  Menu* menu_obj = static_cast<Menu*>(user_data);
+  if (!menu_obj) {
     return;
   }
-  Menu* menu_obj = it->second;
-  menu_obj->EmitSync(MenuOpenedEvent(menu_id));
+  menu_obj->EmitSync(MenuOpenedEvent(menu_obj->id));
 }
 
 static void OnGtkMenuHide(GtkWidget* /*menu*/, gpointer user_data) {
-  MenuId menu_id = static_cast<MenuId>(GPOINTER_TO_SIZE(user_data));
-  auto it = g_menu_registry.find(menu_id);
-  if (it == g_menu_registry.end()) {
+  Menu* menu_obj = static_cast<Menu*>(user_data);
+  if (!menu_obj) {
     return;
   }
-  Menu* menu_obj = it->second;
-  menu_obj->EmitSync(MenuClosedEvent(menu_id));
+  menu_obj->EmitSync(MenuClosedEvent(menu_obj->id));
 }
 
 static void OnGtkSubmenuShow(GtkWidget* /*submenu*/, gpointer user_data) {
-  MenuItemId item_id = static_cast<MenuItemId>(GPOINTER_TO_SIZE(user_data));
-  auto it = g_menu_item_registry.find(item_id);
-  if (it == g_menu_item_registry.end()) {
+  MenuItem* menu_item = static_cast<MenuItem*>(user_data);
+  if (!menu_item) {
     return;
   }
-  MenuItem* menu_item = it->second;
   // Emit submenu opened on the item
-  menu_item->EmitSync(MenuItemSubmenuOpenedEvent(item_id));
+  menu_item->EmitSync(MenuItemSubmenuOpenedEvent(menu_item->id));
 }
 
 static void OnGtkSubmenuHide(GtkWidget* /*submenu*/, gpointer user_data) {
-  MenuItemId item_id = static_cast<MenuItemId>(GPOINTER_TO_SIZE(user_data));
-  auto it = g_menu_item_registry.find(item_id);
-  if (it == g_menu_item_registry.end()) {
+  MenuItem* menu_item = static_cast<MenuItem*>(user_data);
+  if (!menu_item) {
     return;
   }
-  MenuItem* menu_item = it->second;
   // Emit submenu closed on the item
-  menu_item->EmitSync(MenuItemSubmenuClosedEvent(item_id));
+  menu_item->EmitSync(MenuItemSubmenuClosedEvent(menu_item->id));
 }
 
 // Private implementation class for MenuItem
@@ -107,7 +88,7 @@ class MenuItem::Impl {
 };
 
 MenuItem::MenuItem(const std::string& text, MenuItemType type)
-    : id(g_next_menu_item_id++) {
+    : id(IdAllocator::Allocate<MenuItem>()) {
   GtkWidget* gtk_item = nullptr;
 
   switch (type) {
@@ -135,19 +116,15 @@ MenuItem::MenuItem(const std::string& text, MenuItemType type)
     pimpl_->title_.reset();
   }
 
-  // Register the MenuItem for event emission
-  g_menu_item_registry[id] = this;
-
   // Connect activation signal for click events (except separators)
   if (gtk_item && type != MenuItemType::Separator) {
     g_signal_connect(G_OBJECT(gtk_item), "activate",
-                     G_CALLBACK(OnGtkMenuItemActivate),
-                     GSIZE_TO_POINTER(static_cast<gsize>(id)));
+                     G_CALLBACK(OnGtkMenuItemActivate), this);
   }
 }
 
 MenuItem::MenuItem(void* menu_item)
-    : id(g_next_menu_item_id++),
+    : id(IdAllocator::Allocate<MenuItem>()),
       pimpl_(new Impl((GtkWidget*)menu_item, MenuItemType::Normal)) {
   if (pimpl_->gtk_menu_item_ && pimpl_->type_ != MenuItemType::Separator) {
     const char* label =
@@ -158,18 +135,14 @@ MenuItem::MenuItem(void* menu_item)
       pimpl_->title_.reset();
     }
   }
-  g_menu_item_registry[id] = this;
 
   if (pimpl_->gtk_menu_item_) {
     g_signal_connect(G_OBJECT(pimpl_->gtk_menu_item_), "activate",
-                     G_CALLBACK(OnGtkMenuItemActivate),
-                     GSIZE_TO_POINTER(static_cast<gsize>(id)));
+                     G_CALLBACK(OnGtkMenuItemActivate), this);
   }
 }
 
-MenuItem::~MenuItem() {
-  g_menu_item_registry.erase(id);
-}
+MenuItem::~MenuItem() {}
 
 MenuItemType MenuItem::GetType() const {
   return pimpl_->type_;
@@ -281,15 +254,14 @@ void MenuItem::SetSubmenu(std::shared_ptr<Menu> submenu) {
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(pimpl_->gtk_menu_item_),
                               (GtkWidget*)submenu->GetNativeObject());
 
-    // Emit submenu open/close events on the parent item when submenu shows/hides
+    // Emit submenu open/close events on the parent item when submenu
+    // shows/hides
     GtkWidget* submenu_widget = (GtkWidget*)submenu->GetNativeObject();
     if (submenu_widget) {
       g_signal_connect(G_OBJECT(submenu_widget), "show",
-                       G_CALLBACK(OnGtkSubmenuShow),
-                       GSIZE_TO_POINTER(static_cast<gsize>(id)));
+                       G_CALLBACK(OnGtkSubmenuShow), this);
       g_signal_connect(G_OBJECT(submenu_widget), "hide",
-                       G_CALLBACK(OnGtkSubmenuHide),
-                       GSIZE_TO_POINTER(static_cast<gsize>(id)));
+                       G_CALLBACK(OnGtkSubmenuHide), this);
     }
   }
 }
@@ -331,38 +303,28 @@ class Menu::Impl {
 };
 
 Menu::Menu()
-    : id(g_next_menu_id++),
+    : id(IdAllocator::Allocate<Menu>()),
       pimpl_(std::unique_ptr<Impl>(new Impl(gtk_menu_new()))) {
-  g_menu_registry[id] = this;
-
   // Connect menu show/hide to emit open/close events
   if (pimpl_->gtk_menu_) {
     g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "show",
-                     G_CALLBACK(OnGtkMenuShow),
-                     GSIZE_TO_POINTER(static_cast<gsize>(id)));
+                     G_CALLBACK(OnGtkMenuShow), this);
     g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "hide",
-                     G_CALLBACK(OnGtkMenuHide),
-                     GSIZE_TO_POINTER(static_cast<gsize>(id)));
+                     G_CALLBACK(OnGtkMenuHide), this);
   }
 }
 
 Menu::Menu(void* menu)
-    : id(g_next_menu_id++), pimpl_(new Impl((GtkWidget*)menu)) {
-  g_menu_registry[id] = this;
-
+    : id(IdAllocator::Allocate<Menu>()), pimpl_(new Impl((GtkWidget*)menu)) {
   if (pimpl_->gtk_menu_) {
     g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "show",
-                     G_CALLBACK(OnGtkMenuShow),
-                     GSIZE_TO_POINTER(static_cast<gsize>(id)));
+                     G_CALLBACK(OnGtkMenuShow), this);
     g_signal_connect(G_OBJECT(pimpl_->gtk_menu_), "hide",
-                     G_CALLBACK(OnGtkMenuHide),
-                     GSIZE_TO_POINTER(static_cast<gsize>(id)));
+                     G_CALLBACK(OnGtkMenuHide), this);
   }
 }
 
 Menu::~Menu() {
-  // Unregister from event registry
-  g_menu_registry.erase(id);
   if (pimpl_->gtk_menu_) {
     g_object_unref(pimpl_->gtk_menu_);
   }

src/platform/linux/tray_icon_linux.cpp

@@ -1,7 +1,7 @@
+#include <unistd.h>
 #include <iostream>
 #include <optional>
 #include <string>
-#include <unistd.h>
 
 // Platform-specific includes for Linux
 #ifdef __linux__
@@ -77,7 +77,8 @@ TrayIcon::TrayIcon(void* tray)
 
 TrayIcon::~TrayIcon() {
   if (pimpl_->app_indicator_) {
-    app_indicator_set_status(pimpl_->app_indicator_, APP_INDICATOR_STATUS_PASSIVE);
+    app_indicator_set_status(pimpl_->app_indicator_,
+                             APP_INDICATOR_STATUS_PASSIVE);
     g_object_unref(pimpl_->app_indicator_);
     pimpl_->app_indicator_ = nullptr;
   }
@@ -97,52 +98,60 @@ void TrayIcon::SetIcon(std::shared_ptr<Image> image) {
 
   // If no image provided, use default icon
   if (!image) {
-    app_indicator_set_icon_full(pimpl_->app_indicator_, "application-default-icon", "Tray Icon");
+    app_indicator_set_icon_full(pimpl_->app_indicator_,
+                                "application-default-icon", "Tray Icon");
     return;
   }
 
   // Get the native GdkPixbuf object
   GdkPixbuf* pixbuf = static_cast<GdkPixbuf*>(image->GetNativeObject());
   if (!pixbuf) {
-    app_indicator_set_icon_full(pimpl_->app_indicator_, "application-default-icon", "Tray Icon");
+    app_indicator_set_icon_full(pimpl_->app_indicator_,
+                                "application-default-icon", "Tray Icon");
     return;
   }
 
   // Create temporary PNG file
   char temp_path[] = "/tmp/tray_icon_XXXXXX";
   int fd = mkstemp(temp_path);
   if (fd == -1) {
-    app_indicator_set_icon_full(pimpl_->app_indicator_, "application-default-icon", "Tray Icon");
+    app_indicator_set_icon_full(pimpl_->app_indicator_,
+                                "application-default-icon", "Tray Icon");
     return;
   }
   close(fd);
-  
+
   // Append .png extension
   std::string png_path(temp_path);
   png_path += ".png";
-  
+
   // Save pixbuf to PNG file
   GError* error = nullptr;
-  gboolean success = gdk_pixbuf_save(pixbuf, png_path.c_str(), "png", &error, nullptr);
-  
+  gboolean success =
+      gdk_pixbuf_save(pixbuf, png_path.c_str(), "png", &error, nullptr);
+
   // Always clean up the original temporary file
   unlink(temp_path);
-  
+
   if (error) {
     g_error_free(error);
   }
-  
+
   if (success) {
     // Set the icon and schedule cleanup
     app_indicator_set_icon_full(pimpl_->app_indicator_, png_path.c_str(), "");
-    g_timeout_add(5000, [](gpointer data) -> gboolean {
-      unlink(static_cast<char*>(data));
-      g_free(data);
-      return FALSE; // Don't repeat
-    }, g_strdup(png_path.c_str()));
+    g_timeout_add(
+        5000,
+        [](gpointer data) -> gboolean {
+          unlink(static_cast<char*>(data));
+          g_free(data);
+          return FALSE;  // Don't repeat
+        },
+        g_strdup(png_path.c_str()));
   } else {
     // Fallback to default icon
-    app_indicator_set_icon_full(pimpl_->app_indicator_, "application-default-icon", "Tray Icon");
+    app_indicator_set_icon_full(pimpl_->app_indicator_,
+                                "application-default-icon", "Tray Icon");
     unlink(png_path.c_str());
   }
 }