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.

Beware: This are my very first steps with JNI.

file_2476.txt (text/plain), 4.27 KB, created by rettichschnidi on 2014-04-02 21:25:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rettichschnidi

Created: 2014-04-02 21:25:24 UTC

Size: 4.27 KB

patch

obsolete

>diff -r 505617cd7518 -r 6125b756a45e android-project/src/org/libsdl/app/SDLActivity.java
>--- a/android-project/src/org/libsdl/app/SDLActivity.java	Wed Apr 02 22:52:22 2014 +0200
>+++ b/android-project/src/org/libsdl/app/SDLActivity.java	Wed Apr 02 23:12:18 2014 +0200
>@@ -5,6 +5,7 @@
> import java.util.Collections;
> import java.util.Comparator;
> import java.util.List;
>+import java.util.Vector;
> 
> import android.app.*;
> import android.content.*;
>@@ -54,6 +55,8 @@
>         System.loadLibrary("main");
>     }
>     
>+    // Arguments for the native C/C++ main(int argc, char *argv[]) function
>+    protected static Vector<String> mMainArguments;
>     
>     public static void initialize() {
>         // The static nature of the singleton and Android quirkyness force us to initialize everything here
>@@ -69,6 +72,8 @@
>         mIsPaused = false;
>         mIsSurfaceReady = false;
>         mHasFocus = true;
>+        mMainArguments = new Vector<String>();
>+        mMainArguments.add("SDL_app");
>     }
> 
>     // Setup
>@@ -314,6 +319,14 @@
>         return mSingleton;
>     }
> 
>+    public static int getMainArgumentsCount() {
>+        return mMainArguments.size();
>+    }
>+
>+    public static String getMainArgument(int index) {
>+        return mMainArguments.get(index);
>+    }
>+
>     /**
>      * @return result of getSystemService(name) but executed on UI thread.
>      */
>diff -r 505617cd7518 -r 6125b756a45e src/core/android/SDL_android.c
>--- a/src/core/android/SDL_android.c	Wed Apr 02 22:52:22 2014 +0200
>+++ b/src/core/android/SDL_android.c	Wed Apr 02 23:12:18 2014 +0200
>@@ -1326,6 +1326,27 @@
>     Android_JNI_SendMessage(COMMAND_TEXTEDIT_HIDE, 0);
> }
> 
>+int Android_JNI_GetMainArgumentsCount()
>+{
>+    JNIEnv *env = Android_JNI_GetEnv();
>+    jmethodID midGetMainArgumentsCount = (*env)->GetStaticMethodID(env, mActivityClass,
>+                                                            "getMainArgumentsCount", "()I");
>+
>+    return (*env)->CallStaticIntMethod(env, mActivityClass, midGetMainArgumentsCount);
>+}
>+
>+char* Android_JNI_GetMainArgument(int index)
>+{
>+    JNIEnv *env = Android_JNI_GetEnv();
>+    jmethodID midGetMainArgument = (*env)->GetStaticMethodID(env, mActivityClass,
>+                                                "getMainArgument", "(I)Ljava/lang/String;");
>+    jstring argumentString = (jstring)(*env)->CallStaticObjectMethod(env, mActivityClass, midGetMainArgument, index);
>+    const char* argument = (*env)->GetStringUTFChars(env, argumentString, NULL);
>+    char* returnValue = SDL_strdup(argument);
>+    (*env)->ReleaseStringUTFChars(env, argumentString, argument);
>+    return returnValue;
>+}
>+
> /*
> //////////////////////////////////////////////////////////////////////////////
> //
>diff -r 505617cd7518 -r 6125b756a45e src/core/android/SDL_android.h
>--- a/src/core/android/SDL_android.h	Wed Apr 02 22:52:22 2014 +0200
>+++ b/src/core/android/SDL_android.h	Wed Apr 02 23:12:18 2014 +0200
>@@ -40,6 +40,8 @@
> extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
> extern void Android_JNI_ShowTextInput(SDL_Rect *inputRect);
> extern void Android_JNI_HideTextInput();
>+extern int Android_JNI_GetMainArgumentsCount(void);
>+extern char *Android_JNI_GetMainArgument(int index);
> extern ANativeWindow* Android_JNI_GetNativeWindow(void);
> 
> /* Audio support */
>diff -r 505617cd7518 -r 6125b756a45e src/main/android/SDL_android_main.c
>--- a/src/main/android/SDL_android_main.c	Wed Apr 02 22:52:22 2014 +0200
>+++ b/src/main/android/SDL_android_main.c	Wed Apr 02 23:12:18 2014 +0200
>@@ -24,12 +24,23 @@
> 
>     SDL_SetMainReady();
> 
>+    /* Extract the arguments for main()*/
>+    int argc = Android_JNI_GetMainArgumentsCount();
>+    char *argv[argc + 1];
>+    int i;
>+    for(i = 0; i < argc; ++i) {
>+        argv[i] = Android_JNI_GetMainArgument(i);
>+    }
>+    argv[i] = NULL;
>+
>     /* Run the application code! */
>     int status;
>-    char *argv[2];
>-    argv[0] = SDL_strdup("SDL_app");
>-    argv[1] = NULL;
>-    status = SDL_main(1, argv);
>+    status = SDL_main(argc, argv);
>+
>+    /* Release strings */
>+    for(i = 0; i < argc; ++i) {
>+        SDL_free(argv[i]);
>+    }
> 
>     /* Do not issue an exit or the whole application will terminate instead of just the SDL thread */
>     /* exit(status); */

Actions: View

Attachments on bug 2476: 1602 | 1605 | 1628 | 1750

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.