Refactor native_display_t to use raw pointer handle

Replaces the native_display_handle struct and shared_ptr with a raw pointer to the Display object for native_display_t, aligning with the window handle design. Updates all usages to cast and manage the raw pointer appropriately, simplifying the handle implementation.

Author: lijy91

src/capi/display_c.cpp

@@ -5,12 +5,10 @@
 
 using namespace nativeapi;
 
-// Internal structure to hold the actual Display pointer
-struct native_display_handle {
-  std::shared_ptr<Display> display;
-  explicit native_display_handle(std::shared_ptr<Display> d)
-      : display(std::move(d)) {}
-};
+// Helper to cast opaque handle to C++ Display pointer
+static inline Display* to_display(native_display_t handle) {
+  return static_cast<Display*>(handle);
+}
 
 // Helper function to safely copy C++ string to C string
 static char* copy_string(const std::string& str) {
@@ -28,26 +26,26 @@ static char* copy_string(const std::string& str) {
 // Basic identification getters
 FFI_PLUGIN_EXPORT
 char* native_display_get_id(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return nullptr;
-  return copy_string(display->display->GetId());
+  return copy_string(to_display(display)->GetId());
 }
 
 FFI_PLUGIN_EXPORT
 char* native_display_get_name(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return nullptr;
-  return copy_string(display->display->GetName());
+  return copy_string(to_display(display)->GetName());
 }
 
 // Physical properties getters
 FFI_PLUGIN_EXPORT
 native_point_t native_display_get_position(native_display_t display) {
   native_point_t result = {0.0, 0.0};
-  if (!display || !display->display)
+  if (!display)
     return result;
 
-  auto pos = display->display->GetPosition();
+  auto pos = to_display(display)->GetPosition();
   result.x = pos.x;
   result.y = pos.y;
   return result;
@@ -56,10 +54,10 @@ native_point_t native_display_get_position(native_display_t display) {
 FFI_PLUGIN_EXPORT
 native_size_t native_display_get_size(native_display_t display) {
   native_size_t result = {0.0, 0.0};
-  if (!display || !display->display)
+  if (!display)
     return result;
 
-  auto size = display->display->GetSize();
+  auto size = to_display(display)->GetSize();
   result.width = size.width;
   result.height = size.height;
   return result;
@@ -68,10 +66,10 @@ native_size_t native_display_get_size(native_display_t display) {
 FFI_PLUGIN_EXPORT
 native_rectangle_t native_display_get_work_area(native_display_t display) {
   native_rectangle_t result = {0.0, 0.0, 0.0, 0.0};
-  if (!display || !display->display)
+  if (!display)
     return result;
 
-  Rectangle work_area = display->display->GetWorkArea();
+  Rectangle work_area = to_display(display)->GetWorkArea();
   result.x = work_area.x;
   result.y = work_area.y;
   result.width = work_area.width;
@@ -81,26 +79,26 @@ native_rectangle_t native_display_get_work_area(native_display_t display) {
 
 FFI_PLUGIN_EXPORT
 double native_display_get_scale_factor(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return 1.0;
-  return display->display->GetScaleFactor();
+  return to_display(display)->GetScaleFactor();
 }
 
 // Additional properties getters
 FFI_PLUGIN_EXPORT
 bool native_display_is_primary(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return false;
-  return display->display->IsPrimary();
+  return to_display(display)->IsPrimary();
 }
 
 FFI_PLUGIN_EXPORT
 native_display_orientation_t native_display_get_orientation(
     native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return NATIVE_DISPLAY_ORIENTATION_PORTRAIT;
 
-  DisplayOrientation orientation = display->display->GetOrientation();
+  DisplayOrientation orientation = to_display(display)->GetOrientation();
   switch (orientation) {
     case DisplayOrientation::kPortrait:
       return NATIVE_DISPLAY_ORIENTATION_PORTRAIT;
@@ -117,46 +115,46 @@ native_display_orientation_t native_display_get_orientation(
 
 FFI_PLUGIN_EXPORT
 int native_display_get_refresh_rate(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return 0;
-  return display->display->GetRefreshRate();
+  return to_display(display)->GetRefreshRate();
 }
 
 FFI_PLUGIN_EXPORT
 int native_display_get_bit_depth(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return 0;
-  return display->display->GetBitDepth();
+  return to_display(display)->GetBitDepth();
 }
 
 // Hardware information getters
 FFI_PLUGIN_EXPORT
 char* native_display_get_manufacturer(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return nullptr;
-  return copy_string(display->display->GetManufacturer());
+  return copy_string(to_display(display)->GetManufacturer());
 }
 
 FFI_PLUGIN_EXPORT
 char* native_display_get_model(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return nullptr;
-  return copy_string(display->display->GetModel());
+  return copy_string(to_display(display)->GetModel());
 }
 
 FFI_PLUGIN_EXPORT
 char* native_display_get_serial_number(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return nullptr;
-  return copy_string(display->display->GetSerialNumber());
+  return copy_string(to_display(display)->GetSerialNumber());
 }
 
 // Platform-specific functions
 FFI_PLUGIN_EXPORT
 void* native_display_get_native_object(native_display_t display) {
-  if (!display || !display->display)
+  if (!display)
     return nullptr;
-  return display->display->GetNativeObject();
+  return to_display(display)->GetNativeObject();
 }
 
 // Memory management
@@ -170,7 +168,7 @@ void native_display_free_string(char* str) {
 FFI_PLUGIN_EXPORT
 void native_display_free(native_display_t display) {
   if (display) {
-    delete display;
+    delete to_display(display);
   }
 }
 
@@ -182,7 +180,7 @@ void native_display_list_free(native_display_list_t* list) {
   // Free individual display handles
   for (long i = 0; i < list->count; i++) {
     if (list->displays[i]) {
-      delete list->displays[i];
+      delete to_display(list->displays[i]);
     }
   }
 
@@ -196,11 +194,7 @@ void native_display_list_free(native_display_list_t* list) {
 native_display_t native_display_create_handle(
     const nativeapi::Display& cpp_display) {
   try {
-    // Create a shared_ptr from the Display object (copy constructor)
-    auto display_ptr = std::make_shared<Display>(cpp_display);
-
-    // Create the native handle
-    auto* handle = new (std::nothrow) native_display_handle(display_ptr);
+    auto* handle = new (std::nothrow) Display(cpp_display);
     return handle;
   } catch (const std::exception&) {
     return nullptr;

src/capi/display_c.h

@@ -27,8 +27,9 @@ typedef enum : int {
 
 /**
  * Opaque display handle
+ * Align with window handle design: use a raw pointer to underlying C++ type
  */
-typedef struct native_display_handle* native_display_t;
+typedef void* native_display_t;
 
 /**
  * Display list structure