refactor: Update screen retriever implementation to use nativeapi namespace and adjust header inclusions

Author: lijy91

.gitignore

@@ -1 +1,3 @@
-build/
+.idea/
+build/
+cmake-build-debug/

examples/screen_info/main.cpp

@@ -2,10 +2,10 @@
 #include "libnativeapi.h"
 
 int main() {
-  auto screenRetriever = ScreenRetriever::Create();
+  auto screenRetriever = nativeapi::ScreenRetriever::Create();
 
   // Get primary display information
-  Display primaryDisplay = screenRetriever->GetPrimaryDisplay();
+  nativeapi::Display primaryDisplay = screenRetriever->GetPrimaryDisplay();
   std::cout << "Primary Display Information:" << std::endl;
   std::cout << "ID: " << primaryDisplay.id << std::endl;
   std::cout << "Name: " << primaryDisplay.name << std::endl;
@@ -19,10 +19,10 @@ int main() {
   std::cout << std::endl;
 
   // Get all displays information
-  DisplayList allDisplays = screenRetriever->GetAllDisplays();
+  nativeapi::DisplayList allDisplays = screenRetriever->GetAllDisplays();
   std::cout << "All Displays Information:" << std::endl;
   for (int i = 0; i < allDisplays.count; i++) {
-    Display& display = allDisplays.displays[i];
+    nativeapi::Display& display = allDisplays.displays[i];
     std::cout << "Display " << (i + 1) << ":" << std::endl;
     std::cout << "ID: " << display.id << std::endl;
     std::cout << "Name: " << display.name << std::endl;
@@ -34,10 +34,10 @@ int main() {
     std::cout << "Visible Size: " << display.visibleSizeWidth << "x"
               << display.visibleSizeHeight << std::endl;
     std::cout << std::endl;
-  }
+    }
 
   // Get cursor position
-  CursorPoint cursorPoint = screenRetriever->GetCursorScreenPoint();
+  nativeapi::Point cursorPoint = screenRetriever->GetCursorScreenPoint();
   std::cout << "Current Cursor Position: (" << cursorPoint.x << ", "
             << cursorPoint.y << ")" << std::endl;
 

src/CMakeLists.txt

@@ -33,7 +33,7 @@ add_library(libnativeapi STATIC
 
 # Set library properties
 set_target_properties(libnativeapi PROPERTIES
-  PUBLIC_HEADER "libnativeapi.h;screen_retriever.h;screen_retriever_linux.h;screen_retriever_macos.h;screen_retriever_windows.h"
+  PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/libnativeapi/src/**/*.h"
 )
 
 # Set library include directories

src/screen_retriever.cpp

@@ -9,6 +9,8 @@
 #include "screen_retriever_linux.h"
 #endif
 
+namespace nativeapi {
+
 std::unique_ptr<ScreenRetriever> ScreenRetriever::Create() {
 #ifdef __APPLE__
   return std::unique_ptr<ScreenRetriever>(new ScreenRetrieverMacOS());
@@ -19,8 +21,4 @@ std::unique_ptr<ScreenRetriever> ScreenRetriever::Create() {
 #endif
 }
 
-// This file is left intentionally empty as the implementations
-// have been moved to platform-specific files:
-// - screen_retriever_linux.cpp
-// - screen_retriever_macos.mm
-// - screen_retriever_windows.cpp
+}  // namespace nativeapi

src/screen_retriever.h

@@ -3,31 +3,10 @@
 #include <memory>
 #include <vector>
 
-// Representation of a display
-struct Display {
-  char* id;
-  char* name;
-  double width;
-  double height;
-  double visiblePositionX;
-  double visiblePositionY;
-  double visibleSizeWidth;
-  double visibleSizeHeight;
-  double scaleFactor;
-};
-
-// Representation of a list of displays
-struct DisplayList {
-  Display* displays;
-  int count;
-};
-
-// Representation of a cursor position
-struct CursorPoint {
-  double x;
-  double y;
-};
+#include "ui/display.h"
+#include "ui/geometry.h"
 
+namespace nativeapi {
 // Abstract base class for ScreenRetriever
 class ScreenRetriever {
  public:
@@ -37,11 +16,13 @@ class ScreenRetriever {
   static std::unique_ptr<ScreenRetriever> Create();
 
   // Get the current cursor screen point
-  virtual CursorPoint GetCursorScreenPoint() = 0;
+  virtual Point GetCursorScreenPoint() = 0;
 
   // Get the primary display information
   virtual Display GetPrimaryDisplay() = 0;
 
   // Get all displays information
   virtual DisplayList GetAllDisplays() = 0;
 };
+
+}  // namespace nativeapi

src/screen_retriever_linux.cpp

@@ -1,6 +1,8 @@
 #include "screen_retriever_linux.h"
 #include <iostream>
 
+namespace nativeapi {
+
 ScreenRetrieverLinux::ScreenRetrieverLinux() {
   // Constructor implementation
   std::cout << "ScreenRetrieverLinux initialized" << std::endl;
@@ -11,9 +13,9 @@ ScreenRetrieverLinux::~ScreenRetrieverLinux() {
   std::cout << "ScreenRetrieverLinux destroyed" << std::endl;
 }
 
-CursorPoint ScreenRetrieverLinux::GetCursorScreenPoint() {
+Point ScreenRetrieverLinux::GetCursorScreenPoint() {
   // Empty implementation
-  CursorPoint point;
+  Point point;
   point.x = 0.0;
   point.y = 0.0;
   return point;
@@ -41,4 +43,6 @@ DisplayList ScreenRetrieverLinux::GetAllDisplays() {
   displayList.displays[0] = GetPrimaryDisplay();
   displayList.count = 1;
   return displayList;
-}
+}
+
+}  // namespace nativeapi

src/screen_retriever_linux.h

@@ -2,13 +2,17 @@
 
 #include "screen_retriever.h"
 
+namespace nativeapi {
+
 // Linux implementation of ScreenRetriever
 class ScreenRetrieverLinux : public ScreenRetriever {
  public:
   ScreenRetrieverLinux();
   ~ScreenRetrieverLinux() override;
 
-  CursorPoint GetCursorScreenPoint() override;
+  Point GetCursorScreenPoint() override;
   Display GetPrimaryDisplay() override;
   DisplayList GetAllDisplays() override;
-};
+};
+
+}  // namespace nativeapi

src/screen_retriever_macos.h

@@ -5,17 +5,21 @@
 // Import Cocoa headers
 #import <Cocoa/Cocoa.h>
 
+namespace nativeapi {
+
 // macOS implementation of ScreenRetriever
 class ScreenRetrieverMacOS : public ScreenRetriever {
  public:
   ScreenRetrieverMacOS();
   ~ScreenRetrieverMacOS() override;
 
-  CursorPoint GetCursorScreenPoint() override;
+  Point GetCursorScreenPoint() override;
   Display GetPrimaryDisplay() override;
   DisplayList GetAllDisplays() override;
 
  private:
   // Helper method to create Display struct from NSScreen
   Display CreateDisplayFromNSScreen(NSScreen* screen, bool isMainScreen);
 };
+
+}  // namespace nativeapi

src/screen_retriever_macos.mm

@@ -6,6 +6,8 @@
 // Import Cocoa headers
 #import <Cocoa/Cocoa.h>
 
+namespace nativeapi {
+
 // Helper function to convert NSString to char*
 static char* ConvertNSStringToCString(NSString* nsString) {
   if (nsString == nil) {
@@ -25,8 +27,8 @@
   std::cout << "ScreenRetrieverMacOS destroyed" << std::endl;
 }
 
-CursorPoint ScreenRetrieverMacOS::GetCursorScreenPoint() {
-  CursorPoint point;
+Point ScreenRetrieverMacOS::GetCursorScreenPoint() {
+  Point point;
 
   // Get the current mouse position
   NSPoint mouseLocation = [NSEvent mouseLocation];
@@ -49,7 +51,7 @@
   NSArray<NSScreen*>* screens = [NSScreen screens];
   bool isFirstScreen = true;
 
-  int count = (int) screens.count;
+  int count = (int)screens.count;
   displayList.displays = new Display[count];
   displayList.count = count;
   int index = 0;
@@ -96,4 +98,6 @@
   display.scaleFactor = scaleFactor;
 
   return display;
-}
+}
+
+}  // namespace nativeapi

src/screen_retriever_windows.cpp

@@ -1,6 +1,8 @@
 #include "screen_retriever_windows.h"
 #include <iostream>
 
+namespace nativeapi {
+
 ScreenRetrieverWindows::ScreenRetrieverWindows() {
   // Constructor implementation
   std::cout << "ScreenRetrieverWindows initialized" << std::endl;
@@ -11,9 +13,9 @@ ScreenRetrieverWindows::~ScreenRetrieverWindows() {
   std::cout << "ScreenRetrieverWindows destroyed" << std::endl;
 }
 
-CursorPoint ScreenRetrieverWindows::GetCursorScreenPoint() {
+Point ScreenRetrieverWindows::GetCursorScreenPoint() {
   // Empty implementation
-  CursorPoint point;
+  Point point;
   point.x = 0.0;
   point.y = 0.0;
   return point;
@@ -41,4 +43,6 @@ DisplayList ScreenRetrieverWindows::GetAllDisplays() {
   displayList.displays[0] = GetPrimaryDisplay();
   displayList.count = 1;
   return displayList;
-}
+}
+
+}  // namespace nativeapi