Refactor event callback management for C API

lijy91 · lijy91 · commit 35abc5b565d9 · 2025-11-21T21:16:11.000+08:00
Renamed event callback structs, mutexes, and maps for shortcut and window managers to improve clarity and avoid naming conflicts. Updated related code to use new names and refactored event listener class names for consistency.
diff --git a/examples/shortcut_c_example/main.c b/examples/shortcut_c_example/main.c
@@ -58,8 +58,7 @@ int main(void) {
   printf("Global shortcuts are supported\n\n");
 
   // Register event callback
-  int event_callback_id =
-      native_shortcut_manager_register_event_callback(on_shortcut_event, NULL);
+  int event_callback_id = native_shortcut_manager_register_event_callback(on_shortcut_event, NULL);
   if (event_callback_id < 0) {
     printf("Failed to register event callback\n");
     return 1;
@@ -71,8 +70,8 @@ int main(void) {
   printf("Registering shortcuts...\n");
 
   // Simple registration
-  native_shortcut_t shortcut1 = native_shortcut_manager_register(
-      "Ctrl+Shift+A", on_shortcut_activated, (void*)"Shortcut 1");
+  native_shortcut_t shortcut1 =
+      native_shortcut_manager_register("Ctrl+Shift+A", on_shortcut_activated, (void*)"Shortcut 1");
 
   if (!shortcut1) {
     printf("Failed to register shortcut 1\n");
@@ -110,7 +109,7 @@ int main(void) {
   } else {
     printf("Registered shortcut 3: %s (scope: %s)\n", native_shortcut_get_accelerator(shortcut3),
            native_shortcut_get_scope(shortcut3) == NATIVE_SHORTCUT_SCOPE_GLOBAL ? "Global"
-                                                                                 : "Application");
+                                                                                : "Application");
   }
 
   printf("\n");
@@ -218,4 +217,3 @@ int main(void) {
   printf("\nDone!\n");
   return 0;
 }
-
diff --git a/src/capi/shortcut_c.cpp b/src/capi/shortcut_c.cpp
@@ -80,4 +80,3 @@ void native_shortcut_invoke(native_shortcut_t shortcut) {
     return;
   GetShortcut(shortcut)->Invoke();
 }
-
diff --git a/src/capi/shortcut_c.h b/src/capi/shortcut_c.h
@@ -112,4 +112,3 @@ void native_shortcut_invoke(native_shortcut_t shortcut);
 #ifdef __cplusplus
 }
 #endif
-
diff --git a/src/capi/shortcut_manager_c.cpp b/src/capi/shortcut_manager_c.cpp
@@ -18,15 +18,15 @@ static std::mutex g_shortcut_callback_mutex;
 static std::unordered_map<native_shortcut_id_t, ShortcutCallbackInfo> g_shortcut_callbacks;
 
 // Global state for event callbacks
-struct EventCallbackInfo {
+struct ShortcutEventCallbackInfo {
   native_shortcut_event_callback_t callback;
   void* user_data;
   int id;
 };
 
-static std::mutex g_event_callback_mutex;
-static std::unordered_map<int, EventCallbackInfo> g_event_callbacks;
-static int g_next_callback_id = 1;
+static std::mutex g_shortcut_event_callback_mutex;
+static std::unordered_map<int, ShortcutEventCallbackInfo> g_shortcut_event_callbacks;
+static int g_shortcut_next_callback_id = 1;
 
 // Helper function to create native_shortcut_t from shared_ptr<Shortcut>
 static native_shortcut_t CreateNativeShortcutHandle(std::shared_ptr<Shortcut> shortcut) {
@@ -38,9 +38,9 @@ static native_shortcut_t CreateNativeShortcutHandle(std::shared_ptr<Shortcut> sh
 
 // Helper function to dispatch events to registered callbacks
 static void DispatchEvent(const native_shortcut_event_t& event) {
-  std::lock_guard<std::mutex> lock(g_event_callback_mutex);
+  std::lock_guard<std::mutex> lock(g_shortcut_event_callback_mutex);
 
-  for (const auto& [id, callback_info] : g_event_callbacks) {
+  for (const auto& [id, callback_info] : g_shortcut_event_callbacks) {
     try {
       callback_info.callback(&event, callback_info.user_data);
     } catch (...) {
@@ -50,9 +50,9 @@ static void DispatchEvent(const native_shortcut_event_t& event) {
 }
 
 // Event listener class to bridge C++ events to C callbacks
-class CEventListener {
+class ShortcutCEventListener {
  public:
-  CEventListener() {
+  ShortcutCEventListener() {
     auto& manager = ShortcutManager::GetInstance();
 
     // Register for shortcut events
@@ -93,8 +93,8 @@ class CEventListener {
 };
 
 // Singleton event listener
-static CEventListener* GetEventListener() {
-  static CEventListener listener;
+static ShortcutCEventListener* GetEventListener() {
+  static ShortcutCEventListener listener;
   return &listener;
 }
 
@@ -162,7 +162,7 @@ native_shortcut_t native_shortcut_manager_register_with_options(
   cpp_options.accelerator = options->accelerator;
   cpp_options.description = options->description ? options->description : "";
   cpp_options.scope = options->scope == NATIVE_SHORTCUT_SCOPE_GLOBAL ? ShortcutScope::Global
-                                                                      : ShortcutScope::Application;
+                                                                     : ShortcutScope::Application;
   cpp_options.enabled = options->enabled;
 
   // Placeholder callback - will be replaced below
@@ -320,23 +320,22 @@ int native_shortcut_manager_register_event_callback(native_shortcut_event_callba
   // Ensure event listener is initialized
   GetEventListener();
 
-  std::lock_guard<std::mutex> lock(g_event_callback_mutex);
+  std::lock_guard<std::mutex> lock(g_shortcut_event_callback_mutex);
 
-  int id = g_next_callback_id++;
-  g_event_callbacks[id] = {callback, user_data, id};
+  int id = g_shortcut_next_callback_id++;
+  g_shortcut_event_callbacks[id] = {callback, user_data, id};
 
   return id;
 }
 
 bool native_shortcut_manager_unregister_event_callback(int registration_id) {
-  std::lock_guard<std::mutex> lock(g_event_callback_mutex);
+  std::lock_guard<std::mutex> lock(g_shortcut_event_callback_mutex);
 
-  auto it = g_event_callbacks.find(registration_id);
-  if (it == g_event_callbacks.end()) {
+  auto it = g_shortcut_event_callbacks.find(registration_id);
+  if (it == g_shortcut_event_callbacks.end()) {
     return false;
   }
 
-  g_event_callbacks.erase(it);
+  g_shortcut_event_callbacks.erase(it);
   return true;
 }
-
diff --git a/src/capi/shortcut_manager_c.h b/src/capi/shortcut_manager_c.h
@@ -44,7 +44,7 @@ typedef struct {
  * Shortcut event callback function type
  */
 typedef void (*native_shortcut_event_callback_t)(const native_shortcut_event_t* event,
-                                                  void* user_data);
+                                                 void* user_data);
 
 /**
  * Shortcut list structure
@@ -198,4 +198,3 @@ bool native_shortcut_manager_unregister_event_callback(int registration_id);
 #ifdef __cplusplus
 }
 #endif
-
diff --git a/src/capi/window_manager_c.cpp b/src/capi/window_manager_c.cpp
@@ -9,15 +9,15 @@
 using namespace nativeapi;
 
 // Global state for event callbacks
-struct EventCallbackInfo {
+struct WindowEventCallbackInfo {
   native_window_event_callback_t callback;
   void* user_data;
   int id;
 };
 
-static std::mutex g_callback_mutex;
-static std::unordered_map<int, EventCallbackInfo> g_event_callbacks;
-static int g_next_callback_id = 1;
+static std::mutex g_window_callback_mutex;
+static std::unordered_map<int, WindowEventCallbackInfo> g_window_event_callbacks;
+static int g_window_next_callback_id = 1;
 
 // Helper function to create native_window_t from shared_ptr<Window>
 static native_window_t CreateNativeWindowHandle(std::shared_ptr<Window> window) {
@@ -30,9 +30,9 @@ static native_window_t CreateNativeWindowHandle(std::shared_ptr<Window> window)
 
 // Helper function to dispatch events to registered callbacks
 static void DispatchEvent(const native_window_event_t& event) {
-  std::lock_guard<std::mutex> lock(g_callback_mutex);
+  std::lock_guard<std::mutex> lock(g_window_callback_mutex);
 
-  for (const auto& [id, callback_info] : g_event_callbacks) {
+  for (const auto& [id, callback_info] : g_window_event_callbacks) {
     try {
       callback_info.callback(&event, callback_info.user_data);
     } catch (...) {
@@ -42,9 +42,9 @@ static void DispatchEvent(const native_window_event_t& event) {
 }
 
 // Event listener class to bridge C++ events to C callbacks
-class CEventListener {
+class WindowCEventListener {
  public:
-  CEventListener() {
+  WindowCEventListener() {
     auto& manager = WindowManager::GetInstance();
 
     // Register for various window events
@@ -103,7 +103,7 @@ class CEventListener {
   }
 };
 
-static std::unique_ptr<CEventListener> g_event_listener;
+static std::unique_ptr<WindowCEventListener> g_event_listener;
 
 // Hook callbacks (C API)
 static std::mutex g_hook_mutex;
@@ -177,22 +177,22 @@ int native_window_manager_register_event_callback(native_window_event_callback_t
   if (!callback)
     return -1;
 
-  std::lock_guard<std::mutex> lock(g_callback_mutex);
+  std::lock_guard<std::mutex> lock(g_window_callback_mutex);
 
-  int callback_id = g_next_callback_id++;
-  EventCallbackInfo info;
+  int callback_id = g_window_next_callback_id++;
+  WindowEventCallbackInfo info;
   info.callback = callback;
   info.user_data = user_data;
   info.id = callback_id;
 
-  g_event_callbacks[callback_id] = info;
+  g_window_event_callbacks[callback_id] = info;
 
   // Initialize event listener if this is the first callback
   if (!g_event_listener) {
     try {
-      g_event_listener = std::make_unique<CEventListener>();
+      g_event_listener = std::make_unique<WindowCEventListener>();
     } catch (...) {
-      g_event_callbacks.erase(callback_id);
+      g_window_event_callbacks.erase(callback_id);
       return -1;
     }
   }
@@ -202,17 +202,17 @@ int native_window_manager_register_event_callback(native_window_event_callback_t
 
 FFI_PLUGIN_EXPORT
 bool native_window_manager_unregister_event_callback(int registration_id) {
-  std::lock_guard<std::mutex> lock(g_callback_mutex);
+  std::lock_guard<std::mutex> lock(g_window_callback_mutex);
 
-  auto it = g_event_callbacks.find(registration_id);
-  if (it == g_event_callbacks.end()) {
+  auto it = g_window_event_callbacks.find(registration_id);
+  if (it == g_window_event_callbacks.end()) {
     return false;
   }
 
-  g_event_callbacks.erase(it);
+  g_window_event_callbacks.erase(it);
 
   // Clean up event listener if no callbacks remain
-  if (g_event_callbacks.empty()) {
+  if (g_window_event_callbacks.empty()) {
     g_event_listener.reset();
   }
 
@@ -221,10 +221,10 @@ bool native_window_manager_unregister_event_callback(int registration_id) {
 
 FFI_PLUGIN_EXPORT
 void native_window_manager_shutdown(void) {
-  std::lock_guard<std::mutex> lock(g_callback_mutex);
+  std::lock_guard<std::mutex> lock(g_window_callback_mutex);
 
   // Clear all callbacks
-  g_event_callbacks.clear();
+  g_window_event_callbacks.clear();
 
   // Clean up event listener
   g_event_listener.reset();

Original file line number	Diff line number	Diff line change
`@@ -80,4 +80,3 @@ void native_shortcut_invoke(native_shortcut_t shortcut) {`
`80`	`80`	`return;`
`81`	`81`	`GetShortcut(shortcut)->Invoke();`
`82`	`82`	`}`
`83`		`-`
Original file line number	Diff line number	Diff line change
`@@ -112,4 +112,3 @@ void native_shortcut_invoke(native_shortcut_t shortcut);`
`112`	`112`	`#ifdef __cplusplus`
`113`	`113`	`}`
`114`	`114`	`#endif`
`115`		`-`