2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-21 09:01:56 -07:00
Code Issues Projects Releases Packages Wiki Activity

[Pointer capture] Try to get mouse click detection work correctly

Browse source
This commit is contained in:
khanhduytran0 2020-12-21 04:57:12 +07:00
parent c5fe413f97
commit c7ad50d9fb
1 changed files with 48 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

81
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View file

@ -247,10 +247,10 @@ public class BaseMainActivity extends LoggableActivity {
if (isPointerCaptureSupported()) {
if (!CallbackBridge.isGrabbing() && isCapturing) {
pointerSurface.releaseCapture(); // minecraftGLView.releasePointerCapture();
minecraftGLView.releasePointerCapture();
isCapturing = false;
} else if (CallbackBridge.isGrabbing() && !isCapturing) {
pointerSurface.requestCapture(); // minecraftGLView.requestPointerCapture();
minecraftGLView.requestPointerCapture();
isCapturing = true;
}
}
@ -596,16 +596,9 @@ public class BaseMainActivity extends LoggableActivity {
}
}
CallbackBridge.sendCursorPos(x, y);
switch (e.getButtonState()) {
case MotionEvent.BUTTON_PRIMARY: CallbackBridge.mouseLeft = true;
break;
case MotionEvent.BUTTON_SECONDARY: CallbackBridge.mouseLeft = false;
break;
}
boolean isDown = false;
switch (e.getActionMasked()) {
/*
case MotionEvent.ACTION_DOWN: // 0
case MotionEvent.ACTION_POINTER_DOWN: // 5
CallbackBridge.sendPrepareGrabInitialPos();
@ -624,22 +617,35 @@ public class BaseMainActivity extends LoggableActivity {
case MotionEvent.ACTION_POINTER_UP: // 6
// CallbackBridge.sendCursorPos(x, y);
// CallbackBridge.sendMouseKeycode(rightOverride ? LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT : LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, 0, true);
CallbackBridge.putMouseEventWithCoords(CallbackBridge.mouseLeft /* rightOverride */ ? (byte) 0 : (byte) 1, (byte) 1, x, y);
/*
if (!triggeredLeftMouseButton && Math.abs(initialX - x) < fingerStillThreshold && Math.abs(initialY - y) < fingerStillThreshold) {
sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, true);
sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, false);
}
if (triggeredLeftMouseButton) {
sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, false);
}
*/
sendMouseButton(CallbackBridge.mouseLeft ? LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT : LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, true);
CallbackBridge.putMouseEventWithCoords(CallbackBridge.mouseLeft ? (byte) 0 : (byte) 1, (byte) 1, x, y);
// triggeredLeftMouseButton = false;
// theHandler.removeMessages(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK);
break;
*/
case MotionEvent.ACTION_DOWN: // 0
case MotionEvent.ACTION_POINTER_DOWN: // 5
isDown = true;
break;
case MotionEvent.ACTION_UP: // 1
case MotionEvent.ACTION_CANCEL: // 3
case MotionEvent.ACTION_POINTER_UP: // 6
isDown = false;
break;
case MotionEvent.ACTION_MOVE:
CallbackBridge.sendCursorPos(x, y);
break;
case MotionEvent.ACTION_BUTTON_PRESS:
sendMouseButtonUnconverted(e.getActionButton(), isDown);
break;
case MotionEvent.ACTION_SCROLL:
CallbackBridge.sendScroll(e.getAxisValue(MotionEvent.AXIS_HSCROLL), e.getAxisValue(MotionEvent.AXIS_VSCROLL));
break;
}
debugText.setText(CallbackBridge.DEBUG_STRING.toString());
@ -1080,18 +1086,27 @@ public class BaseMainActivity extends LoggableActivity {
sendKeyPress(keyCode, CallbackBridge.getCurrentMods(), true);
sendKeyPress(keyCode, CallbackBridge.getCurrentMods(), false);
}
private static boolean isLeftMouseDown, isRightMouseDown;
public static void sendMouseButton(int button, boolean status) {
// TODO implement this method!!!
// CallbackBridge.setMouseButtonInGrabMode((byte) button, status ? (byte) 1 : (byte) 0);
// or
isLeftMouseDown = button == LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT && status;
isRightMouseDown = button == LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT && status;
CallbackBridge.sendMouseKeycode(button, CallbackBridge.getCurrentMods(), status);
}
public static void sendMouseButtonUnconverted(int button, boolean status) {
int glfwButton = 0;
switch (button) {
case MotionEvent.BUTTON_PRIMARY:
glfwButton = LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT;
break;
case MotionEvent.BUTTON_TERTIARY:
glfwButton = LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_MIDDLE;
break;
case MotionEvent.BUTTON_SECONDARY:
glfwButton = LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT;
break;
}
sendMouseButton(glfwButton, status);
}
public void calculateMcScale() {
int scale = 1;