TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 00:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement input event queue for fixing 1.13+ has no input

Browse Source
This commit is contained in:
khanhduytran0 2020-10-16 06:09:09 +07:00
parent 57ad096712
commit 27c329d2c9
3 changed files with 172 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@ -28,6 +28,7 @@ import android.system.*;
public class MainActivity extends LoggableActivity implements OnTouchListener, OnClickListener public class MainActivity extends LoggableActivity implements OnTouchListener, OnClickListener
{ {
public static final String initText = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA "; public static final String initText = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ";
public static boolean isPushPollCall;
private static int[] hotbarKeys = { private static int[] hotbarKeys = {
LWJGLGLFWKeycode.GLFW_KEY_1, LWJGLGLFWKeycode.GLFW_KEY_2, LWJGLGLFWKeycode.GLFW_KEY_3, LWJGLGLFWKeycode.GLFW_KEY_1, LWJGLGLFWKeycode.GLFW_KEY_2, LWJGLGLFWKeycode.GLFW_KEY_3,
@ -154,6 +155,9 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
mVersionInfo = Tools.getVersionInfo(mProfile.getVersion()); mVersionInfo = Tools.getVersionInfo(mProfile.getVersion());
setTitle("Minecraft " + mProfile.getVersion()); setTitle("Minecraft " + mProfile.getVersion());
// Minecraft 1.13+
isPushPollCall = mVersionInfo.arguments != null;
this.displayMetrics = Tools.getDisplayMetrics(this); this.displayMetrics = Tools.getDisplayMetrics(this);
CallbackBridge.windowWidth = displayMetrics.widthPixels / scaleFactor; CallbackBridge.windowWidth = displayMetrics.widthPixels / scaleFactor;

6
app/src/main/java/org/lwjgl/glfw/CallbackBridge.java
View File

@ -107,11 +107,11 @@ public class CallbackBridge {
private static native void nativeSendData(boolean isAndroid, int type, String data); private static native void nativeSendData(boolean isAndroid, int type, String data);
*/ */
private static native void nativeAttachThreadToJRE(); private static native void nativeAttachThreadToOther(boolean isAndroid, boolean isUsePushPoll);
private static native boolean nativeSendChar(int codepoint); private static native boolean nativeSendChar(int codepoint);
// GLFW: GLFWCharModsCallback deprecated, but is Minecraft still use? // GLFW: GLFWCharModsCallback deprecated, but is Minecraft still use?
private static native boolean nativeSendCharMods(int codepoint, int mods); private static native boolean nativeSendCharMods(int codepoint, int mods);
private static native void nativeSendCursorEnter(int entered); // private static native void nativeSendCursorEnter(int entered);
private static native void nativeSendCursorPos(int x, int y); private static native void nativeSendCursorPos(int x, int y);
private static native void nativeSendFramebufferSize(int width, int height); private static native void nativeSendFramebufferSize(int width, int height);
private static native void nativeSendKey(int key, int scancode, int action, int mods); private static native void nativeSendKey(int key, int scancode, int action, int mods);
@ -123,7 +123,7 @@ public class CallbackBridge {
static { static {
System.loadLibrary("pojavexec"); System.loadLibrary("pojavexec");
nativeAttachThreadToJRE(); nativeAttachThreadToOther(true, MainActivity.isPushPollCall);
} }
} }

248
app/src/main/jni/input_bridge.c
View File

@ -1,8 +1,28 @@
#include <jni.h> #include <jni.h>
#include <assert.h> #include <assert.h>
#include "log.h"
#include "utils.h" #include "utils.h"
struct GLFWInputEvent {
int type;
unsigned int ui1;
int i1, i2, i3, i4;
double d1, d2;
};
struct GLFWInputEvent glfwInputEventArr[100];
int glfwInputEventIndex;
#define EVENT_TYPE_CHAR 1000;
#define EVENT_TYPE_CHAR_MODS 1001;
#define EVENT_TYPE_CURSOR_ENTER 1002;
#define EVENT_TYPE_CURSOR_POS 1003;
#define EVENT_TYPE_FRAMEBUFFER_SIZE 1004;
#define EVENT_TYPE_KEY 1005;
#define EVENT_TYPE_MOUSE_BUTTON 1006;
#define EVENT_TYPE_SCROLL 1007;
#define EVENT_TYPE_WINDOW_SIZE 1008;
typedef void GLFW_invoke_Char_func(void* window, unsigned int codepoint); typedef void GLFW_invoke_Char_func(void* window, unsigned int codepoint);
typedef void GLFW_invoke_CharMods_func(void* window, unsigned int codepoint, int mods); typedef void GLFW_invoke_CharMods_func(void* window, unsigned int codepoint, int mods);
typedef void GLFW_invoke_CursorEnter_func(void* window, int entered); typedef void GLFW_invoke_CursorEnter_func(void* window, int entered);
@ -22,7 +42,7 @@ JNIEnv* secondJNIEnv;
jclass inputBridgeClass_ANDROID, inputBridgeClass_JRE; jclass inputBridgeClass_ANDROID, inputBridgeClass_JRE;
jmethodID inputBridgeMethod_ANDROID, inputBridgeMethod_JRE; jmethodID inputBridgeMethod_ANDROID, inputBridgeMethod_JRE;
jboolean isGrabbing; jboolean isGrabbing, isUsePushPollCall;
jint JNI_OnLoad(JavaVM* vm, void* reserved) { jint JNI_OnLoad(JavaVM* vm, void* reserved) {
if (dalvikJavaVMPtr == NULL) { if (dalvikJavaVMPtr == NULL) {
@ -69,8 +89,30 @@ void getJavaInputBridge(jclass* clazz, jmethodID* method) {
} }
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToJRE(JNIEnv* env, jclass clazz, jboolean isAndroid) { void invokeCursorPos(int x, int y) {
if (isAndroid == JNI_TRUE) { if (isGrabbing) {
if (!isPrepareGrabPos) {
grabCursorX += x - lastCursorX;
grabCursorY += y - lastCursorY;
} else {
isPrepareGrabPos = false;
lastCursorX = x;
lastCursorY = y;
return;
}
}
if (!isUsePushPollCall)
GLFW_invoke_CursorPos(showingWindow, (double) (isGrabbing ? grabCursorX : x), (double) (isGrabbing ? grabCursorY : y));
lastCursorX = x;
lastCursorY = y;
}
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUsePushPoll) {
glfwInputEventIndex = -1;
isUsePushPollCall = isUsePushPoll;
if (isUsePushPoll) {
isPrepareGrabPos = true;
} else if (isAndroid) {
firstJavaVM = dalvikJavaVMPtr; firstJavaVM = dalvikJavaVMPtr;
firstJNIEnv = dalvikJNIEnvPtr_ANDROID; firstJNIEnv = dalvikJNIEnvPtr_ANDROID;
secondJavaVM = runtimeJavaVMPtr; secondJavaVM = runtimeJavaVMPtr;
@ -133,6 +175,60 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeIsGrabbing(J
return isGrabbing; return isGrabbing;
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_GLFW_nglfwPollEvents(JNIEnv* env, jclass clazz) {
if (isUsePushPollCall && isInputReady) {
GLFW_invoke_CursorPos(showingWindow, (double) (isGrabbing ? grabCursorX : x), (double) (isGrabbing ? grabCursorY : y));
for (int i = 0; i < glfwInputEventIndex; i++) {
GLFWInputEvent curr = glfwInputEventArr[i];
switch (curr.type) {
case EVENT_TYPE_CHAR:
if (GLFW_invoke_Char) {
GLFW_invoke_Char(showingWindow, curr.ui1);
}
break;
case EVENT_TYPE_CHAR_MODS:
if (GLFW_invoke_CharMods) {
GLFW_invoke_CharMods(showingWindow, curr.ui1, curr.i2);
}
break;
case EVENT_TYPE_CURSOR_ENTER:
if (GLFW_invoke_CursorEnter) {
GLFW_invoke_CursorEnter(showingWindow, curr.i1);
}
break;
case EVENT_TYPE_FRAMEBUFFER_SIZE:
if (GLFW_invoke_FramebufferSize) {
GLFW_invoke_FramebufferSize(showingWindow, curr.i1, curr.i2);
}
break;
case EVENT_TYPE_KEY:
if (GLFW_invoke_Key) {
GLFW_invoke_Key(showingWindow, curr.i1, curr.i2, curr.i3, curr.i4);
}
break;
case EVENT_TYPE_MOUSE_BUTTON:
if (GLFW_invoke_MouseButton) {
GLFW_invoke_MouseButton(showingWindow, curr.i1, curr.i2, curr.i3);
}
break;
case EVENT_TYPE_SCROLL:
if (GLFW_invoke_Scroll) {
GLFW_invoke_Scroll(showingWindow, curr.d1, curr.d2);
}
break;
case EVENT_TYPE_WINDOW_SIZE:
if (GLFW_invoke_WindowSize) {
GLFW_invoke_WindowSize(showingWindow, curr.i1, curr.i2);
}
break;
default: LOGW("Unknown GLFW input event: %d", curr.type;
}
glfwInputEventIndex = -1;
}
}
}
#define ADD_CALLBACK_WWIN(NAME) \ #define ADD_CALLBACK_WWIN(NAME) \
GLFW_invoke_##NAME##_func* GLFW_invoke_##NAME; \ GLFW_invoke_##NAME##_func* GLFW_invoke_##NAME; \
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSet##NAME##Callback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) { \ JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSet##NAME##Callback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) { \
@ -155,7 +251,12 @@ ADD_CALLBACK_WWIN(WindowSize);
JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendChar(JNIEnv* env, jclass clazz, jint codepoint) { JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendChar(JNIEnv* env, jclass clazz, jint codepoint) {
if (GLFW_invoke_Char && isInputReady) { if (GLFW_invoke_Char && isInputReady) {
GLFW_invoke_Char(showingWindow, codepoint); if (isUsePushPollCall) {
GLFWInputEvent curr = glfwInputEventArr[glfwInputEventIndex++];
curr.type = EVENT_TYPE_CHAR;
curr.ui1 = codepoint;
} else
GLFW_invoke_Char(showingWindow, codepoint);
return JNI_TRUE; return JNI_TRUE;
} }
return JNI_FALSE; return JNI_FALSE;
@ -163,7 +264,13 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendChar(JNI
JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendCharMods(JNIEnv* env, jclass clazz, jint codepoint, jint mods) { JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendCharMods(JNIEnv* env, jclass clazz, jint codepoint, jint mods) {
if (GLFW_invoke_CharMods && isInputReady) { if (GLFW_invoke_CharMods && isInputReady) {
GLFW_invoke_CharMods(showingWindow, codepoint, mods); if (isUsePushPollCall) {
GLFWInputEvent curr = glfwInputEventArr[glfwInputEventIndex++];
curr.type = EVENT_TYPE_CHAR_MODS;
curr.ui1 = codepoint;
curr.i2 = mods;
} else
GLFW_invoke_CharMods(showingWindow, codepoint, mods);
return JNI_TRUE; return JNI_TRUE;
} }
return JNI_FALSE; return JNI_FALSE;
@ -177,37 +284,49 @@ JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendCursorEnter(
*/ */
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendCursorPos(JNIEnv* env, jclass clazz, jint x, jint y) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendCursorPos(JNIEnv* env, jclass clazz, jint x, jint y) {
if (GLFW_invoke_CursorPos && isInputReady) { if (GLFW_invoke_CursorPos && isInputReady) {
if (GLFW_invoke_CursorEnter && !isCursorEntered) { if (!isCursorEntered) {
isCursorEntered = true; if (GLFW_invoke_CursorEnter) {
GLFW_invoke_CursorEnter(showingWindow, 1); isCursorEntered = true;
} if (isUsePushPollCall) {
GLFWInputEvent curr = glfwInputEventArr[glfwInputEventIndex++];
if (isGrabbing) { curr.type = EVENT_TYPE_CURSOR_ENTER;
if (!isPrepareGrabPos) { curr.i1 = 1;
grabCursorX += x - lastCursorX; } else
grabCursorY += y - lastCursorY; GLFW_invoke_CursorEnter(showingWindow, 1);
} else { } else if (isGrabbing) {
isPrepareGrabPos = false; // Some Minecraft versions does not use GLFWCursorEnterCallback
lastCursorX = x; // This is a smart check, as Minecraft will not in grab mode if already not.
lastCursorY = y; isCursorEntered = true;
return;
} }
} }
GLFW_invoke_CursorPos(showingWindow, (double) (isGrabbing ? grabCursorX : x), (double) (isGrabbing ? grabCursorY : y));
lastCursorX = x; invokeCursorPos(x, y);
lastCursorY = y;
} }
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendFramebufferSize(JNIEnv* env, jclass clazz, jint width, jint height) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendFramebufferSize(JNIEnv* env, jclass clazz, jint width, jint height) {
if (GLFW_invoke_FramebufferSize && isInputReady) { if (GLFW_invoke_FramebufferSize && isInputReady) {
GLFW_invoke_FramebufferSize(showingWindow, width, height); if (isUsePushPollCall) {
GLFWInputEvent curr = glfwInputEventArr[glfwInputEventIndex++];
curr.type = EVENT_TYPE_FRAMEBUFFER_SIZE;
curr.i1 = width;
curr.i2 = height;
} else
GLFW_invoke_FramebufferSize(showingWindow, width, height);
} }
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendKey(JNIEnv* env, jclass clazz, jint key, jint scancode, jint action, jint mods) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendKey(JNIEnv* env, jclass clazz, jint key, jint scancode, jint action, jint mods) {
if (GLFW_invoke_Key && isInputReady) { if (GLFW_invoke_Key && isInputReady) {
GLFW_invoke_Key(showingWindow, key, scancode, action, mods); if (isUsePushPollCall) {
GLFWInputEvent curr = glfwInputEventArr[glfwInputEventIndex++];
curr.type = EVENT_TYPE_KEY;
curr.i1 = key;
curr.i2 = scancode;
curr.i3 = action;
curr.i4 = mods;
} else
GLFW_invoke_Key(showingWindow, key, scancode, action, mods);
} }
} }
@ -217,20 +336,39 @@ JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendMouseButton(
// Notify to prepare set new grab pos // Notify to prepare set new grab pos
isPrepareGrabPos = true; isPrepareGrabPos = true;
} else if (GLFW_invoke_MouseButton) { } else if (GLFW_invoke_MouseButton) {
GLFW_invoke_MouseButton(showingWindow, button, action, mods); if (isUsePushPollCall) {
GLFWInputEvent curr = glfwInputEventArr[glfwInputEventIndex++];
curr.type = EVENT_TYPE_MOUSE_BUTTON;
curr.i1 = button;
curr.i2 = action;
curr.i3 = mods;
} else
GLFW_invoke_MouseButton(showingWindow, button, action, mods);
} }
} }
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendScroll(JNIEnv* env, jclass clazz, jdouble xoffset, jdouble yoffset) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendScroll(JNIEnv* env, jclass clazz, jdouble xoffset, jdouble yoffset) {
if (GLFW_invoke_Scroll && isInputReady) { if (GLFW_invoke_Scroll && isInputReady) {
GLFW_invoke_Scroll(showingWindow, (double) xoffset, (double) yoffset); if (isUsePushPollCall) {
GLFWInputEvent curr = glfwInputEventArr[glfwInputEventIndex++];
curr.type = EVENT_TYPE_SCROLL;
curr.d1 = (double) xoffset;
curr.d2 = (double) yoffset;
} else
GLFW_invoke_Scroll(showingWindow, (double) xoffset, (double) yoffset);
} }
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendWindowSize(JNIEnv* env, jclass clazz, jint width, jint height) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendWindowSize(JNIEnv* env, jclass clazz, jint width, jint height) {
if (GLFW_invoke_WindowSize && isInputReady) { if (GLFW_invoke_WindowSize && isInputReady) {
GLFW_invoke_WindowSize(showingWindow, width, height); if (isUsePushPollCall) {
GLFWInputEvent curr = glfwInputEventArr[glfwInputEventIndex++];
curr.type = EVENT_TYPE_WINDOW_SIZE;
curr.i1 = width;
curr.i2 = height;
} else
GLFW_invoke_WindowSize(showingWindow, width, height);
} }
} }
@ -238,62 +376,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetShowingWindow(JNIEnv* en
showingWindow = (long) window; showingWindow = (long) window;
} }
/*
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetCharCallback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) {
void* oldCallback = &GLFW_invoke_Char;
GLFW_invoke_Char = (GLFW_invoke_Char_func*) (uintptr_t) callbackptr;
return (jlong) (uintptr_t) *oldCallback;
}
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetCharModsCallback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) {
void* oldCallback = &GLFW_invoke_CharMods;
GLFW_invoke_CharMods = (GLFW_invoke_CharMods_func*) (uintptr_t) callbackptr;
return (jlong) (uintptr_t) *oldCallback;
}
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetCursorEnterCallback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) {
void* oldCallback = &GLFW_invoke_CursorEnter;
GLFW_invoke_CursorEnter = (GLFW_invoke_CursorEnter_func*) (uintptr_t) callbackptr;
return (jlong) (uintptr_t) *oldCallback;
}
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetCursorPosCallback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) {
void* oldCallback = &GLFW_invoke_CursorPos;
GLFW_invoke_CursorPos = (GLFW_invoke_CursorPos_func*) (uintptr_t) callbackptr;
return (jlong) (uintptr_t) *oldCallback;
}
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetFramebufferSizeCallback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) {
void* oldCallback = &GLFW_invoke_FramebufferSize;
GLFW_invoke_FramebufferSize = (GLFW_invoke_FramebufferSize_func*) (uintptr_t) callbackptr;
return (jlong) (uintptr_t) *oldCallback;
}
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetKeyCallback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) {
void* oldCallback = &GLFW_invoke_Key;
GLFW_invoke_Key = (GLFW_invoke_Key_func*) (uintptr_t) callbackptr;
return (jlong) (uintptr_t) *oldCallback;
}
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetMouseButtonCallback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) {
void* oldCallback = &GLFW_invoke_MouseButton;
GLFW_invoke_MouseButton = (GLFW_invoke_MouseButton_func*) (uintptr_t) callbackptr;
return (jlong) (uintptr_t) *oldCallback;
}
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetScrollCallback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) {
void* oldCallback = &GLFW_invoke_Scroll;
GLFW_invoke_Scroll = (GLFW_invoke_Scroll_func*) (uintptr_t) callbackptr;
return (jlong) (uintptr_t) *oldCallback;
}
JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSetWindowSizeCallback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) {
void* oldCallback = &GLFW_invoke_WindowSize;
GLFW_invoke_WindowSize = (GLFW_invoke_WindowSize_func*) (uintptr_t) callbackptr;
return (jlong) (uintptr_t) *oldCallback;
}
*/
/* /*
* Class: org_lwjgl_glfw_GLFW * Class: org_lwjgl_glfw_GLFW
* Method: nglfwSetInputReady * Method: nglfwSetInputReady