SDL_DragEvent: Add SDL_DragEvents

include/SDL_events.h

@@ -157,6 +157,12 @@ typedef enum
     /* Pan events */
     SDL_PANEVENT = 0x2100,
 
+    /* Drag events */
+    SDL_DRAGFILE = 0x2200,
+    SDL_DRAGTEXT,
+    SDL_DRAGBEGIN,
+    SDL_DRAGCOMPLETE,
+
     /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use,
      *  and should be allocated with SDL_RegisterEvents()
      */
@@ -533,6 +539,16 @@ typedef struct SDL_DropEvent
 } SDL_DropEvent;
 
 
+typedef struct SDL_DragEvent
+{
+    Uint32 type;
+    Uint32 timestamp;
+    char *file;
+    Uint32 windowID;
+    Sint32 x;
+    Sint32 y;
+} SDL_DragEvent;
+
 /**
  *  \brief Sensor event structure (event.sensor.*)
  */
@@ -624,7 +640,7 @@ typedef union SDL_Event
     SDL_MultiGestureEvent mgesture; /**< Gesture event data */
     SDL_DollarGestureEvent dgesture; /**< Gesture event data */
     SDL_DropEvent drop;             /**< Drag and drop event data */
-
+    SDL_DragEvent drag;
     SDL_PanEvent pan; /**< Obsolesces mouse wheel events */
 
     /* This is necessary for ABI compatibility between Visual C++ and GCC

src/events/SDL_dragevents.c

@@ -0,0 +1,64 @@
+#include "../SDL_internal.h"
+
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+#include "SDL_dragevents_c.h"
+
+#include "../video/SDL_sysvideo.h"  /* for SDL_Window internals. */
+
+const int
+SDL_SendDrag(SDL_Window *window, const SDL_EventType evtype, const char *data, int x, int y)
+{
+    static SDL_bool app_is_dragging = SDL_FALSE;
+    int posted = 0;
+
+    const SDL_bool need_begin = window ? !window->is_dragging : !app_is_dragging;
+    SDL_Event event;
+
+    if (need_begin) {
+        SDL_zero(event);
+        event.type = SDL_DRAGBEGIN;
+        event.drag.x = x;
+        event.drag.y = y;
+
+        if (window) {
+            event.drag.windowID = window->id;
+        }
+
+        posted = (SDL_PushEvent(&event) > 0);
+        if (!posted) {
+            return 0;
+        }
+        if (window) {
+            window->is_dragging = SDL_TRUE;
+        } else {
+            app_is_dragging = SDL_TRUE;
+        }
+    }
+
+    SDL_zero(event);
+    event.type = evtype;
+    event.drag.file = data ? SDL_strdup(data) : NULL;
+    event.drag.windowID = window ? window->id : 0;
+    event.drag.x = x;
+    event.drag.y = y;
+    posted = (SDL_PushEvent(&event) > 0);
+
+    if (posted && (evtype == SDL_DRAGCOMPLETE)) {
+        if (window) {
+            window->is_dragging = SDL_FALSE;
+        } else {
+            app_is_dragging = SDL_FALSE;
+        }
+    }
+    return posted;
+}
+
+int SDL_SendDragFile(SDL_Window *window, const char *file, int x, int y)
+{
+    return SDL_SendDrag(window, SDL_DRAGFILE, file, x, y);
+}
+
+int SDL_SendDragComplete(SDL_Window *window, int x, int y) {
+    return SDL_SendDrag(window, SDL_DRAGCOMPLETE, NULL, x, y);
+}

src/events/SDL_dragevents_c.h

@@ -0,0 +1,8 @@
+#include "../SDL_internal.h"
+
+#ifndef SDL_dragevents_c_h_
+#define SDL_dragevents_c_h_
+
+extern int SDL_SendDragFile(SDL_Window *window, const char *file, int x, int y);
+extern int SDL_SendDragComplete(SDL_Window *window, int x, int y);
+#endif

src/events/SDL_events_c.h

@@ -31,6 +31,7 @@
 
 #include "SDL_clipboardevents_c.h"
 #include "SDL_displayevents_c.h"
+#include "SDL_dragevents_c.h"
 #include "SDL_dropevents_c.h"
 #include "SDL_gesture_c.h"
 #include "SDL_keyboard_c.h"

src/video/SDL_sysvideo.h

@@ -100,6 +100,7 @@ struct SDL_Window
     SDL_bool is_hiding;
     SDL_bool is_destroying;
     SDL_bool is_dropping;       /* drag/drop in progress, expecting SDL_SendDropComplete(). */
+    SDL_bool is_dragging;
 
     SDL_WindowShaper *shaper;
 
@@ -380,11 +381,11 @@ struct SDL_VideoDevice
     /* Data private to this driver */
     void *driverdata;
     struct SDL_GLDriverData *gl_data;
-    
+
 #if SDL_VIDEO_OPENGL_EGL
     struct SDL_EGL_VideoData *egl_data;
 #endif
-    
+
 #if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
     struct SDL_PrivateGLESData *gles_data;
 #endif

src/video/cocoa/SDL_cocoawindow.m

@@ -34,6 +34,7 @@
 #include "../../events/SDL_mouse_c.h"
 #include "../../events/SDL_touch_c.h"
 #include "../../events/SDL_windowevents_c.h"
+#include "../../events/SDL_dragevents_c.h"
 #include "../../events/SDL_dropevents_c.h"
 #include "SDL_cocoavideo.h"
 #include "SDL_cocoashape.h"
@@ -139,6 +140,57 @@ - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
     return NSDragOperationNone; /* no idea what to do with this, reject it. */
 }
 
+- (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender
+{
+    NSPasteboard *pasteboard = [sender draggingPasteboard];
+    NSArray *types = [NSArray arrayWithObject:NSFilenamesPboardType];
+    NSString *desiredType = [pasteboard availableTypeFromArray:types];
+    SDL_Window *sdlwindow = [self findSDLWindow];
+    NSPoint point = [sender draggingLocation];
+
+    if (desiredType == nil) {
+        return NSDragOperationNone;
+    }
+
+    NSData *data = [pasteboard dataForType:desiredType];
+    if (data == nil) {
+        return NSDragOperationNone;
+    }
+
+    SDL_assert([desiredType isEqualToString:NSFilenamesPboardType]);
+    NSArray *array = [pasteboard propertyListForType:@"NSFilenamesPboardType"];
+
+    for (NSString *path in array) {
+        NSURL *fileURL = [NSURL fileURLWithPath:path];
+        NSNumber *isAlias = nil;
+
+        [fileURL getResourceValue:&isAlias forKey:NSURLIsAliasFileKey error:nil];
+
+        if ([isAlias boolValue]) {
+            NSURLBookmarkResolutionOptions opts = NSURLBookmarkResolutionWithoutMounting | NSURLBookmarkResolutionWithoutUI;
+            NSData *bookmark = [NSURL bookmarkDataWithContentsOfURL:fileURL error:nil];
+            if (bookmark != nil) {
+                NSURL *resolvedURL = [NSURL URLByResolvingBookmarkData:bookmark
+                                                               options:opts
+                                                         relativeToURL:nil
+                                                   bookmarkDataIsStale:nil
+                                                                 error:nil];
+
+                if (resolvedURL != nil) {
+                    fileURL = resolvedURL;
+                }
+            }
+        }
+
+        if (!SDL_SendDragFile(sdlwindow, [[fileURL path] UTF8String], point.x, point.y)) {
+            return NSDragOperationNone;
+        }
+    }
+
+    SDL_SendDragComplete(sdlwindow, point.x, point.y);
+    return NSDragOperationGeneric;
+}
+
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 { @autoreleasepool
 {
@@ -711,7 +763,7 @@ - (void)windowDidFailToEnterFullScreen:(NSNotification *)aNotification
 
     isFullscreenSpace = NO;
     inFullscreenTransition = NO;
-    
+
     [self windowDidExitFullScreen:nil];
 }
 
@@ -727,7 +779,7 @@ - (void)windowDidEnterFullScreen:(NSNotification *)aNotification
         pendingWindowOperation = PENDING_OPERATION_NONE;
         [self setFullscreenSpace:NO];
     } else {
-        /* Unset the resizable flag. 
+        /* Unset the resizable flag.
            This is a workaround for https://bugzilla.libsdl.org/show_bug.cgi?id=3697
          */
         SetWindowStyle(window, [nswindow styleMask] & (~NSWindowStyleMaskResizable));
@@ -763,16 +815,16 @@ - (void)windowWillExitFullScreen:(NSNotification *)aNotification
 - (void)windowDidFailToExitFullScreen:(NSNotification *)aNotification
 {
     SDL_Window *window = _data->window;
-    
+
     if (window->is_destroying) {
         return;
     }
 
     SetWindowStyle(window, (NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskMiniaturizable|NSWindowStyleMaskResizable));
-    
+
     isFullscreenSpace = YES;
     inFullscreenTransition = NO;
-    
+
     [self windowDidEnterFullScreen:nil];
 }
 
@@ -1474,7 +1526,7 @@ - (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
     if (!(window->flags & SDL_WINDOW_OPENGL)) {
         return 0;
     }
-    
+
     /* The rest of this macro mess is for OpenGL or OpenGL ES windows */
 #if SDL_VIDEO_OPENGL_ES2
     if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) {
@@ -1894,7 +1946,7 @@ - (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
 
         NSArray *contexts = [[data->nscontexts copy] autorelease];
         for (SDLOpenGLContext *context in contexts) {
-            /* Calling setWindow:NULL causes the context to remove itself from the context list. */            
+            /* Calling setWindow:NULL causes the context to remove itself from the context list. */
             [context setWindow:NULL];
         }
         [data->nscontexts release];