Merge remote-tracking branch 'refs/remotes/origin/main'

JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java

@@ -893,13 +893,10 @@ public class GLFW
     public static GLFWVidMode.Buffer glfwGetVideoModes(@NativeType("GLFWmonitor *") long monitor) {
         MemoryStack stack = stackGet();
         int stackPointer = stack.getPointer();
-        IntBuffer count = stack.callocInt(1);
         try {
             // long __result = nglfwGetVideoModes(monitor, memAddress(count));
-            long __result = memAddress(stack.callocLong(1));
-            GLFWVidMode.Buffer buffer = GLFWVidMode.createSafe(__result, 1);
-            buffer.put(glfwGetVideoMode(monitor));
-            return buffer;
+            long __result = glfwGetVideoMode(monitor).address();
+            return GLFWVidMode.createSafe(__result, 1);
         } finally {
             stack.setPointer(stackPointer);
         }

Natives/SurfaceViewController.m

@@ -310,6 +310,7 @@ self.view.frame.size.width * 0.3 - 36.0 * 0.7, self.view.frame.size.height)];
     self.scrollPanGesture.delegate = self;
     self.scrollPanGesture.minimumNumberOfTouches = 2;
     self.scrollPanGesture.maximumNumberOfTouches = 2;
+    [self.surfaceView addGestureRecognizer:self.scrollPanGesture];
 
     if (@available(iOS 13.4, *)) {
         [self.surfaceView addInteraction:[[UIPointerInteraction alloc] initWithDelegate:self]];

Natives/input_bridge_v3.m

@@ -275,13 +275,11 @@ JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetGrabbing(JNIE
             CGFloat screenScale = [[UIScreen mainScreen] scale] * resolutionScale;
             callback_SurfaceViewController_onTouch(ACTION_DOWN, lastVirtualMousePoint.x * screenScale, lastVirtualMousePoint.y * screenScale);
             ((SurfaceViewController *)currentVC()).mousePointerView.frame = virtualMouseFrame;
-            [surfaceView removeGestureRecognizer:((SurfaceViewController *)currentVC()).scrollPanGesture];
-        } else {
-            [surfaceView addGestureRecognizer:((SurfaceViewController *)currentVC()).scrollPanGesture];
         }
+        ((SurfaceViewController *)currentVC()).scrollPanGesture.enabled = !isGrabbing;
         ((SurfaceViewController *)currentVC()).mousePointerView.hidden = isGrabbing || !virtualMouseEnabled;
         if(@available(iOS 14.0, *)) {
-            [currentVC() setNeedsUpdateOfPrefersPointerLocked];
+            [(SurfaceViewController *)currentVC() setNeedsUpdateOfPrefersPointerLocked];
         }
     });
 }

entitlements.xml

@@ -3,6 +3,8 @@
 <dict>
     <key>com.apple.developer.kernel.extended-virtual-addressing</key>
     <true/>
+    <key>com.apple.developer.kernel.increased-memory-limit</key>
+    <true/>
     <key>com.apple.private.security.container-required</key>
     <true/>
     <key>com.apple.security.exception.files.absolute-path.read-write</key>

entitlements_ipa.xml

@@ -3,5 +3,7 @@
 <dict>
     <key>com.apple.developer.kernel.extended-virtual-addressing</key>
     <true/>
+    <key>com.apple.developer.kernel.increased-memory-limit</key>
+    <true/>
 </dict>
 </plist>