From 55ed5140aaf5c56639a72a3fda12ef412c5edec6 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Sat, 6 Feb 2021 09:11:27 +0700
Subject: [PATCH] Bug fix: grab state was not updated

---
 JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java | 8 ++++----
 Natives/input_bridge_v3.c                                | 2 --
 Natives/utils.h                                          | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
index abefda46..9c11fe50 100644
--- a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
+++ b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
@@ -178,6 +178,9 @@ public class CallbackBridge {
     public static void sendGrabbing(boolean grab, int xset, int yset) {
         // sendData(ANDROID_TYPE_GRAB_STATE, Boolean.toString(grab));
         
+        mouseX = xset;
+        mouseY = yset;
+        
         GLFW.mGLFWIsGrabbing = grab;
         nativeSetGrabbing(grab, xset, yset);
     }
@@ -209,9 +212,6 @@ public class CallbackBridge {
         return "";
     }
     
-    private static void nativeSetGrabbing(boolean grab, int xset, int yset) {
-        mouseX = xset;
-        mouseY = yset;
-    }
+    private static native void nativeSetGrabbing(boolean grab, int xset, int yset);
 }
 
diff --git a/Natives/input_bridge_v3.c b/Natives/input_bridge_v3.c
index b3c86dc3..bd38d69e 100644
--- a/Natives/input_bridge_v3.c
+++ b/Natives/input_bridge_v3.c
@@ -40,8 +40,6 @@ jmethodID inputBridgeMethod_ANDROID, inputBridgeMethod_JRE;
 jclass uikitBridgeClass;
 jmethodID uikitBridgeTouchMethod;
 
-jboolean isGrabbing;
-
 // JNI_OnLoad
 jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     debug("libpojavexec loaded from vm=%p\n", vm);
diff --git a/Natives/utils.h b/Natives/utils.h
index 71fc17ce..c9e62d27 100644
--- a/Natives/utils.h
+++ b/Natives/utils.h
@@ -33,6 +33,8 @@ long showingWindow;
 
 bool isInputReady, isCursorEntered, isPrepareGrabPos, isUseStackQueueCall;
 
+jboolean isGrabbing;
+
 int savedWidth, savedHeight;
 
 jboolean attachThread(bool isAndroid, JNIEnv** secondJNIEnvPtr);