plusui-native-core 0.1.105 → 0.1.107

package/Core/Features/Display/display.cpp

@@ -1,212 +1,212 @@
-#ifdef _WIN32
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0601
-#endif
-#include <windows.h>
-
-#ifndef EXTERN_C
-#ifdef __cplusplus
-#define EXTERN_C extern "C"
-#else
-#define EXTERN_C extern
-#endif
-#endif
-
-#include <shellapi.h>
-#include <shlobj.h>
-#include <winuser.h>
-
-#ifndef DISPLAY_DEVICE_ATTACHED_TO_SESSION
-#define DISPLAY_DEVICE_ATTACHED_TO_SESSION 0x00000001
-#endif
-#ifndef SM_CXMM
-#define SM_CXMM 43
-#endif
-#ifndef SM_CYMM
-#define SM_CYMM 44
-#endif
-
-#pragma comment(lib, "user32.lib")
-#pragma comment(lib, "shell32.lib")
-#endif
-
-#include <algorithm>
-#include <plusui/display.hpp>
-#include <vector>
-
-#ifdef __APPLE__
-#include <Cocoa/Cocoa.h>
-#include <CoreGraphics/CoreGraphics.h>
-#elif !defined(_WIN32)
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#endif
-
-namespace plusui {
-
-struct DisplayManager::Impl {
-  std::vector<Display> displays;
-  std::function<void(const Display &)> onConnectCallback;
-  std::function<void(int)> onDisconnectCallback;
-  std::function<void(const Display &)> onChangeCallback;
-};
-
-DisplayManager::DisplayManager() : pImpl(std::make_unique<Impl>()) {
-  refresh();
-}
-
-DisplayManager::~DisplayManager() = default;
-
-DisplayManager &DisplayManager::instance() {
-  static DisplayManager inst;
-  return inst;
-}
-
-std::vector<Display> DisplayManager::getAllDisplays() {
-#ifdef _WIN32
-  pImpl->displays.clear();
-
-  int i = 0;
-  DISPLAY_DEVICEW dd = {};
-  dd.cb = sizeof(dd);
-
-  while (EnumDisplayDevicesW(nullptr, i, &dd, 0)) {
-    if (dd.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) {
-      i++;
-      continue;
-    }
-
-    Display d;
-    d.id = i;
-    // Widestring to string conversion
-    std::wstring wname(dd.DeviceName);
-    #pragma warning(push)
-    #pragma warning(disable: 4244) // Suppress wchar_t to char conversion warning
-    d.name = std::string(wname.begin(), wname.end());
-    #pragma warning(pop)
-
-    DEVMODEW dm = {};
-    dm.dmSize = sizeof(dm);
-    if (EnumDisplaySettingsW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm)) {
-      d.bounds.x = dm.dmPosition.x;
-      d.bounds.y = dm.dmPosition.y;
-      d.bounds.width = dm.dmPelsWidth;
-      d.bounds.height = dm.dmPelsHeight;
-      d.resolution.width = dm.dmPelsWidth;
-      d.resolution.height = dm.dmPelsHeight;
-      d.currentMode.width = dm.dmPelsWidth;
-      d.currentMode.height = dm.dmPelsHeight;
-      d.currentMode.refreshRate = dm.dmDisplayFrequency;
-    }
-
-    d.isPrimary = (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE);
-
-    HMONITOR hMon = MonitorFromWindow(nullptr, MONITOR_DEFAULTTOPRIMARY);
-    MONITORINFO mi = {};
-    mi.cbSize = sizeof(mi);
-    if (GetMonitorInfoW(hMon, &mi)) {
-      d.workArea.x = mi.rcWork.left;
-      d.workArea.y = mi.rcWork.top;
-      d.workArea.width = mi.rcWork.right - mi.rcWork.left;
-      d.workArea.height = mi.rcWork.bottom - mi.rcWork.top;
-    }
-
-    d.scaleFactor = 1.0;
-    d.isConnected = (dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_SESSION);
-
-    pImpl->displays.push_back(d);
-    i++;
-  }
-
-#elif defined(__APPLE__)
-  pImpl->displays.clear();
-
-  CGDirectDisplayID mainDisplay = CGMainDisplayID();
-  CGDisplayCount count;
-  CGGetActiveDisplayList(0, nullptr, &count);
-
-  std::vector<CGDirectDisplayID> displays(count);
-  CGGetActiveDisplayList(count, displays.data(), &count);
-
-  for (auto displayID : displays) {
-    Display d;
-    d.id = (int)displayID;
-    d.isPrimary = (displayID == mainDisplay);
-
-    CGRect rect = CGDisplayBounds(displayID);
-    d.bounds.x = rect.origin.x;
-    d.bounds.y = rect.origin.y;
-    d.bounds.width = rect.size.width;
-    d.bounds.height = rect.size.height;
-    d.resolution.width = rect.size.width;
-    d.resolution.height = rect.size.height;
-
-    // Work area on macOS is tricky without AppKit, but we can use NSScreen in
-    // window.cpp if needed. For now, we'll just use the full bounds.
-    d.workArea = d.bounds;
-
-    CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displayID);
-    if (mode) {
-      d.currentMode.width = CGDisplayModeGetWidth(mode);
-      d.currentMode.height = CGDisplayModeGetHeight(mode);
-      d.currentMode.refreshRate = CGDisplayModeGetRefreshRate(mode);
-      CGDisplayModeRelease(mode);
-    }
-
-    d.scaleFactor = 1.0; // TODO: Get backing scale factor
-    d.isConnected = true;
-
-    pImpl->displays.push_back(d);
-  }
-#else
-  pImpl->displays.clear();
-  GdkDisplay *display = gdk_display_get_default();
-  if (display) {
-    int n = gdk_display_get_n_monitors(display);
-    for (int i = 0; i < n; i++) {
-      GdkMonitor *monitor = gdk_display_get_monitor(display, i);
-      GdkRectangle rect;
-      gdk_monitor_get_geometry(monitor, &rect);
-
-      Display d;
-      d.id = i;
-      d.isPrimary = gdk_monitor_is_primary(monitor);
-      d.bounds.x = rect.x;
-      d.bounds.y = rect.y;
-      d.bounds.width = rect.width;
-      d.bounds.height = rect.height;
-      d.resolution.width = rect.width;
-      d.resolution.height = rect.height;
-
-      gdk_monitor_get_workarea(monitor, &rect);
-      d.workArea.x = rect.x;
-      d.workArea.y = rect.y;
-      d.workArea.width = rect.width;
-      d.workArea.height = rect.height;
-
-      d.scaleFactor = gdk_monitor_get_scale_factor(monitor);
-      d.isConnected = true;
-      pImpl->displays.push_back(d);
-    }
-  }
-#endif
-  return pImpl->displays;
-}
-
-void DisplayManager::refresh() { getAllDisplays(); }
-
-void DisplayManager::onDisplayConnected(
-    std::function<void(const Display &)> callback) {
-  pImpl->onConnectCallback = callback;
-}
-
-void DisplayManager::onDisplayDisconnected(std::function<void(int)> callback) {
-  pImpl->onDisconnectCallback = callback;
-}
-
-void DisplayManager::onDisplayChanged(
-    std::function<void(const Display &)> callback) {
-  pImpl->onChangeCallback = callback;
-}
-
-} // namespace plusui
+#ifdef _WIN32
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0601
+#endif
+#include <windows.h>
+
+#ifndef EXTERN_C
+#ifdef __cplusplus
+#define EXTERN_C extern "C"
+#else
+#define EXTERN_C extern
+#endif
+#endif
+
+#include <shellapi.h>
+#include <shlobj.h>
+#include <winuser.h>
+
+#ifndef DISPLAY_DEVICE_ATTACHED_TO_SESSION
+#define DISPLAY_DEVICE_ATTACHED_TO_SESSION 0x00000001
+#endif
+#ifndef SM_CXMM
+#define SM_CXMM 43
+#endif
+#ifndef SM_CYMM
+#define SM_CYMM 44
+#endif
+
+#pragma comment(lib, "user32.lib")
+#pragma comment(lib, "shell32.lib")
+#endif
+
+#include <algorithm>
+#include <plusui/display.hpp>
+#include <vector>
+
+#ifdef __APPLE__
+#include <Cocoa/Cocoa.h>
+#include <CoreGraphics/CoreGraphics.h>
+#elif !defined(_WIN32)
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#endif
+
+namespace plusui {
+
+struct DisplayManager::Impl {
+  std::vector<Display> displays;
+  std::function<void(const Display &)> onConnectCallback;
+  std::function<void(int)> onDisconnectCallback;
+  std::function<void(const Display &)> onChangeCallback;
+};
+
+DisplayManager::DisplayManager() : pImpl(std::make_unique<Impl>()) {
+  refresh();
+}
+
+DisplayManager::~DisplayManager() = default;
+
+DisplayManager &DisplayManager::instance() {
+  static DisplayManager inst;
+  return inst;
+}
+
+std::vector<Display> DisplayManager::getAllDisplays() {
+#ifdef _WIN32
+  pImpl->displays.clear();
+
+  int i = 0;
+  DISPLAY_DEVICEW dd = {};
+  dd.cb = sizeof(dd);
+
+  while (EnumDisplayDevicesW(nullptr, i, &dd, 0)) {
+    if (dd.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) {
+      i++;
+      continue;
+    }
+
+    Display d;
+    d.id = i;
+    // Widestring to string conversion
+    std::wstring wname(dd.DeviceName);
+    #pragma warning(push)
+    #pragma warning(disable: 4244) // Suppress wchar_t to char conversion warning
+    d.name = std::string(wname.begin(), wname.end());
+    #pragma warning(pop)
+
+    DEVMODEW dm = {};
+    dm.dmSize = sizeof(dm);
+    if (EnumDisplaySettingsW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm)) {
+      d.bounds.x = dm.dmPosition.x;
+      d.bounds.y = dm.dmPosition.y;
+      d.bounds.width = dm.dmPelsWidth;
+      d.bounds.height = dm.dmPelsHeight;
+      d.resolution.width = dm.dmPelsWidth;
+      d.resolution.height = dm.dmPelsHeight;
+      d.currentMode.width = dm.dmPelsWidth;
+      d.currentMode.height = dm.dmPelsHeight;
+      d.currentMode.refreshRate = dm.dmDisplayFrequency;
+    }
+
+    d.isPrimary = (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE);
+
+    HMONITOR hMon = MonitorFromWindow(nullptr, MONITOR_DEFAULTTOPRIMARY);
+    MONITORINFO mi = {};
+    mi.cbSize = sizeof(mi);
+    if (GetMonitorInfoW(hMon, &mi)) {
+      d.workArea.x = mi.rcWork.left;
+      d.workArea.y = mi.rcWork.top;
+      d.workArea.width = mi.rcWork.right - mi.rcWork.left;
+      d.workArea.height = mi.rcWork.bottom - mi.rcWork.top;
+    }
+
+    d.scaleFactor = 1.0;
+    d.isConnected = (dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_SESSION);
+
+    pImpl->displays.push_back(d);
+    i++;
+  }
+
+#elif defined(__APPLE__)
+  pImpl->displays.clear();
+
+  CGDirectDisplayID mainDisplay = CGMainDisplayID();
+  CGDisplayCount count;
+  CGGetActiveDisplayList(0, nullptr, &count);
+
+  std::vector<CGDirectDisplayID> displays(count);
+  CGGetActiveDisplayList(count, displays.data(), &count);
+
+  for (auto displayID : displays) {
+    Display d;
+    d.id = (int)displayID;
+    d.isPrimary = (displayID == mainDisplay);
+
+    CGRect rect = CGDisplayBounds(displayID);
+    d.bounds.x = rect.origin.x;
+    d.bounds.y = rect.origin.y;
+    d.bounds.width = rect.size.width;
+    d.bounds.height = rect.size.height;
+    d.resolution.width = rect.size.width;
+    d.resolution.height = rect.size.height;
+
+    // Work area on macOS is tricky without AppKit, but we can use NSScreen in
+    // window.cpp if needed. For now, we'll just use the full bounds.
+    d.workArea = d.bounds;
+
+    CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displayID);
+    if (mode) {
+      d.currentMode.width = CGDisplayModeGetWidth(mode);
+      d.currentMode.height = CGDisplayModeGetHeight(mode);
+      d.currentMode.refreshRate = CGDisplayModeGetRefreshRate(mode);
+      CGDisplayModeRelease(mode);
+    }
+
+    d.scaleFactor = 1.0; // TODO: Get backing scale factor
+    d.isConnected = true;
+
+    pImpl->displays.push_back(d);
+  }
+#else
+  pImpl->displays.clear();
+  GdkDisplay *display = gdk_display_get_default();
+  if (display) {
+    int n = gdk_display_get_n_monitors(display);
+    for (int i = 0; i < n; i++) {
+      GdkMonitor *monitor = gdk_display_get_monitor(display, i);
+      GdkRectangle rect;
+      gdk_monitor_get_geometry(monitor, &rect);
+
+      Display d;
+      d.id = i;
+      d.isPrimary = gdk_monitor_is_primary(monitor);
+      d.bounds.x = rect.x;
+      d.bounds.y = rect.y;
+      d.bounds.width = rect.width;
+      d.bounds.height = rect.height;
+      d.resolution.width = rect.width;
+      d.resolution.height = rect.height;
+
+      gdk_monitor_get_workarea(monitor, &rect);
+      d.workArea.x = rect.x;
+      d.workArea.y = rect.y;
+      d.workArea.width = rect.width;
+      d.workArea.height = rect.height;
+
+      d.scaleFactor = gdk_monitor_get_scale_factor(monitor);
+      d.isConnected = true;
+      pImpl->displays.push_back(d);
+    }
+  }
+#endif
+  return pImpl->displays;
+}
+
+void DisplayManager::refresh() { getAllDisplays(); }
+
+void DisplayManager::onDisplayConnected(
+    std::function<void(const Display &)> callback) {
+  pImpl->onConnectCallback = callback;
+}
+
+void DisplayManager::onDisplayDisconnected(std::function<void(int)> callback) {
+  pImpl->onDisconnectCallback = callback;
+}
+
+void DisplayManager::onDisplayChanged(
+    std::function<void(const Display &)> callback) {
+  pImpl->onChangeCallback = callback;
+}
+
+} // namespace plusui