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

Fix input broken on 1.13+

Browse Source
This commit is contained in:
khanhduytran0 2020-11-03 14:43:16 +07:00
parent be5e895475
commit da14e640a7
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/jni/input_bridge_v3.c
View File

@ -77,15 +77,12 @@ ADD_CALLBACK_WWIN(WindowSize);
#undef ADD_CALLBACK_WWIN #undef ADD_CALLBACK_WWIN
void attachThreadIfNeed(bool isAndroid, bool* isAttached, JNIEnv** secondJNIEnvPtr) { void attachThread(bool isAndroid, JNIEnv** secondJNIEnvPtr) {
if (!*isAttached) {
if (isAndroid && runtimeJavaVMPtr) { if (isAndroid && runtimeJavaVMPtr) {
(*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, secondJNIEnvPtr, NULL); (*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, secondJNIEnvPtr, NULL);
} else if (!isAndroid && dalvikJavaVMPtr) { } else if (!isAndroid && dalvikJavaVMPtr) {
(*dalvikJavaVMPtr)->AttachCurrentThread(dalvikJavaVMPtr, secondJNIEnvPtr, NULL); (*dalvikJavaVMPtr)->AttachCurrentThread(dalvikJavaVMPtr, secondJNIEnvPtr, NULL);
} }
*isAttached = true;
}
} }
void getJavaInputBridge(jclass* clazz, jmethodID* method) { void getJavaInputBridge(jclass* clazz, jmethodID* method) {
@ -111,17 +108,17 @@ void sendData(int type, int i1, int i2, int i3, int i4) {
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUseStackQueue) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUseStackQueue) {
isUseStackQueueCall = (int) isUseStackQueue; isUseStackQueueCall = (int) isUseStackQueue;
if (isUseStackQueue) { if (isAndroid) {
isPrepareGrabPos = true; attachThread(true, &runtimeJNIEnvPtr_ANDROID);
} else if (isAndroid) {
attachThreadIfNeed(true, &isAndroidThreadAttached, &runtimeJNIEnvPtr_ANDROID);
getJavaInputBridge(&inputBridgeClass_ANDROID, &inputBridgeMethod_ANDROID);
isPrepareGrabPos = true;
} else { } else {
attachThreadIfNeed(false, &isRuntimeThreadAttached, &dalvikJNIEnvPtr_JRE); attachThread(false, &dalvikJNIEnvPtr_JRE);
// getJavaInputBridge(&inputBridgeClass_JRE, &inputBridgeMethod_JRE); // getJavaInputBridge(&inputBridgeClass_JRE, &inputBridgeMethod_JRE);
} }
if (isUseStackQueue && isAndroid) {
isPrepareGrabPos = true;
getJavaInputBridge(&inputBridgeClass_ANDROID, &inputBridgeMethod_ANDROID);
}
} }
JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNIEnv* env, jclass clazz, jint action, jstring copy) { JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNIEnv* env, jclass clazz, jint action, jstring copy) {

2
app/src/main/jni/utils.h
View File

@ -13,7 +13,7 @@ JNIEnv* dalvikJNIEnvPtr_JRE;
long showingWindow; long showingWindow;
bool isAndroidThreadAttached, isRuntimeThreadAttached, isInputReady, isCursorEntered, isPrepareGrabPos; bool isInputReady, isCursorEntered, isPrepareGrabPos;
char** convert_to_char_array(JNIEnv *env, jobjectArray jstringArray); char** convert_to_char_array(JNIEnv *env, jobjectArray jstringArray);
jobjectArray convert_from_char_array(JNIEnv *env, char **charArray, int num_rows); jobjectArray convert_from_char_array(JNIEnv *env, char **charArray, int num_rows);