Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-04-06 08:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: Patched use of macOS 10.9 window occlusion API for macOS 10.8 compatibility

Browse Source 
This fixes building against macOS SDKs older than 10.9, noted in #2161.
This commit is contained in:
Ned Loynd 2023-01-17 08:55:01 +11:00
parent 57cbded076
commit 931b3e8d23
No known key found for this signature in database
GPG Key ID: ECE43229EE056ECC
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.md
View File

@ -124,6 +124,7 @@ video tutorials.
- Marco Lizza - Marco Lizza
- Eyal Lotem - Eyal Lotem
- Aaron Loucks - Aaron Loucks
- Ned Loynd
- Luflosi - Luflosi
- lukect - lukect
- Tristam MacDonald - Tristam MacDonald

1
README.md
View File

@ -269,6 +269,7 @@ information on what to include when reporting a bug.
application (#2110) application (#2110)
- [Cocoa] Bugfix: The Vulkan loader was not loaded from the `Frameworks` bundle - [Cocoa] Bugfix: The Vulkan loader was not loaded from the `Frameworks` bundle
subdirectory (#2113,#2120) subdirectory (#2113,#2120)
- [Cocoa] Bugfix: Patched use of macOS 10.9 window occlusion API for macOS 10.8 compatibility
- [X11] Bugfix: The CMake files did not check for the XInput headers (#1480) - [X11] Bugfix: The CMake files did not check for the XInput headers (#1480)
- [X11] Bugfix: Key names were not updated when the keyboard layout changed - [X11] Bugfix: Key names were not updated when the keyboard layout changed
(#1462,#1528) (#1462,#1528)

12
src/cocoa_window.m
View File

@ -37,6 +37,12 @@
// having been (according to documentation) added in Mac OS X 10.7 // having been (according to documentation) added in Mac OS X 10.7
#define NSWindowCollectionBehaviorFullScreenNone (1 << 9) #define NSWindowCollectionBehaviorFullScreenNone (1 << 9)
// HACK: This enum value is only available on Mac OS X 10.9 onwards,
// so it needs to be defined on prior versions
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
#define NSWindowOcclusionStateVisible (1UL << 1)
#endif
// Returns whether the cursor is in the content area of the specified window // Returns whether the cursor is in the content area of the specified window
// //
static GLFWbool cursorInContentArea(_GLFWwindow* window) static GLFWbool cursorInContentArea(_GLFWwindow* window)
@ -311,7 +317,11 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
- (void)windowDidChangeOcclusionState:(NSNotification* )notification - (void)windowDidChangeOcclusionState:(NSNotification* )notification
{ {
if ([window->ns.object occlusionState] & NSWindowOcclusionStateVisible) if (
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
[window->ns.object respondsToSelector:@selector(occlusionState)] && (NSUInteger)
#endif
[window->ns.object occlusionState] & NSWindowOcclusionStateVisible)
window->ns.occluded = GLFW_FALSE; window->ns.occluded = GLFW_FALSE;
else else
window->ns.occluded = GLFW_TRUE; window->ns.occluded = GLFW_TRUE;