Proper C-side ref storage instead of storing it in java and interacting through JNI

Author: RaydanOMGr

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavApplication.java

@@ -7,22 +7,17 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.Log;
 
 import androidx.core.app.ActivityCompat;
-import androidx.core.content.res.ResourcesCompat;
 
-import net.kdt.pojavlaunch.customcontrols.mouse.CursorContainer;
 import net.kdt.pojavlaunch.lifecycle.ContextExecutor;
 import net.kdt.pojavlaunch.prefs.LauncherPreferences;
 import net.kdt.pojavlaunch.tasks.AsyncAssetManager;
 import net.kdt.pojavlaunch.utils.FileUtils;
 import net.kdt.pojavlaunch.utils.LocaleUtils;
 
-import org.lwjgl.glfw.CallbackBridge;
-
 import java.io.File;
 import java.io.PrintStream;
 import java.text.DateFormat;
@@ -33,7 +28,6 @@
 import java.util.concurrent.TimeUnit;
 
 import git.artdeell.mojo.BuildConfig;
-import git.artdeell.mojo.R;
 
 public class PojavApplication extends Application {
 	public static final String CRASH_REPORT_TAG = "PojavCrashReport";
@@ -93,16 +87,6 @@ public void onCreate() {
 			ferrorIntent.setFlags(FLAG_ACTIVITY_NEW_TASK);
 			startActivity(ferrorIntent);
 		}
-
-		Drawable mousePointerDrawable = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_mouse_pointer, getTheme());
-		// For some reason it's annotated as Nullable even though it doesn't seem to actually
-		// ever return null
-		assert mousePointerDrawable != null;
-		mousePointerDrawable.setBounds(0, 0, 36, 54);
-		CallbackBridge.setupDefaultCursor(new CursorContainer(
-				mousePointerDrawable,
-				1, 1
-		));
 	}
 
 	@Override

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/Touchpad.java

@@ -2,19 +2,23 @@
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.core.util.Consumer;
 
 import net.kdt.pojavlaunch.GrabListener;
 import net.kdt.pojavlaunch.prefs.LauncherPreferences;
 
 import org.lwjgl.glfw.CallbackBridge;
 
+import git.artdeell.mojo.R;
+
 /**
  * Class dealing with the virtual mouse
  */
@@ -24,6 +28,7 @@ public class Touchpad extends View implements GrabListener, AbstractTouchpad {
     /* Mouse pointer icon used by the touchpad */
     private float mMouseX, mMouseY;
     private boolean mMoveOnLayout;
+    private Drawable mMouseCursorDrawable;
     private final Consumer<CursorContainer> onCursorChange = cursor->invalidate();
     public Touchpad(@NonNull Context context) {
         this(context, null);
@@ -77,10 +82,19 @@ private void updateMousePosition() {
     protected void onDraw(Canvas canvas) {
         canvas.translate(mMouseX, mMouseY);
         canvas.scale(LauncherPreferences.PREF_MOUSESCALE, LauncherPreferences.PREF_MOUSESCALE);
-        CallbackBridge.getCursor().draw(canvas);
+        if(CallbackBridge.getCursor() != null) {
+            CallbackBridge.getCursor().draw(canvas);
+        } else {
+            mMouseCursorDrawable.draw(canvas);
+        }
     }
 
     private void init() {
+        mMouseCursorDrawable = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_mouse_pointer, getContext().getTheme());
+        // For some reason it's annotated as Nullable even though it doesn't seem to actually
+        // ever return null
+        assert mMouseCursorDrawable != null;
+        mMouseCursorDrawable.setBounds(0, 0, 36, 54);
         CallbackBridge.addCursorChangeListener(onCursorChange);
 
         setFocusable(false);

app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java

@@ -11,7 +11,6 @@
 import android.view.Choreographer;
 
 import androidx.annotation.Keep;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.util.Consumer;
 
@@ -52,10 +51,8 @@ public class CallbackBridge {
     public static final FloatBuffer sGamepadAxisBuffer;
     public static boolean sGamepadDirectInput = false;
 
-    @Nullable private static CursorContainer sDefaultCursor = null;
     @Nullable private static CursorContainer sCursor;
     private static Set<Consumer<CursorContainer>> cursorChangeListeners = new HashSet<>();
-    private static Set<Long> cursorPointers = new HashSet<>();
 
     public static void putMouseEventWithCoords(int button, float x, float y) {
         putMouseEventWithCoords(button, true, x, y);
@@ -244,29 +241,12 @@ public static void setDirectGamepadEnableHandler(DirectGamepadEnableHandler h) {
         sDirectGamepadEnableHandler = new WeakReference<>(h);
     }
 
-    public static void setupDefaultCursor(CursorContainer cursor) {
-        if (sDefaultCursor != null) {
-            throw new IllegalStateException("Default cursor already initialized!");
-        }
-        sDefaultCursor = cursor;
-    }
-
-    // these methods should only ever be called after setupDefaultCursor
-    public static CursorContainer getDefaultCursor() {
-        if(sDefaultCursor == null) {
-            throw new IllegalStateException("Default cursor not yet initialized!");
-        }
-        return sDefaultCursor;
-    }
-
+    @Nullable
     public static CursorContainer getCursor() {
-        if(sCursor == null) {
-            setCursor(getDefaultCursor());
-        }
         return sCursor;
     }
 
-    public static void setCursor(@NonNull CursorContainer cursor) {
+    public static void setCursor(@Nullable CursorContainer cursor) {
         sCursor = cursor;
         for (Consumer<CursorContainer> listener : cursorChangeListeners) {
             listener.accept(cursor);
@@ -275,28 +255,14 @@ public static void setCursor(@NonNull CursorContainer cursor) {
 
     @SuppressWarnings("unused")
     @Keep
-    public static void removeCursor(long ptr) {
-        CursorContainer cursor = (CursorContainer) nativeGetGlobalRef(ptr);
-
-        if(cursor == getDefaultCursor()) return;
-        if(sCursor == cursor) setCursor(getDefaultCursor());
-
-        cursorPointers.remove(ptr);
-        nativeDeleteGlobalRef(ptr);
-    }
-
-    @SuppressWarnings("unused")
-    @Keep
-    public static void removeAllCursors() {
-        setCursor(getDefaultCursor());
-        for (long ptr : cursorPointers) {
-            removeCursor(ptr);
-        }
+    private static void removeCursor(@Nullable CursorContainer cursor) {
+        if(cursor == null) return;
+        if(sCursor == cursor) setCursor(null);
     }
 
     @SuppressWarnings("unused")
     @Keep
-    public static long createCursor(ByteBuffer imageBuffer, int width, int height, int xHot, int yHot) {
+    private static CursorContainer createCursor(ByteBuffer imageBuffer, int width, int height, int xHot, int yHot) {
         Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         bitmap.copyPixelsFromBuffer(imageBuffer);
         // using the system resources isn't really a good practice
@@ -309,9 +275,7 @@ public static long createCursor(ByteBuffer imageBuffer, int width, int height, i
         // does nothing
         drawable.setColorFilter(new ColorMatrixColorFilter(new ColorMatrix()));
 
-        long cursor = nativeCreateGlobalRef(new CursorContainer(drawable, xHot, yHot));
-        cursorPointers.add(cursor);
-        return cursor;
+        return new CursorContainer(drawable, xHot, yHot);
     }
 
     public static void addCursorChangeListener(Consumer<CursorContainer> listener) {
@@ -336,9 +300,6 @@ public static void removeCursorChangeListener(Consumer<CursorContainer> listener
     public static native void nativeSetWindowAttrib(int attrib, int value);
     private static native ByteBuffer nativeCreateGamepadButtonBuffer();
     private static native ByteBuffer nativeCreateGamepadAxisBuffer();
-    private static native long nativeCreateGlobalRef(Object obj);
-    private static native Object nativeGetGlobalRef(long pointer);
-    private static native void nativeDeleteGlobalRef(long object);
     static {
         System.loadLibrary("pojavexec");
         sGamepadButtonBuffer = nativeCreateGamepadButtonBuffer();

app_pojavlauncher/src/main/jni/Android.mk

@@ -35,7 +35,8 @@ LOCAL_SRC_FILES := \
     jre_launcher.c \
     utils.c \
     stdio_is.c \
-    driver_helper/nsbypass.c
+    driver_helper/nsbypass.c \
+    linkedlist.c
 
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
 LOCAL_CFLAGS += -DADRENO_POSSIBLE

app_pojavlauncher/src/main/jni/egl_bridge.c

@@ -62,6 +62,7 @@ struct PotatoBridge potatoBridge;
 
 #include "ctxbridges/egl_loader.h"
 #include "ctxbridges/osmesa_loader.h"
+#include "linkedlist.h"
 
 #define RENDERER_GL4ES 1
 #define RENDERER_VK_ZINK 2
@@ -89,8 +90,19 @@ EXTERNAL_API void pojavTerminate() {
         } break;
     }
 
-    TRY_ATTACH_ENV(env, pojav_environ->dalvikJavaVMPtr, "failed to attach env from pojavTerminate!\n", return;);
-    (*env)->CallStaticVoidMethod(env, pojav_environ->bridgeClazz, pojav_environ->method_removeAllCursors);
+    TRY_ATTACH_ENV(env, pojav_environ->dalvikJavaVMPtr, "Failed to attach to env from pojavTerminate!\n", return;);
+
+    LinkedListNode* current = pojav_environ->cursors->first;
+    while (current) {
+        LinkedListNode* next = current->next;
+        (*env)->DeleteGlobalRef(env, current->value);
+        free(current);
+        current = next;
+    }
+    pojav_environ->cursors->first = NULL;
+    pojav_environ->cursors->last = NULL;
+
+    (*env)->CallStaticVoidMethod(env, pojav_environ->bridgeClazz, pojav_environ->method_setCursor, NULL);
 }
 
 JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_setupBridgeWindow(JNIEnv* env, ABI_COMPAT jclass clazz, jobject surface) {
@@ -260,19 +272,6 @@ EXTERNAL_API void pojavSwapInterval(int interval) {
     br_swap_interval(interval);
 }
 
-EXTERNAL_API void* pojavCreateStandardCursor(__attribute__((unused)) int shape) {
-    if(pojav_environ->standardCursor != NULL) return pojav_environ->standardCursor;
-
-    TRY_ATTACH_ENV(env, pojav_environ->dalvikJavaVMPtr, "failed to attach env from pojavCreateStandardCursor!\n", return NULL;);
-    jobject cursor = (*env)->CallStaticObjectMethod(env, pojav_environ->bridgeClazz,
-                                          pojav_environ->method_getDefaultCursor);
-    jobject globalCursor = (*env)->NewGlobalRef(env, cursor);
-    (*env)->DeleteLocalRef(env, cursor);
-
-    pojav_environ->standardCursor = globalCursor;
-    return pojav_environ->standardCursor;
-}
-
 EXTERNAL_API void* pojavCreateCursor(GLFWimage* image, int xhot, int yhot) {
     if(image == NULL) {
         printf("Passed image is null!\n");
@@ -287,27 +286,20 @@ EXTERNAL_API void* pojavCreateCursor(GLFWimage* image, int xhot, int yhot) {
         return NULL;
     }
 
-    // creates a global ref so there is no need to create one here
-    jlong cursor = (*env)->CallStaticLongMethod(env, pojav_environ->bridgeClazz,
+    jobject cursor = (*env)->CallStaticObjectMethod(env, pojav_environ->bridgeClazz,
                                           pojav_environ->method_createCursor, buffer,
                                           image->width, image->height, xhot, yhot);
+    jobject globalCursor = (*env)->NewGlobalRef(env, cursor);
     // not needed anymore
     (*env)->DeleteLocalRef(env, buffer);
-    return (jobject)cursor;
+
+    linkedlist_append(pojav_environ->cursors, globalCursor);
+    return globalCursor;
 }
 
 EXTERNAL_API void pojavSetCursor(__attribute__((unused)) void* window, jobject cursor) {
-    if(cursor == NULL) {
-        void* standardCursor = pojavCreateStandardCursor(0);
-        if(standardCursor == NULL) {
-            printf("Failed to get standard cursor in pojavSetCursor\n");
-            return;
-        }
-        cursor = standardCursor;
-    }
-
     TRY_ATTACH_ENV(env, pojav_environ->dalvikJavaVMPtr, "failed to attach env from pojavSetCursor!\n", return;);
-    (*env)->CallStaticVoidMethod(env, pojav_environ->bridgeClazz, pojav_environ->method_setCursor, (jlong)cursor);
+    (*env)->CallStaticVoidMethod(env, pojav_environ->bridgeClazz, pojav_environ->method_setCursor, cursor);
 }
 
 EXTERNAL_API void pojavDestroyCursor(jobject cursor) {
@@ -317,5 +309,23 @@ EXTERNAL_API void pojavDestroyCursor(jobject cursor) {
     }
 
     TRY_ATTACH_ENV(env, pojav_environ->dalvikJavaVMPtr, "failed to attach env from pojavDestroyCursor!\n", return;);
-    (*env)->CallStaticVoidMethod(env, pojav_environ->bridgeClazz, pojav_environ->method_removeCursor, (jlong)cursor);
+    (*env)->CallStaticVoidMethod(env, pojav_environ->bridgeClazz, pojav_environ->method_removeCursor, cursor);
+
+    LinkedListNode* current = pojav_environ->cursors->first;
+    LinkedListNode* prev = NULL;
+
+    while (current) {
+        if (current->value == cursor) {
+            if (prev == NULL) {
+                pojav_environ->cursors->first = current->next;
+            } else {
+                prev->next = current->next;
+            }
+            (*env)->DeleteGlobalRef(env, current->value);
+            free(current);
+            break;
+        }
+        prev = current;
+        current = current->next;
+    }
 }

app_pojavlauncher/src/main/jni/environ/environ.h

@@ -8,6 +8,7 @@
 #include <ctxbridges/common.h>
 #include <stdatomic.h>
 #include <jni.h>
+#include "linkedlist.h"
 
 /* How many events can be handled at the same time */
 #define EVENT_WINDOW_SIZE 8000
@@ -71,12 +72,10 @@ struct pojav_environ_s {
     bool shouldUpdateMonitorSize, monitorSizeConsumed;
     int savedWidth, savedHeight;
     GLFWgamepadstate gamepadState;
-    jmethodID method_getDefaultCursor;
     jmethodID method_setCursor;
     jmethodID method_removeCursor;
     jmethodID method_createCursor;
-    jmethodID method_removeAllCursors;
-    jobject standardCursor;
+    LinkedList* cursors;
 #define ADD_CALLBACK_WWIN(NAME) \
     GLFW_invoke_##NAME##_func* GLFW_invoke_##NAME;
     ADD_CALLBACK_WWIN(Char);