refactor: Rearrange GetCursorPosition and GetAll methods in DisplayManager for consistency across platforms

Author: lijy91

src/display_manager.h

@@ -24,15 +24,15 @@ class DisplayManager {
   DisplayManager();
   virtual ~DisplayManager();
 
-  // Get the current cursor position
-  Point GetCursorPosition();
-
   // Get all displays information
   std::vector<Display> GetAll();
 
   // Get the primary display information
   Display GetPrimary();
 
+  // Get the current cursor position
+  Point GetCursorPosition();
+
   // Add a listener to the display manager
   void AddListener(DisplayListener* listener);
 

src/display_manager_linux.cpp

@@ -36,24 +36,11 @@ DisplayManager::DisplayManager() {
   std::cout << "DisplayManager initialized" << std::endl;
 }
 
-DisplayManager::~DisplayManager() {
-  // Destructor implementation
-  std::cout << "DisplayManager destroyed" << std::endl;
-}
-
-Point DisplayManager::GetCursorPosition() {
-  GdkDisplay* display = gdk_display_get_default();
-  GdkSeat* seat = gdk_display_get_default_seat(display);
-  GdkDevice* pointer = gdk_seat_get_pointer(seat);
-
-  int x, y;
-  gdk_device_get_position(pointer, NULL, &x, &y);
-
+std::vector<Display> DisplayManager::GetAll() {
   // Empty implementation
-  Point point;
-  point.x = x;
-  point.y = y;
-  return point;
+  std::vector<Display> displayList;
+  displayList.push_back(GetPrimary());
+  return displayList;
 }
 
 Display DisplayManager::GetPrimary() {
@@ -71,11 +58,19 @@ Display DisplayManager::GetPrimary() {
   return CreateDisplayFromGdkMonitor(monitor, true);
 }
 
-std::vector<Display> DisplayManager::GetAll() {
+Point DisplayManager::GetCursorPosition() {
+  GdkDisplay* display = gdk_display_get_default();
+  GdkSeat* seat = gdk_display_get_default_seat(display);
+  GdkDevice* pointer = gdk_seat_get_pointer(seat);
+
+  int x, y;
+  gdk_device_get_position(pointer, NULL, &x, &y);
+
   // Empty implementation
-  std::vector<Display> displayList;
-  displayList.push_back(GetPrimary());
-  return displayList;
+  Point point;
+  point.x = x;
+  point.y = y;
+  return point;
 }
 
 }  // namespace nativeapi

src/display_manager_macos.mm

@@ -91,14 +91,6 @@ static Display CreateDisplayFromNSScreen(NSScreen* screen, bool isPrimary) {
   }
 }
 
-Point DisplayManager::GetCursorPosition() {
-  NSPoint mouseLocation = [NSEvent mouseLocation];
-  Point point;
-  point.x = mouseLocation.x;
-  point.y = mouseLocation.y;
-  return point;
-}
-
 std::vector<Display> DisplayManager::GetAll() {
   std::vector<Display> displayList;
   NSArray<NSScreen*>* screens = [NSScreen screens];
@@ -116,4 +108,12 @@ static Display CreateDisplayFromNSScreen(NSScreen* screen, bool isPrimary) {
   return CreateDisplayFromNSScreen(screens[0], true);
 }
 
+Point DisplayManager::GetCursorPosition() {
+  NSPoint mouseLocation = [NSEvent mouseLocation];
+  Point point;
+  point.x = mouseLocation.x;
+  point.y = mouseLocation.y;
+  return point;
+}
+
 }  // namespace nativeapi

src/display_manager_windows.cpp

@@ -65,33 +65,6 @@ Display CreateDisplayFromMonitor(HMONITOR monitor, bool isMainScreen) {
 
   return display;
 }
-DisplayManager::DisplayManager() {
-  // Constructor implementation
-  std::cout << "DisplayManager initialized" << std::endl;
-}
-
-DisplayManager::~DisplayManager() {
-  // Destructor implementation
-  std::cout << "DisplayManager destroyed" << std::endl;
-}
-
-Point DisplayManager::GetCursorScreenPoint() {
-  POINT cursorPos;
-  GetCursorPos(&cursorPos);
-
-  Point point;
-  point.x = cursorPos.x;
-  point.y = cursorPos.y;
-  return point;
-}
-
-Display DisplayManager::GetPrimaryDisplay() {
-  POINT ptZero = {0, 0};
-  HMONITOR monitor = MonitorFromPoint(ptZero, MONITOR_DEFAULTTOPRIMARY);
-  Display display = CreateDisplayFromMonitor(monitor, true);
-  display.id = "";
-  return display;
-}
 
 BOOL CALLBACK MonitorRepresentationEnumProc(HMONITOR monitor,
                                             HDC hdc,
@@ -104,11 +77,28 @@ BOOL CALLBACK MonitorRepresentationEnumProc(HMONITOR monitor,
   return TRUE;
 }
 
-std::vector<Display> DisplayManager::GetAllDisplays() {
+std::vector<Display> DisplayManager::GetAll() {
   std::vector<Display> displayList;
   ::EnumDisplayMonitors(nullptr, nullptr, MonitorRepresentationEnumProc,
                         reinterpret_cast<LPARAM>(&displayList));
   return displayList;
 }
 
+Display DisplayManager::GetPrimary() {
+  POINT ptZero = {0, 0};
+  HMONITOR monitor = MonitorFromPoint(ptZero, MONITOR_DEFAULTTOPRIMARY);
+  Display display = CreateDisplayFromMonitor(monitor, true);
+  display.id = "";
+  return display;
+}
+
+Point DisplayManager::GetCursorPosition() {
+  POINT cursorPos;
+  GetCursorPos(&cursorPos);
+
+  Point point;
+  point.x = cursorPos.x;
+  point.y = cursorPos.y;
+  return point;
+}
 }  // namespace nativeapi