winemac: Implement SetCursor() and DestroyCursorIcon().

dlls/winemac.drv/cocoa_app.h

@@ -50,6 +50,11 @@
     NSMutableArray* orderedWineWindows;
 
     NSMutableDictionary* originalDisplayModes;
+
+    NSArray*    cursorFrames;
+    int         cursorFrame;
+    NSTimer*    cursorTimer;
+    BOOL        cursorHidden;
 }
 
 @property (nonatomic) CGEventSourceKeyboardType keyboardType;

dlls/winemac.drv/cocoa_app.m

@@ -31,6 +31,8 @@ int macdrv_err_on;
 @interface WineApplication ()
 
 @property (readwrite, copy, nonatomic) NSEvent* lastFlagsChanged;
+@property (copy, nonatomic) NSArray* cursorFrames;
+@property (retain, nonatomic) NSTimer* cursorTimer;
 
 @end
 
@@ -39,6 +41,7 @@ int macdrv_err_on;
 
     @synthesize keyboardType, lastFlagsChanged;
     @synthesize orderedWineWindows;
+    @synthesize cursorFrames, cursorTimer;
 
     - (id) init
     {
@@ -65,6 +68,8 @@ int macdrv_err_on;
 
     - (void) dealloc
     {
+        [cursorTimer release];
+        [cursorFrames release];
         [originalDisplayModes release];
         [orderedWineWindows release];
         [keyWindows release];
@@ -460,6 +465,89 @@ int macdrv_err_on;
         return ([originalDisplayModes count] > 0);
     }
 
+    - (void) hideCursor
+    {
+        if (!cursorHidden)
+        {
+            [NSCursor hide];
+            cursorHidden = TRUE;
+        }
+    }
+
+    - (void) unhideCursor
+    {
+        if (cursorHidden)
+        {
+            [NSCursor unhide];
+            cursorHidden = FALSE;
+        }
+    }
+
+    - (void) setCursor
+    {
+        NSDictionary* frame = [cursorFrames objectAtIndex:cursorFrame];
+        CGImageRef cgimage = (CGImageRef)[frame objectForKey:@"image"];
+        NSImage* image = [[NSImage alloc] initWithCGImage:cgimage size:NSZeroSize];
+        CFDictionaryRef hotSpotDict = (CFDictionaryRef)[frame objectForKey:@"hotSpot"];
+        CGPoint hotSpot;
+        NSCursor* cursor;
+
+        if (!CGPointMakeWithDictionaryRepresentation(hotSpotDict, &hotSpot))
+            hotSpot = CGPointZero;
+        cursor = [[NSCursor alloc] initWithImage:image hotSpot:NSPointFromCGPoint(hotSpot)];
+        [image release];
+        [cursor set];
+        [self unhideCursor];
+        [cursor release];
+    }
+
+    - (void) nextCursorFrame:(NSTimer*)theTimer
+    {
+        NSDictionary* frame;
+        NSTimeInterval duration;
+        NSDate* date;
+
+        cursorFrame++;
+        if (cursorFrame >= [cursorFrames count])
+            cursorFrame = 0;
+        [self setCursor];
+
+        frame = [cursorFrames objectAtIndex:cursorFrame];
+        duration = [[frame objectForKey:@"duration"] doubleValue];
+        date = [[theTimer fireDate] dateByAddingTimeInterval:duration];
+        [cursorTimer setFireDate:date];
+    }
+
+    - (void) setCursorWithFrames:(NSArray*)frames
+    {
+        if (self.cursorFrames == frames)
+            return;
+
+        self.cursorFrames = frames;
+        cursorFrame = 0;
+        [cursorTimer invalidate];
+        self.cursorTimer = nil;
+
+        if ([frames count])
+        {
+            if ([frames count] > 1)
+            {
+                NSDictionary* frame = [frames objectAtIndex:0];
+                NSTimeInterval duration = [[frame objectForKey:@"duration"] doubleValue];
+                NSDate* date = [NSDate dateWithTimeIntervalSinceNow:duration];
+                self.cursorTimer = [[[NSTimer alloc] initWithFireDate:date
+                                                             interval:1000000
+                                                               target:self
+                                                             selector:@selector(nextCursorFrame:)
+                                                             userInfo:nil
+                                                              repeats:YES] autorelease];
+                [[NSRunLoop currentRunLoop] addTimer:cursorTimer forMode:NSRunLoopCommonModes];
+            }
+
+            [self setCursor];
+        }
+    }
+
 
     /*
      * ---------- NSApplication method overrides ----------
@@ -673,3 +761,57 @@ int macdrv_set_display_mode(const struct macdrv_display* display,
 
     return ret;
 }
+
+/***********************************************************************
+ *              macdrv_set_cursor
+ *
+ * Set the cursor.
+ *
+ * If name is non-NULL, it is a selector for a class method on NSCursor
+ * identifying the cursor to set.  In that case, frames is ignored.  If
+ * name is NULL, then frames is used.
+ *
+ * frames is an array of dictionaries.  Each dictionary is a frame of
+ * an animated cursor.  Under the key "image" is a CGImage for the
+ * frame.  Under the key "duration" is a CFNumber time interval, in
+ * seconds, for how long that frame is presented before proceeding to
+ * the next frame.  Under the key "hotSpot" is a CFDictionary encoding a
+ * CGPoint, to be decoded using CGPointMakeWithDictionaryRepresentation().
+ * This is the hot spot, measured in pixels down and to the right of the
+ * top-left corner of the image.
+ *
+ * If the array has exactly 1 element, the cursor is static, not
+ * animated.  If frames is NULL or has 0 elements, the cursor is hidden.
+ */
+void macdrv_set_cursor(CFStringRef name, CFArrayRef frames)
+{
+    SEL sel;
+
+    sel = NSSelectorFromString((NSString*)name);
+    if (sel)
+    {
+        OnMainThreadAsync(^{
+            NSCursor* cursor = [NSCursor performSelector:sel];
+            [NSApp setCursorWithFrames:nil];
+            [cursor set];
+            [NSApp unhideCursor];
+        });
+    }
+    else
+    {
+        NSArray* nsframes = (NSArray*)frames;
+        if ([nsframes count])
+        {
+            OnMainThreadAsync(^{
+                [NSApp setCursorWithFrames:nsframes];
+            });
+        }
+        else
+        {
+            OnMainThreadAsync(^{
+                [NSApp setCursorWithFrames:nil];
+                [NSApp hideCursor];
+            });
+        }
+    }
+}

dlls/winemac.drv/macdrv.h

@@ -35,6 +35,8 @@
 #include "wine/gdi_driver.h"
 
 
+extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN;
+
 static inline CGRect cgrect_from_rect(RECT rect)
 {
     if (rect.left >= rect.right || rect.top >= rect.bottom)

dlls/winemac.drv/macdrv_cocoa.h

@@ -118,6 +118,10 @@ extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLS
 extern void macdrv_beep(void) DECLSPEC_HIDDEN;
 
 
+/* cursor */
+extern void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) DECLSPEC_HIDDEN;
+
+
 /* display */
 extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN;
 extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN;

dlls/winemac.drv/macdrv_main.c

@@ -30,6 +30,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv);
 DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES;
 
 
+/**************************************************************************
+ *              debugstr_cf
+ */
+const char* debugstr_cf(CFTypeRef t)
+{
+    CFStringRef s;
+    const char* ret;
+
+    if (!t) return "(null)";
+
+    if (CFGetTypeID(t) == CFStringGetTypeID())
+        s = t;
+    else
+        s = CFCopyDescription(t);
+    ret = CFStringGetCStringPtr(s, kCFStringEncodingUTF8);
+    if (ret) ret = debugstr_a(ret);
+    if (!ret)
+    {
+        const UniChar* u = CFStringGetCharactersPtr(s);
+        if (u)
+            ret = debugstr_wn((const WCHAR*)u, CFStringGetLength(s));
+    }
+    if (!ret)
+    {
+        UniChar buf[200];
+        int len = min(CFStringGetLength(s), sizeof(buf)/sizeof(buf[0]));
+        CFStringGetCharacters(s, CFRangeMake(0, len), buf);
+        ret = debugstr_wn(buf, len);
+    }
+    if (s != t) CFRelease(s);
+    return ret;
+}
+
+
 /***********************************************************************
  *              process_attach
  */

dlls/winemac.drv/winemac.drv.spec

@@ -9,6 +9,7 @@
 @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) macdrv_ChangeDisplaySettingsEx
 @ cdecl CreateDesktopWindow(long) macdrv_CreateDesktopWindow
 @ cdecl CreateWindow(long) macdrv_CreateWindow
+@ cdecl DestroyCursorIcon(long) macdrv_DestroyCursorIcon
 @ cdecl DestroyWindow(long) macdrv_DestroyWindow
 @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors
 @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx
@@ -19,6 +20,7 @@
 @ cdecl MapVirtualKeyEx(long long long) macdrv_MapVirtualKeyEx
 @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx
 @ cdecl ScrollDC(long long long ptr ptr long ptr) macdrv_ScrollDC
+@ cdecl SetCursor(long) macdrv_SetCursor
 @ cdecl SetFocus(long) macdrv_SetFocus
 @ cdecl SetLayeredWindowAttributes(long long long long) macdrv_SetLayeredWindowAttributes
 @ cdecl SetParent(long long long) macdrv_SetParent