We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Updated patch -- merged in changes since 2016-02, including new SendDropText and SendDropComplete.

patch.diff (text/plain), 7.59 KB, created by Nathan Daly on 2017-06-15 04:38:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Daly

Created: 2017-06-15 04:38:48 UTC

Size: 7.59 KB

patch

obsolete

># HG changeset patch
># User Nathan Daly <nhdaly@gmail.com>
># Date 1497501036 18000
>#      Wed Jun 14 23:30:36 2017 -0500
># Node ID 364cd18a80c68a4bf7976bc2a8b076e0e13ca287
># Parent  62a0a6e9b48b9e691cd48248bab3f1cc14126d34
># Parent  92199a782ded1e097a82103da4bec1ad2ed92be3
>Adds sourceApplication field to SDL_DropEvent, used for now only by iOS.
>
>- Added char* sourceApplication field to SDL_DropEvent.
>- Fills it in from SDLUIKitDelegate - application:(UIApplication *)application
>openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication
>annotation:(id)annotation
>  - The sourceApplication field of that method used to be ignored, and now is
>    passed to SDL.
>  - NOTE: The annotation field is still ignored.
>- NOTE: This change will introduce a memory leak in older code building on iOS,
>  because after this change clients MUST free() the sourceApplication.
>
>
>diff --git a/include/SDL_events.h b/include/SDL_events.h
>--- a/include/SDL_events.h
>+++ b/include/SDL_events.h
>@@ -468,6 +468,7 @@
>     Uint32 timestamp;
>     char *file;         /**< The file name, which should be freed with SDL_free(), is NULL on begin/complete */
>     Uint32 windowID;    /**< The window that was dropped on, if any */
>+    char *sourceApplication; /**< The source app that sent this drop event -- may be NULL if source is unknown. Should be freed with SDL_free(). */
> } SDL_DropEvent;
> 
> 
>diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
>--- a/src/core/android/SDL_android.c
>+++ b/src/core/android/SDL_android.c
>@@ -255,7 +255,7 @@
>                                     jstring filename)
> {
>     const char *path = (*env)->GetStringUTFChars(env, filename, NULL);
>-    SDL_SendDropFile(NULL, path);
>+    SDL_SendDropFile(NULL, path, NULL);
>     (*env)->ReleaseStringUTFChars(env, filename, path);
>     SDL_SendDropComplete(NULL);
> }
>diff --git a/src/events/SDL_dropevents.c b/src/events/SDL_dropevents.c
>--- a/src/events/SDL_dropevents.c
>+++ b/src/events/SDL_dropevents.c
>@@ -30,7 +30,7 @@
> 
> 
> static int
>-SDL_SendDrop(SDL_Window *window, const SDL_EventType evtype, const char *data)
>+SDL_SendDrop(SDL_Window *window, const SDL_EventType evtype, const char *data, const char *sourceApplication)
> {
>     static SDL_bool app_is_dropping = SDL_FALSE;
>     int posted = 0;
>@@ -63,6 +63,13 @@
>         event.type = evtype;
>         event.drop.file = data ? SDL_strdup(data) : NULL;
>         event.drop.windowID = window ? window->id : 0;
>+
>+        if (sourceApplication != NULL) {
>+            event.drop.sourceApplication = SDL_strdup(sourceApplication);
>+        } else {
>+            event.drop.sourceApplication = NULL;
>+        }
>+
>         posted = (SDL_PushEvent(&event) > 0);
> 
>         if (posted && (evtype == SDL_DROPCOMPLETE)) {
>@@ -77,21 +84,23 @@
> }
> 
> int
>-SDL_SendDropFile(SDL_Window *window, const char *file)
>+SDL_SendDropFile(SDL_Window *window, const char *file, const char *sourceApplication)
> {
>-    return SDL_SendDrop(window, SDL_DROPFILE, file);
>+    return SDL_SendDrop(window, SDL_DROPFILE, file, sourceApplication);
> }
> 
>+// TODO: Should this method also take and pass along a sourceApplication?
> int
> SDL_SendDropText(SDL_Window *window, const char *text)
> {
>-    return SDL_SendDrop(window, SDL_DROPTEXT, text);
>+    return SDL_SendDrop(window, SDL_DROPTEXT, text, NULL);
> }
> 
>+// TODO: Should this method also take and pass along a sourceApplication?
> int
> SDL_SendDropComplete(SDL_Window *window)
> {
>-    return SDL_SendDrop(window, SDL_DROPCOMPLETE, NULL);
>+    return SDL_SendDrop(window, SDL_DROPCOMPLETE, NULL, NULL);
> }
> 
> 
>diff --git a/src/events/SDL_dropevents_c.h b/src/events/SDL_dropevents_c.h
>--- a/src/events/SDL_dropevents_c.h
>+++ b/src/events/SDL_dropevents_c.h
>@@ -23,7 +23,7 @@
> #ifndef SDL_dropevents_c_h_
> #define SDL_dropevents_c_h_
> 
>-extern int SDL_SendDropFile(SDL_Window *window, const char *file);
>+extern int SDL_SendDropFile(SDL_Window *window, const char *file, const char *sourceApplication);
> extern int SDL_SendDropText(SDL_Window *window, const char *text);
> extern int SDL_SendDropComplete(SDL_Window *window);
> 
>diff --git a/src/video/cocoa/SDL_cocoaevents.m b/src/video/cocoa/SDL_cocoaevents.m
>--- a/src/video/cocoa/SDL_cocoaevents.m
>+++ b/src/video/cocoa/SDL_cocoaevents.m
>@@ -214,7 +214,7 @@
> 
> - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
> {
>-    return (BOOL)SDL_SendDropFile(NULL, [filename UTF8String]) && SDL_SendDropComplete(NULL);
>+    return (BOOL)SDL_SendDropFile(NULL, [filename UTF8String], NULL) && SDL_SendDropComplete(NULL);
> }
> @end
> 
>diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
>--- a/src/video/cocoa/SDL_cocoawindow.m
>+++ b/src/video/cocoa/SDL_cocoawindow.m
>@@ -168,7 +168,7 @@
>             }
>         }
> 
>-        if (!SDL_SendDropFile(sdlwindow, [[fileURL path] UTF8String])) {
>+        if (!SDL_SendDropFile(sdlwindow, [[fileURL path] UTF8String], NULL)) {
>             return NO;
>         }
>     }
>diff --git a/src/video/uikit/SDL_uikitappdelegate.m b/src/video/uikit/SDL_uikitappdelegate.m
>--- a/src/video/uikit/SDL_uikitappdelegate.m
>+++ b/src/video/uikit/SDL_uikitappdelegate.m
>@@ -502,13 +502,14 @@
>     SDL_OnApplicationDidBecomeActive();
> }
> 
>-- (void)sendDropFileForURL:(NSURL *)url
>+- (void)sendDropFileForURL:(NSURL *)url fromSourceApplication:(NSString *)sourceApplication
> {
>     NSURL *fileURL = url.filePathURL;
>+    char *sourceApplicationCString = sourceApplication ? [sourceApplication UTF8String] : NULL;
>     if (fileURL != nil) {
>-        SDL_SendDropFile(NULL, fileURL.path.UTF8String);
>+        SDL_SendDropFile(NULL, fileURL.path.UTF8String, sourceApplicationCString);
>     } else {
>-        SDL_SendDropFile(NULL, url.absoluteString.UTF8String);
>+        SDL_SendDropFile(NULL, url.absoluteString.UTF8String, sourceApplicationCString);
>     }
>     SDL_SendDropComplete(NULL);
> }
>@@ -518,7 +519,7 @@
> - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
> {
>     /* TODO: Handle options */
>-    [self sendDropFileForURL:url];
>+    [self sendDropFileForURL:url fromSourceApplication:NULL];
>     return YES;
> }
> #endif /* TARGET_OS_TV */
>@@ -526,7 +527,7 @@
> #if !TARGET_OS_TV
> - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
> {
>-    [self sendDropFileForURL:url];
>+    [self sendDropFileForURL:url fromSourceApplication:sourceApplication];
>     return YES;
> }
> #endif /* !TARGET_OS_TV */
>diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
>--- a/src/video/windows/SDL_windowsevents.c
>+++ b/src/video/windows/SDL_windowsevents.c
>@@ -946,7 +946,7 @@
>                 if (buffer) {
>                     if (DragQueryFile(drop, i, buffer, size)) {
>                         char *file = WIN_StringToUTF8(buffer);
>-                        SDL_SendDropFile(data->window, file);
>+                        SDL_SendDropFile(data->window, file, NULL);
>                         SDL_free(file);
>                     }
>                     SDL_stack_free(buffer);
>diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
>--- a/src/video/x11/SDL_x11events.c
>+++ b/src/video/x11/SDL_x11events.c
>@@ -1293,7 +1293,7 @@
>                         } else if (SDL_strcmp("text/uri-list", name)==0) {
>                             char *fn = X11_URIToLocal(token);
>                             if (fn) {
>-                                SDL_SendDropFile(data->window, fn);
>+                                SDL_SendDropFile(data->window, fn, NULL);
>                             }
>                         }
>                         token = strtok(NULL, "\r\n");

Actions: View | Diff

Attachments on bug 3181: 2303 | 2311 | 2314 | 2762

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.