macos: external access to display name helpers

These can be handy to print debug information when we don't have a
GdkMacosMonitor to work with.
This commit is contained in:
Christian Hergert 2022-02-28 11:29:24 -08:00 committed by Christian Hergert
parent 75b186eb62
commit 590a1c2f3a
2 changed files with 8 additions and 6 deletions

View File

@ -29,6 +29,8 @@
G_BEGIN_DECLS
char *_gdk_macos_monitor_get_localized_name (NSScreen *screen);
char *_gdk_macos_monitor_get_connector_name (CGDirectDisplayID screen_id);
GdkMacosMonitor *_gdk_macos_monitor_new (GdkMacosDisplay *display,
CGDirectDisplayID screen_id);
CGDirectDisplayID _gdk_macos_monitor_get_screen_id (GdkMacosMonitor *self);

View File

@ -160,8 +160,8 @@ GetSubpixelLayout (CGDirectDisplayID screen_id)
return GDK_SUBPIXEL_LAYOUT_UNKNOWN;
}
static char *
GetLocalizedName (NSScreen *screen)
char *
_gdk_macos_monitor_get_localized_name (NSScreen *screen)
{
#ifdef AVAILABLE_MAC_OS_X_VERSION_10_15_AND_LATER
GDK_BEGIN_MACOS_ALLOC_POOL;
@ -182,8 +182,8 @@ GetLocalizedName (NSScreen *screen)
#endif
}
static char *
GetConnectorName (CGDirectDisplayID screen_id)
char *
_gdk_macos_monitor_get_connector_name (CGDirectDisplayID screen_id)
{
guint unit = CGDisplayUnitNumber (screen_id);
return g_strdup_printf ("unit-%u", unit);
@ -306,8 +306,8 @@ _gdk_macos_monitor_reconfigure (GdkMacosMonitor *self)
pixel_width = CGDisplayModeGetPixelWidth (mode);
has_opengl = CGDisplayUsesOpenGLAcceleration (self->screen_id);
subpixel_layout = GetSubpixelLayout (self->screen_id);
name = GetLocalizedName (screen);
connector = GetConnectorName (self->screen_id);
name = _gdk_macos_monitor_get_localized_name (screen);
connector = _gdk_macos_monitor_get_connector_name (self->screen_id);
if (width != 0 && pixel_width != 0)
scale_factor = MAX (1, pixel_width / width);