Skip to content
Permalink
Browse files

Mac: avoid calling CGSetLocalEventsSuppressionInterval, it was deprec…

…ated in OS X 10.6.
  • Loading branch information
slime73 committed Mar 20, 2016
1 parent 2c3bf66 commit 08488e6d34462635f01e15179814450ba9c56397
Showing with 9 additions and 8 deletions.
  1. +8 −6 src/video/cocoa/SDL_cocoamouse.m
  2. +1 −2 src/video/cocoa/SDL_cocoamousetap.m
@@ -226,13 +226,15 @@ + (NSCursor *)invisibleCursor

Cocoa_HandleMouseWarp(point.x, point.y);

/* According to the docs, this was deprecated in 10.6, but it's still
* around. The substitute requires a CGEventSource, but I'm not entirely
* sure how we'd procure the right one for this event.
*/
CGSetLocalEventsSuppressionInterval(0.0);
CGWarpMouseCursorPosition(point);
CGSetLocalEventsSuppressionInterval(0.25);

/* CGWarpMouse causes a short delay by default, which is preventable by
* Calling this directly after. CGSetLocalEventsSuppressionInterval can also
* prevent it, but it's deprecated as of OS X 10.6.
*/
if (!mouse->relative_mode) {
CGAssociateMouseAndMouseCursorPosition(YES);
}

/* CGWarpMouseCursorPosition doesn't generate a window event, unlike our
* other implementations' APIs. Send what's appropriate.
@@ -115,9 +115,8 @@
newLocation.y += (eventLocation.y - NSMaxY(windowRect) + 1);
}

CGSetLocalEventsSuppressionInterval(0);
CGWarpMouseCursorPosition(newLocation);
CGSetLocalEventsSuppressionInterval(0.25);
CGAssociateMouseAndMouseCursorPosition(YES);

if ((CGEventMaskBit(type) & movementEventsMask) == 0) {
/* For click events, we just constrain the event to the window, so

0 comments on commit 08488e6

Please sign in to comment.