winemac: Add another workaround for bad side effects of CGWarpMouseCursorPosition().

Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Ken Thomases 2015-10-28 17:01:54 -05:00 committed by Alexandre Julliard
parent 585028be18
commit 9d6a14305a
1 changed files with 16 additions and 9 deletions

View File

@ -1307,20 +1307,27 @@ - (BOOL) setCursorPosition:(CGPoint)pos
}
else
{
// Annoyingly, CGWarpMouseCursorPosition() effectively disassociates
// the mouse from the cursor position for 0.25 seconds. This means
// that mouse movement during that interval doesn't move the cursor
// and events carry a constant location (the warped-to position)
// even though they have delta values. For apps which warp the
// cursor frequently (like after every mouse move), this makes
// cursor movement horribly laggy and jerky, as only a fraction of
// mouse move events have any effect.
//
// On some versions of OS X, it's sufficient to forcibly reassociate
// the mouse and cursor position. On others, it's necessary to set
// the local events suppression interval to 0 for the warp. That's
// deprecated, but I'm not aware of any other way. For good
// measure, we do both.
CGSetLocalEventsSuppressionInterval(0);
ret = (CGWarpMouseCursorPosition(pos) == kCGErrorSuccess);
CGSetLocalEventsSuppressionInterval(0.25);
if (ret)
{
lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime];
// Annoyingly, CGWarpMouseCursorPosition() effectively disassociates
// the mouse from the cursor position for 0.25 seconds. This means
// that mouse movement during that interval doesn't move the cursor
// and events carry a constant location (the warped-to position)
// even though they have delta values. This screws us up because
// the accumulated deltas we send to Wine don't match any eventual
// absolute position we send (like with a button press). We can
// work around this by simply forcibly reassociating the mouse and
// cursor position.
CGAssociateMouseAndMouseCursorPosition(true);
}
}