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 to add sourceApplication to DropEvent: Fixes comments.

drop_event_srcApp.patch (text/plain), 7.60 KB, created by Nathan Daly on 2015-11-27 04:56:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Daly

Created: 2015-11-27 04:56:54 UTC

Size: 7.60 KB

patch

obsolete

># HG changeset patch
># User Nathan Daly <NHDaly@gmail.com>
># Parent  31b7adf67756f29ff92d36a869ead4ffcdb06fdc
>Adds sourceApplication field to SDL_DropEvent on 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 used to be ignored.
>- The annotation field is still ignored.
>
>diff --git a/include/SDL_events.h b/include/SDL_events.h
>--- a/include/SDL_events.h
>+++ b/include/SDL_events.h
>@@ -459,16 +459,17 @@ typedef struct SDL_DollarGestureEvent
>  *         This event is enabled by default, you can disable it with SDL_EventState().
>  *  \note If this event is enabled, you must free the filename in the event.
>  */
> typedef struct SDL_DropEvent
> {
>     Uint32 type;        /**< ::SDL_DROPFILE */
>     Uint32 timestamp;
>     char *file;         /**< The file name, which should be freed with SDL_free() */
>+    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;
> 
> 
> /**
>  *  \brief The "quit requested" event
>  */
> typedef struct SDL_QuitEvent
> {
>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
>@@ -139,17 +139,17 @@ JNIEXPORT void JNICALL SDL_Android_Init(
> }
> 
> /* Drop file */
> void Java_org_libsdl_app_SDLActivity_onNativeDropFile(
>                                     JNIEnv* env, jclass jcls,
>                                     jstring filename)
> {
>     const char *path = (*env)->GetStringUTFChars(env, filename, NULL);
>-    SDL_SendDropFile(path);
>+    SDL_SendDropFile(path, NULL);
>     (*env)->ReleaseStringUTFChars(env, filename, path);
> }
> 
> /* Resize */
> JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeResize(
>                                     JNIEnv* env, jclass jcls,
>                                     jint width, jint height, jint format, jfloat rate)
> {
>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
>@@ -23,24 +23,29 @@
> /* Drag and drop event handling code for SDL */
> 
> #include "SDL_events.h"
> #include "SDL_events_c.h"
> #include "SDL_dropevents_c.h"
> 
> 
> int
>-SDL_SendDropFile(const char *file)
>+SDL_SendDropFile(const char *file, const char *sourceApplication)
> {
>     int posted;
> 
>     /* Post the event, if desired */
>     posted = 0;
>     if (SDL_GetEventState(SDL_DROPFILE) == SDL_ENABLE) {
>         SDL_Event event;
>         event.type = SDL_DROPFILE;
>         event.drop.file = SDL_strdup(file);
>         posted = (SDL_PushEvent(&event) > 0);
>+        if (sourceApplication != NULL) {
>+          event.drop.sourceApplication = SDL_strdup(sourceApplication);
>+        } else {
>+          event.drop.sourceApplication = NULL;
>+        }
>     }
>     return (posted);
> }
> 
> /* vi: set ts=4 sw=4 expandtab: */
>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
>@@ -18,13 +18,13 @@
>      misrepresented as being the original software.
>   3. This notice may not be removed or altered from any source distribution.
> */
> #include "../SDL_internal.h"
> 
> #ifndef _SDL_dropevents_c_h
> #define _SDL_dropevents_c_h
> 
>-extern int SDL_SendDropFile(const char *file);
>+extern int SDL_SendDropFile(const char *file, const char *sourceApplication);
> 
> #endif /* _SDL_dropevents_c_h */
> 
> /* vi: set ts=4 sw=4 expandtab: */
>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
>@@ -171,17 +171,17 @@
>         } else {
>             SDL_RaiseWindow(window);
>         }
>     }
> }
> 
> - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
> {
>-    return (BOOL)SDL_SendDropFile([filename UTF8String]);
>+    return (BOOL)SDL_SendDropFile([filename UTF8String], NULL);
> }
> @end
> 
> static SDLAppDelegate *appDelegate = nil;
> 
> static NSString *
> GetApplicationName(void)
> {
>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
>@@ -152,17 +152,17 @@
>                                                                  error:nil];
> 
>                 if (resolvedURL != nil) {
>                     fileURL = resolvedURL;
>                 }
>             }
>         }
> 
>-        if (!SDL_SendDropFile([[fileURL path] UTF8String])) {
>+        if (!SDL_SendDropFile([[fileURL path] UTF8String], NULL)) {
>             return NO;
>         }
>     }
> 
>     return YES;
> }}
> 
> - (BOOL)wantsPeriodicDraggingUpdates
>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
>@@ -446,19 +446,19 @@ SDL_LoadLaunchImageNamed(NSString *name,
>         }
>     }
> }
> 
> - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
> {
>     NSURL *fileURL = url.filePathURL;
>     if (fileURL != nil) {
>-        SDL_SendDropFile([fileURL.path UTF8String]);
>+        SDL_SendDropFile([fileURL.path UTF8String], [sourceApplication UTF8String]);
>     } else {
>-        SDL_SendDropFile([url.absoluteString UTF8String]);
>+        SDL_SendDropFile([url.absoluteString UTF8String], [sourceApplication UTF8String]);
>     }
>     return YES;
> }
> 
> @end
> 
> #endif /* SDL_VIDEO_DRIVER_UIKIT */
> 
>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
>@@ -895,17 +895,17 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPAR
>             HDROP drop = (HDROP) wParam;
>             UINT count = DragQueryFile(drop, 0xFFFFFFFF, NULL, 0);
>             for (i = 0; i < count; ++i) {
>                 UINT size = DragQueryFile(drop, i, NULL, 0) + 1;
>                 LPTSTR buffer = SDL_stack_alloc(TCHAR, size);
>                 if (buffer) {
>                     if (DragQueryFile(drop, i, buffer, size)) {
>                         char *file = WIN_StringToUTF8(buffer);
>-                        SDL_SendDropFile(file);
>+                        SDL_SendDropFile(file, NULL);
>                         SDL_free(file);
>                     }
>                     SDL_stack_free(buffer);
>                 }
>             }
>             DragFinish(drop);
>             return 0;
>         }
>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
>@@ -1228,17 +1228,17 @@ X11_DispatchEvent(_THIS)
>                             length++;
>                         } else {
>                             if (*scan == 0x0A && length > 0) {
>                                 uri = SDL_malloc(length--);
>                                 SDL_memcpy(uri, start, length);
>                                 uri[length] = '\0';
>                                 fn = X11_URIToLocal(uri);
>                                 if (fn) {
>-                                    SDL_SendDropFile(fn);
>+                                    SDL_SendDropFile(fn, NULL);
>                                 }
>                                 SDL_free(uri);
>                             }
>                             expect_lf = SDL_FALSE;
>                             start = NULL;
>                         }
>                         scan++;
>                     }

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.