mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-12-01 16:44:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made NSScreen to CGDisplay matching fail softly.

Browse Source
This commit is contained in:
Camilla Berglund 2014-01-21 15:14:14 +01:00
parent 7bbd3943c9
commit 6eec7970c1
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/cocoa_monitor.m
View File

@ -252,37 +252,30 @@ void _glfwRestoreVideoMode(_GLFWmonitor* monitor)
_GLFWmonitor** _glfwPlatformGetMonitors(int* count) _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
{ {
uint32_t i, found = 0, monitorCount; uint32_t i, found = 0, displayCount;
_GLFWmonitor** monitors; _GLFWmonitor** monitors;
CGDirectDisplayID* displays; CGDirectDisplayID* displays;
*count = 0; *count = 0;
CGGetActiveDisplayList(0, NULL, &monitorCount); CGGetActiveDisplayList(0, NULL, &displayCount);
displays = calloc(monitorCount, sizeof(CGDirectDisplayID)); displays = calloc(displayCount, sizeof(CGDirectDisplayID));
monitors = calloc(monitorCount, sizeof(_GLFWmonitor*)); monitors = calloc(displayCount, sizeof(_GLFWmonitor*));
CGGetActiveDisplayList(monitorCount, displays, &monitorCount); CGGetActiveDisplayList(displayCount, displays, &displayCount);
for (i = 0; i < monitorCount; i++) NSArray* screens = [NSScreen screens];
for (i = 0; i < displayCount; i++)
{ {
int j;
const CGSize size = CGDisplayScreenSize(displays[i]); const CGSize size = CGDisplayScreenSize(displays[i]);
monitors[found] = _glfwCreateMonitor(getDisplayName(displays[i]), monitors[found] = _glfwCreateMonitor(getDisplayName(displays[i]),
size.width, size.height); size.width, size.height);
monitors[found]->ns.displayID = displays[i]; monitors[found]->ns.displayID = displays[i];
found++;
}
free(displays);
NSArray* screens = [NSScreen screens];
for (i = 0; i < monitorCount; i++)
{
int j;
for (j = 0; j < [screens count]; j++) for (j = 0; j < [screens count]; j++)
{ {
@ -290,26 +283,29 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
NSDictionary* dictionary = [screen deviceDescription]; NSDictionary* dictionary = [screen deviceDescription];
NSNumber* number = [dictionary objectForKey:@"NSScreenNumber"]; NSNumber* number = [dictionary objectForKey:@"NSScreenNumber"];
if (monitors[i]->ns.displayID == [number unsignedIntegerValue]) if (monitors[found]->ns.displayID == [number unsignedIntegerValue])
{ {
monitors[i]->ns.screen = screen; monitors[found]->ns.screen = screen;
break; break;
} }
} }
if (monitors[i]->ns.screen == nil) if (monitors[found]->ns.screen)
found++;
else
{ {
_glfwDestroyMonitors(monitors, monitorCount);
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Cocoa: Failed to find NSScreen for CGDisplay %s", "Cocoa: Failed to find NSScreen for CGDisplay %s",
monitors[i]->name); monitors[found]->name);
free(monitors); _glfwDestroyMonitor(monitors[found]);
return NULL; monitors[found] = NULL;
} }
} }
*count = monitorCount; free(displays);
*count = found;
return monitors; return monitors;
} }