gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 10:48:51 -05:00
Code Issues Projects Releases Wiki Activity

Fixed cursor positioning in fullscreen on Cocoa.

Browse Source
This commit is contained in:
Camilla Berglund 2012-07-02 15:23:36 +02:00
parent ee66e5fa10
commit e7c4e77214
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readme.html
View File

@ -332,6 +332,8 @@ version of GLFW.</p>
<li>[Cocoa] Bugfix: The OpenGL framework was not retrieved, making glfwGetProcAddress crash</li> <li>[Cocoa] Bugfix: The OpenGL framework was not retrieved, making glfwGetProcAddress crash</li>
<li>[Cocoa] Bugfix: <code>glfwInit</code> changed the current directory for unbundled executables</li> <li>[Cocoa] Bugfix: <code>glfwInit</code> changed the current directory for unbundled executables</li>
<li>[Cocoa] Bugfix: The <code>GLFW_WINDOW_NO_RESIZE</code> window parameter was always zero</li> <li>[Cocoa] Bugfix: The <code>GLFW_WINDOW_NO_RESIZE</code> window parameter was always zero</li>
<li>[Cocoa] Bugfix: The cursor position incorrectly rounded during conversion</li>
<li>[Cocoa] Bugfix: Cursor positioning led to nonsensical results for fullscreen windows</li>
<li>[X11] Added support for the <code>GLX_EXT_swap_control</code> extension as an alternative to <code>GLX_SGI_swap_control</code></li> <li>[X11] Added support for the <code>GLX_EXT_swap_control</code> extension as an alternative to <code>GLX_SGI_swap_control</code></li>
<li>[X11] Added the POSIX <code>CLOCK_MONOTONIC</code> time source as the preferred method</li> <li>[X11] Added the POSIX <code>CLOCK_MONOTONIC</code> time source as the preferred method</li>
<li>[X11] Added dependency on libm, where present</li> <li>[X11] Added dependency on libm, where present</li>

35
src/cocoa_window.m
View File

@ -1158,25 +1158,22 @@ void _glfwPlatformWaitEvents( void )
void _glfwPlatformSetCursorPos(_GLFWwindow* window, int x, int y) void _glfwPlatformSetCursorPos(_GLFWwindow* window, int x, int y)
{ {
// The library seems to assume that after calling this the cursor won't move, if (window->mode == GLFW_FULLSCREEN)
// but obviously it will, and escape the app's window, and activate other apps, {
// and other badness in pain. I think the API's just silly, but maybe I'm NSPoint globalPoint = NSMakePoint(x, y);
// misunderstanding it... CGDisplayMoveCursorToPoint(CGMainDisplayID(), globalPoint);
}
// Also, (x, y) are window coords... else
{
// Also, it doesn't seem possible to write this robustly without NSPoint localPoint = NSMakePoint(x, window->height - y - 1);
// calculating the maximum y coordinate of all screens, since Cocoa's NSPoint globalPoint = [window->NS.object convertBaseToScreen:localPoint];
// "global coordinates" are upside down from CG's... CGPoint mainScreenOrigin = CGDisplayBounds(CGMainDisplayID()).origin;
double mainScreenHeight = CGDisplayBounds(CGMainDisplayID()).size.height;
NSPoint localPoint = NSMakePoint(x, window->height - y - 1); CGPoint targetPoint = CGPointMake(globalPoint.x - mainScreenOrigin.x,
NSPoint globalPoint = [window->NS.object convertBaseToScreen:localPoint]; mainScreenHeight - globalPoint.y -
CGPoint mainScreenOrigin = CGDisplayBounds(CGMainDisplayID()).origin; mainScreenOrigin.y);
double mainScreenHeight = CGDisplayBounds(CGMainDisplayID()).size.height; CGDisplayMoveCursorToPoint(CGMainDisplayID(), targetPoint);
CGPoint targetPoint = CGPointMake(globalPoint.x - mainScreenOrigin.x, }
mainScreenHeight - globalPoint.y -
mainScreenOrigin.y);
CGDisplayMoveCursorToPoint(CGMainDisplayID(), targetPoint);
} }