diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 9c7e7365a..2b58d8375 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -631,7 +631,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O case MotionEvent.ACTION_POINTER_DOWN: // 5 CallbackBridge.sendPrepareGrabInitialPos(); - CallbackBridge.sendMouseKeycode(!CallbackBridge.mouseLeft ? LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT : LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, 0, true); + CallbackBridge.sendMouseKeycode(CallbackBridge.mouseLeft ? LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT : LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, 0, true); initialX = x; initialY = y; diff --git a/app/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/app/src/main/java/org/lwjgl/glfw/CallbackBridge.java index bb4d0db7c..9e1659665 100644 --- a/app/src/main/java/org/lwjgl/glfw/CallbackBridge.java +++ b/app/src/main/java/org/lwjgl/glfw/CallbackBridge.java @@ -29,14 +29,11 @@ public class CallbackBridge { sendMouseKeycode(button, 0, state == 1); } - private static boolean threadAttached, screenSizeSet; + private static boolean threadAttached; public static void sendCursorPos(int x, int y) { if (!threadAttached) { threadAttached = CallbackBridge.nativeAttachThreadToOther(true, isMinecraft1p12, MainActivity.isInputStackCall); } - if (!screenSizeSet) { - screenSizeSet = nativeSendScreenSize(windowWidth, windowHeight); - } DEBUG_STRING.append("CursorPos=" + x + ", " + y + "\n"); mouseX = x; @@ -136,7 +133,7 @@ public class CallbackBridge { private static native void nativeSendKey(int key, int scancode, int action, int mods); private static native void nativeSendMouseButton(int button, int action, int mods); private static native void nativeSendScroll(double xoffset, double yoffset); - private static native boolean nativeSendScreenSize(int width, int height); + private static native void nativeSendScreenSize(int width, int height); public static native boolean nativeIsGrabbing(); diff --git a/app/src/main/jni/input_bridge_v3.c b/app/src/main/jni/input_bridge_v3.c index b62f190db..911002d83 100644 --- a/app/src/main/jni/input_bridge_v3.c +++ b/app/src/main/jni/input_bridge_v3.c @@ -278,7 +278,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendMouseButton( } } -JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendScreenSize(JNIEnv* env, jclass clazz, jint width, jint height) { +JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendScreenSize(JNIEnv* env, jclass clazz, jint width, jint height) { if (isInputReady) { if (GLFW_invoke_FramebufferSize) { if (isUseStackQueueCall) { @@ -297,7 +297,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendScreenSi } } - return (isInputReady && (GLFW_invoke_FramebufferSize || GLFW_invoke_WindowSize)); + // return (isInputReady && (GLFW_invoke_FramebufferSize || GLFW_invoke_WindowSize)); } JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSendScroll(JNIEnv* env, jclass clazz, jdouble xoffset, jdouble yoffset) {