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] Android clipboard crash fix etc. (Second try)

SDL2-2.0.1-clipboard.patch (text/plain), 11.52 KB, created by chw on 2013-11-23 17:56:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: chw

Created: 2013-11-23 17:56:55 UTC

Size: 11.52 KB

patch

obsolete

>diff -Nur SDL2-2.0.1.orig/android-project/src/org/libsdl/app/SDLActivity.java SDL2-2.0.1/android-project/src/org/libsdl/app/SDLActivity.java
>--- SDL2-2.0.1.orig/android-project/src/org/libsdl/app/SDLActivity.java	2013-10-24 06:05:29.000000000 +0200
>+++ SDL2-2.0.1/android-project/src/org/libsdl/app/SDLActivity.java	2013-11-23 18:38:59.266929000 +0100
>@@ -39,6 +39,11 @@
>     protected static Thread mAudioThread;
>     protected static AudioTrack mAudioTrack;
> 
>+    // Clipboard
>+    protected static android.content.ClipboardManager mClipMgr;
>+    protected static android.text.ClipboardManager mClipMgrOld;
>+    protected static SDLClipboardChanged mClipChanged;
>+
>     // Load the .so
>     static {
>         System.loadLibrary("SDL2");
>@@ -64,6 +69,18 @@
>         mLayout = new AbsoluteLayout(this);
>         mLayout.addView(mSurface);
> 
>+        int apiVersion = android.os.Build.VERSION.SDK_INT;
>+        if (apiVersion >= android.os.Build.VERSION_CODES.HONEYCOMB) {
>+            mClipMgrOld = null;
>+            mClipMgr = (android.content.ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
>+            mClipChanged = new SDLClipboardChanged();
>+            mClipMgr.addPrimaryClipChangedListener(mClipChanged);
>+        } else {
>+            mClipMgrOld = (android.text.ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
>+            mClipMgr = null;
>+            mClipChanged = null;
>+        }
>+
>         setContentView(mLayout);
>     }
> 
>@@ -243,6 +260,7 @@
>                                             int action, float x, 
>                                             float y, float p);
>     public static native void onNativeAccel(float x, float y, float z);
>+    public static native void onNativeClipboardChanged();
>     public static native void onNativeSurfaceChanged();
>     public static native void onNativeSurfaceDestroyed();
>     public static native void nativeFlipBuffers();
>@@ -406,6 +424,39 @@
>         }
>         return Arrays.copyOf(filtered, used);
>     }
>+
>+    // Clipboard
>+
>+    public static boolean clipboardHasText() {
>+        if (mClipMgrOld != null) {
>+            return mClipMgrOld.hasText();
>+        } 
>+        return mClipMgr.hasText();
>+    }
>+
>+    public static String clipboardGetText() {
>+        CharSequence text;
>+        if (mClipMgrOld != null) {
>+            text = mClipMgrOld.getText();
>+        } else { 
>+            text = mClipMgr.getText();
>+        }
>+        if (text != null) {
>+            return text.toString();
>+        }
>+        return null;
>+    }
>+
>+    public static void clipboardSetText(String string) {
>+        if (mClipMgrOld != null) {
>+            mClipMgrOld.setText(string);
>+            return;
>+        }
>+        mClipMgr.removePrimaryClipChangedListener(mClipChanged);
>+        mClipMgr.setText(string);
>+        mClipMgr.addPrimaryClipChangedListener(mClipChanged);
>+    }
>+
> }
> 
> /**
>@@ -769,3 +820,12 @@
> 
> }
> 
>+class SDLClipboardChanged implements
>+    android.content.ClipboardManager.OnPrimaryClipChangedListener {
>+
>+    @Override
>+    public void onPrimaryClipChanged() {
>+        SDLActivity.onNativeClipboardChanged();
>+    }
>+
>+}
>diff -Nur SDL2-2.0.1.orig/include/SDL_system.h SDL2-2.0.1/include/SDL_system.h
>--- SDL2-2.0.1.orig/include/SDL_system.h	2013-10-24 06:05:29.000000000 +0200
>+++ SDL2-2.0.1/include/SDL_system.h	2013-11-23 18:39:25.692241647 +0100
>@@ -108,6 +108,9 @@
>  */
> extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath();
> 
>+/* Get the path of the APK of this application. */
>+extern DECLSPEC const char * SDLCALL SDL_AndroidGetPackageCodePath();
>+
> #endif /* __ANDROID__ */
> 
> /* Ends C function definitions when using C++ */
>diff -Nur SDL2-2.0.1.orig/src/core/android/SDL_android.c SDL2-2.0.1/src/core/android/SDL_android.c
>--- SDL2-2.0.1.orig/src/core/android/SDL_android.c	2013-10-24 06:05:29.000000000 +0200
>+++ SDL2-2.0.1/src/core/android/SDL_android.c	2013-11-23 17:45:17.186919000 +0100
>@@ -248,6 +248,13 @@
>     bHasNewData = true;
> }
> 
>+/* Clipboard */
>+void Java_org_libsdl_app_SDLActivity_onNativeClipboardChanged(
>+                                    JNIEnv* env, jclass jcls)
>+{
>+    SDL_SendClipboardUpdate();
>+}
>+
> /* Low memory */
> void Java_org_libsdl_app_SDLActivity_nativeLowMemory(
>                                     JNIEnv* env, jclass cls)
>@@ -990,105 +997,72 @@
>     return Internal_Android_JNI_FileClose(ctx, true);
> }
> 
>-/* returns a new global reference which needs to be released later */
>-static jobject Android_JNI_GetSystemServiceObject(const char* name)
>+int Android_JNI_SetClipboardText(const char* text)
> {
>     struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
>     JNIEnv* env = Android_JNI_GetEnv();
>-    jobject retval = NULL;
>+    jstring string;
>+    jmethodID mid;
> 
>     if (!LocalReferenceHolder_Init(&refs, env)) {
>         LocalReferenceHolder_Cleanup(&refs);
>-        return NULL;
>-    }
>-
>-    jstring service = (*env)->NewStringUTF(env, name);
>-
>-    jmethodID mid;
>-
>-    mid = (*env)->GetStaticMethodID(env, mActivityClass, "getContext", "()Landroid/content/Context;");
>-    jobject context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
>-
>-    mid = (*env)->GetMethodID(env, mActivityClass, "getSystemService", "(Ljava/lang/String;)Ljava/lang/Object;");
>-    jobject manager = (*env)->CallObjectMethod(env, context, mid, service);
>-
>-    (*env)->DeleteLocalRef(env, service);
>-
>-    retval = manager ? (*env)->NewGlobalRef(env, manager) : NULL;
>-    LocalReferenceHolder_Cleanup(&refs);
>-    return retval;
>-}
>-
>-#define SETUP_CLIPBOARD(error) \
>-    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__); \
>-    JNIEnv* env = Android_JNI_GetEnv(); \
>-    if (!LocalReferenceHolder_Init(&refs, env)) { \
>-        LocalReferenceHolder_Cleanup(&refs); \
>-        return error; \
>-    } \
>-    jobject clipboard = Android_JNI_GetSystemServiceObject("clipboard"); \
>-    if (!clipboard) { \
>-        LocalReferenceHolder_Cleanup(&refs); \
>-        return error; \
>+        return -1;
>     }
> 
>-#define CLEANUP_CLIPBOARD() \
>-    LocalReferenceHolder_Cleanup(&refs);
>-
>-int Android_JNI_SetClipboardText(const char* text)
>-{
>-    SETUP_CLIPBOARD(-1)
>-
>-    jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "setText", "(Ljava/lang/CharSequence;)V");
>-    jstring string = (*env)->NewStringUTF(env, text);
>-    (*env)->CallVoidMethod(env, clipboard, mid, string);
>-    (*env)->DeleteGlobalRef(env, clipboard);
>+    mid = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardSetText", "(Ljava/lang/String;)V");
>+    string = (*env)->NewStringUTF(env, text);
>+    (*env)->CallStaticVoidMethod(env, mActivityClass, mid, string);
>     (*env)->DeleteLocalRef(env, string);
> 
>-    CLEANUP_CLIPBOARD();
>-
>+    LocalReferenceHolder_Cleanup(&refs);
>     return 0;
> }
> 
> char* Android_JNI_GetClipboardText()
> {
>-    SETUP_CLIPBOARD(SDL_strdup(""))
>+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
>+    JNIEnv* env = Android_JNI_GetEnv();
>+    jmethodID mid;
>+    jstring string;
>+    char* text = NULL;
>+
>+    if (!LocalReferenceHolder_Init(&refs, env)) {
>+        LocalReferenceHolder_Cleanup(&refs);
>+        return SDL_strdup("");
>+    }
> 
>-    jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "getText", "()Ljava/lang/CharSequence;");
>-    jobject sequence = (*env)->CallObjectMethod(env, clipboard, mid);
>-    (*env)->DeleteGlobalRef(env, clipboard);
>-    if (sequence) {
>-        mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, sequence), "toString", "()Ljava/lang/String;");
>-        jstring string = (jstring)((*env)->CallObjectMethod(env, sequence, mid));
>+    mid = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardGetText", "()Ljava/lang/String;");
>+    string = (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
>+    if (string) {
>         const char* utf = (*env)->GetStringUTFChars(env, string, 0);
>         if (utf) {
>-            char* text = SDL_strdup(utf);
>+            text = SDL_strdup(utf);
>             (*env)->ReleaseStringUTFChars(env, string, utf);
>-
>-            CLEANUP_CLIPBOARD();
>-
>-            return text;
>         }
>     }
> 
>-    CLEANUP_CLIPBOARD();    
>-
>-    return SDL_strdup("");
>+    LocalReferenceHolder_Cleanup(&refs);
>+    return (text == NULL) ? SDL_strdup("") : text;
> }
> 
> SDL_bool Android_JNI_HasClipboardText()
> {
>-    SETUP_CLIPBOARD(SDL_FALSE)
>+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
>+    JNIEnv* env = Android_JNI_GetEnv();
>+    jboolean retval;
>+    jmethodID mid;
> 
>-    jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "hasText", "()Z");
>-    jboolean has = (*env)->CallBooleanMethod(env, clipboard, mid);
>-    (*env)->DeleteGlobalRef(env, clipboard);
>+    if (!LocalReferenceHolder_Init(&refs, env)) {
>+        LocalReferenceHolder_Cleanup(&refs);
>+        return SDL_FALSE;
>+    }
> 
>-    CLEANUP_CLIPBOARD();
>-    
>-    return has ? SDL_TRUE : SDL_FALSE;
>-}
>+    mid = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardHasText", "()Z");
>+    retval = (*env)->CallStaticBooleanMethod(env, mActivityClass, mid);
> 
>+    LocalReferenceHolder_Cleanup(&refs);
>+    return (retval == JNI_TRUE) ? SDL_TRUE : SDL_FALSE;
>+}
> 
> /* returns 0 on success or -1 on error (others undefined then)
>  * returns truthy or falsy value in plugged, charged and battery
>@@ -1416,6 +1390,44 @@
>     return s_AndroidExternalFilesPath;
> }
> 
>+const char* SDL_AndroidGetPackageCodePath()
>+{
>+    static char *s_AndroidPackageCodePath = NULL;
>+
>+    if (!s_AndroidPackageCodePath) {
>+        struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
>+        jmethodID mid;
>+        jobject context;
>+        jstring pathString;
>+        const char *path;
>+
>+        JNIEnv *env = Android_JNI_GetEnv();
>+        if (!LocalReferenceHolder_Init(&refs, env)) {
>+            LocalReferenceHolder_Cleanup(&refs);
>+            return NULL;
>+        }
>+
>+        /* context = SDLActivity.getContext(); */
>+        mid = (*env)->GetStaticMethodID(env, mActivityClass,
>+                "getContext","()Landroid/content/Context;");
>+        context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
>+
>+        /* pathString = context.getPackageCodePath(); */
>+        mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, context),
>+                "getPackageCodePath", "()Ljava/lang/String;");
>+        pathString = (*env)->CallObjectMethod(env, context, mid);
>+        if (pathString) {
>+            path = (*env)->GetStringUTFChars(env, pathString, 0);
>+        }
>+        path = (*env)->GetStringUTFChars(env, pathString, NULL);
>+        s_AndroidPackageCodePath = SDL_strdup(path);
>+        (*env)->ReleaseStringUTFChars(env, pathString, path);
>+
>+        LocalReferenceHolder_Cleanup(&refs);
>+    }
>+    return s_AndroidPackageCodePath;
>+}
>+
> #endif /* __ANDROID__ */
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff -Nur SDL2-2.0.1.orig/src/video/x11/SDL_x11events.c SDL2-2.0.1/src/video/x11/SDL_x11events.c
>--- SDL2-2.0.1.orig/src/video/x11/SDL_x11events.c	2013-10-24 06:05:30.000000000 +0200
>+++ SDL2-2.0.1/src/video/x11/SDL_x11events.c	2013-11-23 18:39:25.694241745 +0100
>@@ -892,6 +892,16 @@
>         }
>         break;
> 
>+    case SelectionClear: {
>+            Atom XA_CLIPBOARD = X11_XInternAtom(display, "CLIPBOARD", 0);
>+
>+            if (xevent.xselectionclear.selection == XA_PRIMARY ||
>+                (XA_CLIPBOARD != None && xevent.xselectionclear.selection == XA_CLIPBOARD)) {
>+                SDL_SendClipboardUpdate();
>+            }
>+        }
>+        break;
>+
>     default:{
> #ifdef DEBUG_XEVENTS
>             printf("window %p: Unhandled event %d\n", data, xevent.type);

Actions: View | Diff

Attachments on bug 2258: 1463 | 1467 | 1468 | 1469

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.