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

Fixed cursor positioning on OS X.

Browse Source
This commit is contained in:
Camilla Berglund 2013-05-22 18:03:54 +02:00
parent a8a69006ff
commit 0b5de6dd28
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cocoa_window.m
View File

@ -60,6 +60,15 @@ static void leaveFullscreenMode(_GLFWwindow* window)
[window->ns.view exitFullScreenModeWithOptions:nil]; [window->ns.view exitFullScreenModeWithOptions:nil];
} }
// Transforms the specified y-coordinate between the CG display and NS screen
// coordinate systems
//
static float transformY(float y)
{
const float height = CGDisplayBounds(CGMainDisplayID()).size.height;
return height - y;
}
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// Delegate for window related notifications // Delegate for window related notifications
@ -941,21 +950,18 @@ void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y)
{ {
if (window->monitor) if (window->monitor)
{ {
CGPoint globalPoint = CGPointMake(x, y); CGDisplayMoveCursorToPoint(window->monitor->ns.displayID,
CGDisplayMoveCursorToPoint(CGMainDisplayID(), globalPoint); CGPointMake(x, y));
} }
else else
{ {
const NSRect contentRect = const NSRect contentRect =
[window->ns.object contentRectForFrameRect:[window->ns.object frame]]; [window->ns.object contentRectForFrameRect:[window->ns.object frame]];
NSPoint localPoint = NSMakePoint(x, contentRect.size.height - y - 1); const NSPoint localPoint = NSMakePoint(x, contentRect.size.height - y - 1);
NSPoint globalPoint = [window->ns.object convertBaseToScreen:localPoint]; const NSPoint globalPoint = [window->ns.object convertBaseToScreen:localPoint];
CGPoint mainScreenOrigin = CGDisplayBounds(CGMainDisplayID()).origin;
double mainScreenHeight = CGDisplayBounds(CGMainDisplayID()).size.height; CGWarpMouseCursorPosition(CGPointMake(globalPoint.x,
CGPoint targetPoint = CGPointMake(globalPoint.x - mainScreenOrigin.x, transformY(globalPoint.y)));
mainScreenHeight - globalPoint.y -
mainScreenOrigin.y);
CGDisplayMoveCursorToPoint(CGMainDisplayID(), targetPoint);
} }
} }