winemac.drv: Create a protocol to represent a cursor clipping handler.

dlls/winemac.drv/cocoa_app.h

@@ -67,8 +67,8 @@ enum {
 
 
 @class WineEventQueue;
-@class WineEventTapClipCursorHandler;
 @class WineWindow;
+@protocol WineClipCursorHandler;
 
 
 @interface WineApplicationController : NSObject <NSApplicationDelegate>
@@ -121,7 +121,7 @@ enum {
 
     NSTimeInterval lastSetCursorPositionTime;
 
-    WineEventTapClipCursorHandler* clipCursorHandler;
+    id<WineClipCursorHandler> clipCursorHandler;
 
     NSImage* applicationIcon;
 

dlls/winemac.drv/cocoa_app.m

@@ -1148,10 +1148,13 @@ static NSString* WineLocalizedString(unsigned int stringID)
 
         if ([windowsBeingDragged count])
             ret = FALSE;
-        else if (self.clippingCursor)
+        else if (self.clippingCursor && [clipCursorHandler respondsToSelector:@selector(setCursorPosition:)])
             ret = [clipCursorHandler setCursorPosition:pos];
         else
         {
+            if (self.clippingCursor)
+                [clipCursorHandler clipCursorLocation:&pos];
+
             // 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

dlls/winemac.drv/cocoa_cursorclipping.h

@@ -21,15 +21,8 @@
 
 #import <AppKit/AppKit.h>
 
-@interface WineEventTapClipCursorHandler : NSObject
-{
-    BOOL clippingCursor;
-    CGRect cursorClipRect;
-    CFMachPortRef cursorClippingEventTap;
-    NSMutableArray* warpRecords;
-    CGPoint synthesizedLocation;
-    NSTimeInterval lastEventTapEventTime;
-}
+
+@protocol WineClipCursorHandler <NSObject>
 
 @property (readonly, nonatomic) BOOL clippingCursor;
 @property (readonly, nonatomic) CGRect cursorClipRect;
@@ -41,6 +34,24 @@
 
     - (void) setRetinaMode:(int)mode;
 
+    @optional
+    /* If provided, should reposition the cursor as needed given the current
+     * clipping rect. If not provided, the location will be clipped by
+     * -clipCursorLocation, and the cursor will be warped normally.
+     */
     - (BOOL) setCursorPosition:(CGPoint)pos;
 
 @end
+
+
+@interface WineEventTapClipCursorHandler : NSObject <WineClipCursorHandler>
+{
+    BOOL clippingCursor;
+    CGRect cursorClipRect;
+    CFMachPortRef cursorClippingEventTap;
+    NSMutableArray* warpRecords;
+    CGPoint synthesizedLocation;
+    NSTimeInterval lastEventTapEventTime;
+}
+
+@end