feat: Modify to conditionally compile platform code

Author: lijy91

.gitignore

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

examples/screen_info/main.cpp

@@ -1,11 +1,16 @@
 #include <iostream>
-#include "libnativeapi.h"
+#include "nativeapi.h"
+
+using nativeapi::Display;
+using nativeapi::Point;
+using nativeapi::ScreenEventType;
+using nativeapi::ScreenRetriever;
 
 int main() {
-  auto screenRetriever = nativeapi::ScreenRetriever::Create();
+  ScreenRetriever screenRetriever = ScreenRetriever();
 
   // Get primary display information
-  nativeapi::Display primaryDisplay = screenRetriever->GetPrimaryDisplay();
+  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 +24,10 @@ int main() {
   std::cout << std::endl;
 
   // Get all displays information
-  nativeapi::DisplayList allDisplays = screenRetriever->GetAllDisplays();
+  std::vector<Display> allDisplays = screenRetriever.GetAllDisplays();
   std::cout << "All Displays Information:" << std::endl;
-  for (int i = 0; i < allDisplays.count; i++) {
-    nativeapi::Display& display = allDisplays.displays[i];
+  for (int i = 0; i < allDisplays.size(); i++) {
+    Display& display = allDisplays[i];
     std::cout << "Display " << (i + 1) << ":" << std::endl;
     std::cout << "ID: " << display.id << std::endl;
     std::cout << "Name: " << display.name << std::endl;
@@ -34,17 +39,11 @@ int main() {
     std::cout << "Visible Size: " << display.visibleSizeWidth << "x"
               << display.visibleSizeHeight << std::endl;
     std::cout << std::endl;
-    }
+  }
 
   // Get cursor position
-  nativeapi::Point cursorPoint = screenRetriever->GetCursorScreenPoint();
+  Point cursorPoint = screenRetriever.GetCursorScreenPoint();
   std::cout << "Current Cursor Position: (" << cursorPoint.x << ", "
             << cursorPoint.y << ")" << std::endl;
-
-  // Clean up memory
-  delete[] allDisplays.displays;
-  delete[] primaryDisplay.id;
-  delete[] primaryDisplay.name;
-
   return 0;
 }

include/nativeapi.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "../src/display.h"
+#include "../src/geometry.h"
+#include "../src/screen_retriever.h"

src/CMakeLists.txt

@@ -14,31 +14,35 @@ endif()
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# Common source files
+file(GLOB COMMON_SOURCES "*.cpp")
+list(FILTER COMMON_SOURCES EXCLUDE REGEX "linux.*|macos.*|windows.*")
+
 # Platform-specific source files
 if(LINUX)
-  set(PLATFORM_SOURCES "screen_retriever_linux.cpp")
+  file(GLOB PLATFORM_SOURCES "*_linux.cpp")
 elseif(APPLE)
-  set(PLATFORM_SOURCES "screen_retriever_macos.mm")
+  file(GLOB PLATFORM_SOURCES "*_macos.mm")
 elseif(WIN32)
-  set(PLATFORM_SOURCES "screen_retriever_windows.cpp")
+  file(GLOB PLATFORM_SOURCES "*_windows.cpp")
 else()
   set(PLATFORM_SOURCES "")
 endif()
 
 # Add library target
 add_library(libnativeapi STATIC
-  "screen_retriever.cpp"
+  ${COMMON_SOURCES}
   ${PLATFORM_SOURCES}
 )
 
 # Set library properties
 set_target_properties(libnativeapi PROPERTIES
-  PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/libnativeapi/src/**/*.h"
+  PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/../include/**/*.h"
 )
 
 # Set library include directories
 target_include_directories(libnativeapi PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
   $<INSTALL_INTERFACE:include>
 )
 

src/ui/display.h renamed to src/display.h

@@ -1,9 +1,12 @@
+#pragma once
+#include <string>
+
 namespace nativeapi {
 
 // Representation of a display
 struct Display {
-  char* id;
-  char* name;
+  std::string id;
+  std::string name;
   double width;
   double height;
   double visiblePositionX;
@@ -13,10 +16,4 @@ struct Display {
   double scaleFactor;
 };
 
-// Representation of a list of displays
-struct DisplayList {
-  Display* displays;
-  int count;
-};
-
 }  // namespace nativeapi

src/ui/geometry.h renamed to src/geometry.h

@@ -20,12 +20,12 @@ struct Point {
   double y;
 };
 
-// /**
-//  * Size is a 2D size in the coordinate system.
-//  */
-// struct Size {
-//   double height;
-//   double width;
-// };
+/**
+ * Size is a 2D size in the coordinate system.
+ */
+struct Size {
+  double height;
+  double width;
+};
 
 }  // namespace nativeapi

src/libnativeapi.h

@@ -1,24 +1,62 @@
+#include <cstring>
+#include <iostream>
+#include <string>
 #include "screen_retriever.h"
 
-// Forward declarations for platform-specific implementations
-#ifdef __APPLE__
-#include "screen_retriever_macos.h"
-#elif defined(_WIN32)
-#include "screen_retriever_windows.h"
-#else
-#include "screen_retriever_linux.h"
-#endif
-
 namespace nativeapi {
 
-std::unique_ptr<ScreenRetriever> ScreenRetriever::Create() {
-#ifdef __APPLE__
-  return std::unique_ptr<ScreenRetriever>(new ScreenRetrieverMacOS());
-#elif defined(_WIN32)
-  return std::unique_ptr<ScreenRetriever>(new ScreenRetrieverWindows());
-#else
-  return std::unique_ptr<ScreenRetriever>(new ScreenRetrieverLinux());
-#endif
+void ScreenRetriever::AddEventListener(ScreenEventType event_type,
+                                       std::function<void(const void*)> listener) {
+  std::cout << "\nAdd!" << std::endl;
+
+  listeners_[event_type].push_back(listener);
 }
 
-}  // namespace nativeapi
+void ScreenRetriever::RemoveEventListener(ScreenEventType event_type,
+                                          std::function<void(const void*)> listener) {
+  // Note: This is a simplified implementation that removes all listeners for the event type
+  listeners_[event_type].clear();
+}
+
+
+void ScreenRetriever::HandleDisplayChange() {
+  auto new_displays = GetAllDisplays();
+
+  // Find added displays
+  for (const auto& new_display : new_displays) {
+    bool found = false;
+    for (const auto& current_display : current_displays_) {
+      if (new_display.id == current_display.id) {
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      // This is a new display
+      for (const auto& listener : listeners_[ScreenEventType::DisplayAdded]) {
+        listener(&new_display);
+      }
+    }
+  }
+
+  // Find removed displays
+  for (const auto& current_display : current_displays_) {
+    bool found = false;
+    for (const auto& new_display : new_displays) {
+      if (current_display.id == new_display.id) {
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      // This display was removed
+      for (const auto& listener : listeners_[ScreenEventType::DisplayRemoved]) {
+        listener(&current_display);
+      }
+    }
+  }
+
+  // Update current display list
+  current_displays_ = std::move(new_displays);
+}
+}  // namespace nativeapi

src/screen_retriever.cpp

@@ -1,28 +1,52 @@
 #pragma once
 
-#include <memory>
+#include <functional>
+#include <map>
 #include <vector>
 
-#include "ui/display.h"
-#include "ui/geometry.h"
+#include "display.h"
+#include "geometry.h"
 
 namespace nativeapi {
+
+// Event types that can be listened to
+enum class ScreenEventType : uint8_t {
+  DisplayAdded = 0x01,    // New display connected
+  DisplayRemoved = 0x02,  // Display disconnected
+};
+
 // Abstract base class for ScreenRetriever
 class ScreenRetriever {
  public:
-  virtual ~ScreenRetriever() = default;
-
-  // Static factory method to create platform-specific instance
-  static std::unique_ptr<ScreenRetriever> Create();
+  ScreenRetriever();
+  virtual ~ScreenRetriever();
 
   // Get the current cursor screen point
-  virtual Point GetCursorScreenPoint() = 0;
+  Point GetCursorScreenPoint();
 
   // Get the primary display information
-  virtual Display GetPrimaryDisplay() = 0;
+  Display GetPrimaryDisplay();
 
   // Get all displays information
-  virtual DisplayList GetAllDisplays() = 0;
+  std::vector<Display> GetAllDisplays();
+
+  // Add event listener for specific event type
+  void AddEventListener(ScreenEventType event_type,
+                        std::function<void(const void*)> listener);
+
+  // Remove event listener for specific event type
+  void RemoveEventListener(ScreenEventType event_type,
+                           std::function<void(const void*)> listener);
+
+ private:
+  // Store current displays to detect changes
+  std::vector<Display> current_displays_;
+
+  // Event listeners storage
+  std::map<ScreenEventType, std::vector<std::function<void(const void*)>>>
+      listeners_;
+
+  void HandleDisplayChange();
 };
 
 }  // namespace nativeapi

src/screen_retriever.h

@@ -1,27 +1,27 @@
-#include "screen_retriever_linux.h"
 #include <iostream>
+#include "screen_retriever.h"
 
 namespace nativeapi {
 
-ScreenRetrieverLinux::ScreenRetrieverLinux() {
+ScreenRetriever::ScreenRetriever() {
   // Constructor implementation
-  std::cout << "ScreenRetrieverLinux initialized" << std::endl;
+  std::cout << "ScreenRetriever initialized" << std::endl;
 }
 
-ScreenRetrieverLinux::~ScreenRetrieverLinux() {
+ScreenRetriever::~ScreenRetriever() {
   // Destructor implementation
-  std::cout << "ScreenRetrieverLinux destroyed" << std::endl;
+  std::cout << "ScreenRetriever destroyed" << std::endl;
 }
 
-Point ScreenRetrieverLinux::GetCursorScreenPoint() {
+Point ScreenRetriever::GetCursorScreenPoint() {
   // Empty implementation
   Point point;
   point.x = 0.0;
   point.y = 0.0;
   return point;
 }
 
-Display ScreenRetrieverLinux::GetPrimaryDisplay() {
+Display ScreenRetriever::GetPrimaryDisplay() {
   // Empty implementation
   Display display;
   display.id = "display-1";
@@ -36,12 +36,10 @@ Display ScreenRetrieverLinux::GetPrimaryDisplay() {
   return display;
 }
 
-DisplayList ScreenRetrieverLinux::GetAllDisplays() {
+std::vector<Display> ScreenRetriever::GetAllDisplays() {
   // Empty implementation
-  DisplayList displayList;
-  displayList.displays = new Display[1];
-  displayList.displays[0] = GetPrimaryDisplay();
-  displayList.count = 1;
+  std::vector<Display> displayList;
+  displayList.push_back(GetPrimaryDisplay());
   return displayList;
 }