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

OS X hidden cursor cleanup.

Browse Source
This commit is contained in:
Camilla Berglund 2013-04-21 22:46:35 +02:00
parent 74d6a5d883
commit a2745574c8
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cocoa_init.m
View File

@ -124,6 +124,9 @@ void _glfwPlatformTerminate(void)
[_glfw.ns.autoreleasePool release];
_glfw.ns.autoreleasePool = nil;
[_glfw.ns.cursor release];
_glfw.ns.cursor = nil;
_glfwTerminateJoysticks();
_glfwTerminateContextAPI();

1
src/cocoa_platform.h
View File

@ -107,6 +107,7 @@ typedef struct _GLFWlibraryNS
CGEventSourceRef eventSource;
id delegate;
id autoreleasePool;
id cursor;
char* clipboardString;

28
src/cocoa_window.m
View File

@ -48,15 +48,12 @@
@implementation GLFWWindowDelegate
static void resetMouseCursor(_GLFWwindow *window)
{
if (window->cursorMode == GLFW_CURSOR_CAPTURED)
static void centerCursor(_GLFWwindow *window)
{
int width, height;
_glfwPlatformGetWindowSize(window, &width, &height);
_glfwPlatformSetCursorPos(window, width / 2.0, height / 2.0);
}
}
- (id)initWithGlfwWindow:(_GLFWwindow *)initWindow
{
@ -82,7 +79,8 @@ static void resetMouseCursor(_GLFWwindow *window)
_glfwInputWindowSize(window, width, height);
_glfwInputWindowDamage(window);
resetMouseCursor(window);
if (window->cursorMode == GLFW_CURSOR_CAPTURED)
centerCursor(window);
}
- (void)windowDidMove:(NSNotification *)notification
@ -93,7 +91,8 @@ static void resetMouseCursor(_GLFWwindow *window)
_glfwPlatformGetWindowPos(window, &x, &y);
_glfwInputWindowPos(window, x, y);
resetMouseCursor(window);
if (window->cursorMode == GLFW_CURSOR_CAPTURED)
centerCursor(window);
}
- (void)windowDidMiniaturize:(NSNotification *)notification
@ -110,7 +109,8 @@ static void resetMouseCursor(_GLFWwindow *window)
{
_glfwInputWindowFocus(window, GL_TRUE);
resetMouseCursor(window);
if (window->cursorMode == GLFW_CURSOR_CAPTURED)
centerCursor(window);
}
- (void)windowDidResignKey:(NSNotification *)notification
@ -310,8 +310,6 @@ static int convertMacKeyCode(unsigned int macKeyCode)
// Content view class for the GLFW window
//------------------------------------------------------------------------
static NSCursor *emptyCursor = nil;
@interface GLFWContentView : NSView
{
_GLFWwindow* window;
@ -328,9 +326,13 @@ static NSCursor *emptyCursor = nil;
{
if (self == [GLFWContentView class])
{
NSImage *emptyImage = [[NSImage alloc] initWithSize:NSMakeSize(1, 1)];
emptyCursor = [[NSCursor alloc] initWithImage:emptyImage hotSpot:NSZeroPoint];
[emptyImage release];
if (_glfw.ns.cursor == nil)
{
NSImage* data = [[NSImage alloc] initWithSize:NSMakeSize(1, 1)];
_glfw.ns.cursor = [[NSCursor alloc] initWithImage:data
hotSpot:NSZeroPoint];
[data release];
}
}
}
@ -509,7 +511,7 @@ static NSCursor *emptyCursor = nil;
- (void)resetCursorRects
{
[self addCursorRect:[self bounds] cursor:emptyCursor];
[self addCursorRect:[self bounds] cursor:_glfw.ns.cursor];
}
@end