Actually, hold off on merging these. I need to make sure that when the driver stops clipping, it also updates the Win32 side of things. Probably that will mean no direct calls to -stopClippingCursor, and instead effectively calling ClipCursor(NULL). October 14, 2021 11:39 AM, "Tim Clem" <tclem(a)codeweavers.com> wrote:
We no longer enable or disable the event tap manually, and it re-enables itself on kCGEventTapDisabledByTimeout, so this check is not needed.
Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index bd2ef4c8b1e3..0f8a9c0876ad 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1473,8 +1473,7 @@ - (BOOL) startClippingCursor:(CGRect)rect if (!cursorClippingEventTap && ![self installEventTap]) return FALSE;
- if (clippingCursor && CGRectEqualToRect(rect, cursorClipRect) && - CGEventTapIsEnabled(cursorClippingEventTap)) + if (clippingCursor && CGRectEqualToRect(rect, cursorClipRect)) return TRUE;
err = CGAssociateMouseAndMouseCursorPosition(false); -- 2.33.0