pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mac: Fix incorrect relative jump on focus / start.

Browse source 
We should no longer send huge jumps on relative mode focus changes if
the cursor was moved around, or on initial start.

Fixes http://bugzilla.libsdl.org/show_bug.cgi?id=1836
This commit is contained in:
Jørgen P. Tjernø 2013-06-04 14:54:49 -07:00
parent 95cf57b19f
commit f1fc414daa
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/video/cocoa/SDL_cocoamouse.m
View file

@ -224,10 +224,12 @@ Cocoa_WarpMouse(SDL_Window * window, int x, int y)
CGWarpMouseCursorPosition(point); CGWarpMouseCursorPosition(point);
CGSetLocalEventsSuppressionInterval(0.25); CGSetLocalEventsSuppressionInterval(0.25);
/* CGWarpMouseCursorPosition doesn't generate a window event, unlike our if (!mouse->relative_mode) {
* other implementations' APIs. /* CGWarpMouseCursorPosition doesn't generate a window event, unlike our
*/ * other implementations' APIs.
SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 0, x, y); */
SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 0, x, y);
}
} }
static int static int

3
src/video/cocoa/SDL_cocoawindow.m
View file

@ -240,12 +240,13 @@ static __inline__ void ConvertNSRect(NSRect *r)
- (void)windowDidBecomeKey:(NSNotification *)aNotification - (void)windowDidBecomeKey:(NSNotification *)aNotification
{ {
SDL_Window *window = _data->window; SDL_Window *window = _data->window;
SDL_Mouse *mouse = SDL_GetMouse();
/* We're going to get keyboard events, since we're key. */ /* We're going to get keyboard events, since we're key. */
SDL_SetKeyboardFocus(window); SDL_SetKeyboardFocus(window);
/* If we just gained focus we need the updated mouse position */ /* If we just gained focus we need the updated mouse position */
{ if (!mouse->relative_mode) {
NSPoint point; NSPoint point;
int x, y; int x, y;