mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-26 22:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed NSScreen member of OS X monitor.

Browse Source 
Apple's documentation of [NSScreen screens] mentions that, "The
(screens) array should not be cached.  Screens can be added, removed,
or dynamically reconfigured at any time."  Because of this, we simply
obtain the screen from a displayID whenever we need it.

Fixes #492.
Closes #493.
This commit is contained in:
Chi-kwan Chan 2015-04-07 21:02:48 -04:00 committed by Camilla Berglund
parent 882b770ecb
commit 4277e9f5d6
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cocoa_monitor.m
View File

@ -286,7 +286,6 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
monitor = _glfwAllocMonitor(name, size.width, size.height); monitor = _glfwAllocMonitor(name, size.width, size.height);
monitor->ns.displayID = displays[i]; monitor->ns.displayID = displays[i];
monitor->ns.screen = [screens objectAtIndex:j];
free(name); free(name);

1
src/cocoa_platform.h
View File

@ -92,7 +92,6 @@ typedef struct _GLFWmonitorNS
{ {
CGDirectDisplayID displayID; CGDirectDisplayID displayID;
CGDisplayModeRef previousMode; CGDisplayModeRef previousMode;
id screen;
} _GLFWmonitorNS; } _GLFWmonitorNS;

25
src/cocoa_window.m
View File

@ -32,6 +32,27 @@
#include <crt_externs.h> #include <crt_externs.h>
// Returns the screen that is specified by a displayID
//
static NSScreen *getScreen(CGDirectDisplayID displayID)
{
// NOTE: Apple's documentation of [NSScreen screens] mentions that,
// "The (screens) array should not be cached. Screens can be
// added, removed, or dynamically reconfigured at any time."
// Because of this, we simply obtain the screen from a
// displayID whenever we need it.
NSArray *screens = [NSScreen screens];
for(NSScreen *screen in screens) {
NSDictionary *dictionary = [screen deviceDescription];
NSNumber *number = [dictionary objectForKey:@"NSScreenNumber"];
if ([number unsignedIntegerValue] == displayID)
return screen;
}
return nil;
}
// Returns the specified standard cursor // Returns the specified standard cursor
// //
static NSCursor* getStandardCursor(int shape) static NSCursor* getStandardCursor(int shape)
@ -89,7 +110,7 @@ static GLboolean enterFullscreenMode(_GLFWwindow* window)
// NOTE: The window is resized despite mode setting failure to make // NOTE: The window is resized despite mode setting failure to make
// glfwSetWindowSize more robust // glfwSetWindowSize more robust
[window->ns.object setFrame:[window->monitor->ns.screen frame] [window->ns.object setFrame:[getScreen(window->monitor->ns.displayID) frame]
display:YES]; display:YES];
return status; return status;
@ -838,7 +859,7 @@ static GLboolean createWindow(_GLFWwindow* window,
NSRect contentRect; NSRect contentRect;
if (wndconfig->monitor) if (wndconfig->monitor)
contentRect = [wndconfig->monitor->ns.screen frame]; contentRect = [getScreen(wndconfig->monitor->ns.displayID) frame];
else else
contentRect = NSMakeRect(0, 0, wndconfig->width, wndconfig->height); contentRect = NSMakeRect(0, 0, wndconfig->width, wndconfig->height);