rework: SDL detection

alexytomi · alexytomi · commit ef39ea77d5df · 2026-06-11T23:12:39.000+08:00
Now uses SDL_Init call to detect if SDL is being used.
diff --git a/app_pojavlauncher/src/main/java/org/libsdl/app/SDLControllerManager.java b/app_pojavlauncher/src/main/java/org/libsdl/app/SDLControllerManager.java
@@ -227,7 +227,6 @@ public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
      */
     synchronized void pollInputDevices() {
         if (!firstPollDone) {
-            MinecraftGLSurface.sdlEnabled = true;
             if (sDirectGamepadEnableHandler != null){
                 sDirectGamepadEnableHandler.onDirectGamepadEnabled();
             }
diff --git a/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java
@@ -14,6 +14,7 @@
 import androidx.annotation.Nullable;
 
 import org.libsdl.app.SDLActivity;
+import org.libsdl.app.SDLSurface;
 
 import java.lang.ref.WeakReference;
 import java.nio.ByteBuffer;
@@ -60,7 +61,7 @@ public static void sendCursorPos(float x, float y) {
         mouseY = y;
         nativeSendCursorPos(mouseX, mouseY);
         // HOVER_MOVE and MOVE are equivalent in SDL
-        SDLActivity.onNativeMouse(0, MotionEvent.ACTION_MOVE, x, y, true);
+        SDLActivity.onNativeMouse(0, MotionEvent.ACTION_MOVE, x, y, false);
     }
 
     /**
@@ -122,7 +123,7 @@ public static void sendMouseButton(int button, boolean status) {
     public static void sendMouseKeycode(int button, int modifiers, boolean isDown) {
         // if (isGrabbing()) DEBUG_STRING.append("MouseGrabStrace: " + android.util.Log.getStackTraceString(new Throwable()) + "\n");
         nativeSendMouseButton(button, isDown ? 1 : 0, modifiers);
-        SDLActivity.onNativeMouse(button, isDown ? MotionEvent.ACTION_DOWN : MotionEvent.ACTION_UP, mouseX, mouseY, true);
+        SDLActivity.onNativeMouse(button, isDown ? MotionEvent.ACTION_DOWN : MotionEvent.ACTION_UP, mouseX, mouseY, false);
     }
 
     public static void sendMouseKeycode(int keycode) {
@@ -167,6 +168,31 @@ public static boolean isGrabbing() {
         }
     }
 
+    // Notification types
+    private static final int SDL = 0;
+
+    // Notification actions
+    private static final int INIT = 0;
+    /**
+     * Used for any sort of notification that needs to be given from the JRE side
+     * @return if notification successful
+     */
+    // Called from JRE side via jni
+    @SuppressWarnings("unused")
+    @Keep
+    public static boolean notifyLauncher(int type, int... action) {
+        switch (type) {
+            case SDL:
+                if (action[0] == INIT) {
+                    MinecraftGLSurface.sdlEnabled = true;
+                    // Notifies SDL of native surface res which is needed for proper input handling
+                    SDLActivity.getSDLSurface().surfaceChanged();
+                    Logger.appendToLog("Amethyst-Android: SDL support enabled!");
+                    return true;
+                }
+        }
+        return false;
+    }
 
     public static int getCurrentMods() {
         int currMods = 0;
diff --git a/app_pojavlauncher/src/main/jni/environ/environ.h b/app_pojavlauncher/src/main/jni/environ/environ.h
@@ -52,6 +52,7 @@ struct pojav_environ_s {
     jmethodID method_internalWindowSizeChanged;
     jmethodID method_internalChangeMonitorSize;
     jmethodID method_getAndroidDPI;
+    jmethodID method_notifyLauncher;
     jclass bridgeClazz;
     jclass vmGlfwClass;
     jboolean isGrabbing;
diff --git a/app_pojavlauncher/src/main/jni/input_bridge_v3.c b/app_pojavlauncher/src/main/jni/input_bridge_v3.c
@@ -59,6 +59,7 @@ jint JNI_OnLoad(JavaVM* vm, __attribute__((unused)) void* reserved) {
         pojav_environ->method_onGrabStateChanged = (*dvEnv)->GetStaticMethodID(dvEnv, pojav_environ->bridgeClazz, "onGrabStateChanged", "(Z)V");
         pojav_environ->method_onDirectInputEnable = (*dvEnv)->GetStaticMethodID(dvEnv, pojav_environ->bridgeClazz, "onDirectInputEnable", "()V");
         pojav_environ->method_getAndroidDPI = (*dvEnv)->GetStaticMethodID(dvEnv, pojav_environ->bridgeClazz, "getAndroidDPI", "()F");
+        pojav_environ->method_notifyLauncher = (*dvEnv)->GetStaticMethodID(dvEnv, pojav_environ->bridgeClazz, "notifyLauncher", "(I[I)Z");
         pojav_environ->isUseStackQueueCall = JNI_FALSE;
     } else if (pojav_environ->dalvikJavaVMPtr != vm) {
         LOGI("Saving JVM environ...");
@@ -332,6 +333,13 @@ JNIEXPORT jfloat JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeGetAndroidDPI(
     return result;
 }
 
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeNotifyLauncher(JNIEnv* env, __attribute__((unused)) jclass clazz, jint type, jintArray action) {
+    TRY_ATTACH_ENV(dvm_env, pojav_environ->dalvikJavaVMPtr, "nativeNotifyLauncher failed!\n",);
+    jboolean result = (*dvm_env)->CallStaticBooleanMethod(dvm_env, pojav_environ->bridgeClazz,
+                                                      pojav_environ->method_notifyLauncher, type, convertIntArrayJVM(env, dvm_env, action));
+    return result;
+}
+
 jboolean critical_send_char(jchar codepoint) {
     if (pojav_environ->GLFW_invoke_Char && pojav_environ->isInputReady) {
         if (pojav_environ->isUseStackQueueCall) {
diff --git a/app_pojavlauncher/src/main/jni/utils.c b/app_pojavlauncher/src/main/jni/utils.c
@@ -59,6 +59,22 @@ jstring convertStringJVM(JNIEnv* srcEnv, JNIEnv* dstEnv, jstring srcStr) {
     return dstStr;
 }
 
+jintArray convertIntArrayJVM(JNIEnv* srcEnv, JNIEnv* dstEnv, jintArray srcIntArray) {
+	if (srcIntArray == NULL) {
+		return NULL;
+	}
+
+	jsize len = (*srcEnv)->GetArrayLength(srcEnv, srcIntArray);
+	jint* srcPtr = (*srcEnv)->GetIntArrayElements(srcEnv, srcIntArray, NULL);
+
+	jintArray dstIntArray = (*dstEnv)->NewIntArray(dstEnv, len);
+	(*dstEnv)->SetIntArrayRegion(dstEnv, dstIntArray, 0, len, srcPtr);
+
+	(*srcEnv)->ReleaseIntArrayElements(srcEnv, srcIntArray, srcPtr, JNI_ABORT);
+
+	return dstIntArray;
+}
+
 JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_setupBridgeSurfaceAWT(JNIEnv *env, jclass clazz, jlong surface) {
 	shared_awt_surface = surface;
 }
diff --git a/app_pojavlauncher/src/main/jni/utils.h b/app_pojavlauncher/src/main/jni/utils.h
@@ -10,6 +10,7 @@ char** convert_to_char_array(JNIEnv *env, jobjectArray jstringArray);
 jobjectArray convert_from_char_array(JNIEnv *env, char **charArray, int num_rows);
 void free_char_array(JNIEnv *env, jobjectArray jstringArray, const char **charArray);
 jstring convertStringJVM(JNIEnv* srcEnv, JNIEnv* dstEnv, jstring srcStr);
+jintArray convertIntArrayJVM(JNIEnv* srcEnv, JNIEnv* dstEnv, jintArray srcIntArray);
 
 JNIEnv* get_attached_env(JavaVM* jvm);
 JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNIEnv* env, jclass clazz, jint action, jbyteArray copySrc);
diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/jre_lwjgl3glfw/lwjgl-3.3.3/src/main/java/org/lwjgl/glfw/CallbackBridge.java
@@ -19,6 +19,11 @@ public class CallbackBridge {
     
     public static final boolean INPUT_DEBUG_ENABLED;
 
+    // Notification types
+    public static final int SDL = 0;
+    // Notification actions
+    public static final int INIT = 0;
+
     public static boolean sGamepadDirectEnabled;
     
     // TODO send grab state event to Android
@@ -58,5 +63,6 @@ public static void sendData(int type, String data) {
     public static native ByteBuffer nativeCreateGamepadAxisBuffer();
     private static native boolean nativeEnableGamepadDirectInput();
     public static native float nativeGetAndroidDPI();
+    public static native boolean nativeNotifyLauncher(int type, int... action);
 }
 
diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/jre_lwjgl3glfw/lwjgl-3.4.1/src/main/java/org/lwjgl/glfw/CallbackBridge.java
@@ -19,6 +19,11 @@ public class CallbackBridge {
     
     public static final boolean INPUT_DEBUG_ENABLED;
 
+    // Notification types
+    public static final int SDL = 0;
+    // Notification actions
+    public static final int INIT = 0;
+
     public static boolean sGamepadDirectEnabled;
     
     // TODO send grab state event to Android
@@ -58,5 +63,6 @@ public static void sendData(int type, String data) {
     public static native ByteBuffer nativeCreateGamepadAxisBuffer();
     private static native boolean nativeEnableGamepadDirectInput();
     public static native float nativeGetAndroidDPI();
+    public static native boolean nativeNotifyLauncher(int type, int... action);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,6 @@ public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {`
`227`	`227`	`*/`
`228`	`228`	`synchronized void pollInputDevices() {`
`229`	`229`	`if (!firstPollDone) {`
`230`		`- MinecraftGLSurface.sdlEnabled = true;`
`231`	`230`	`if (sDirectGamepadEnableHandler != null){`
`232`	`231`	`sDirectGamepadEnableHandler.onDirectGamepadEnabled();`
`233`	`232`	`}`