fix pointer grab by not handling action cancel

Author: riccardobl

jme3-android/src/main/java/com/jme3/input/android/AndroidMouseInput14.java

@@ -234,7 +234,6 @@ public boolean onGenericMotion(MotionEvent event) {
                 break;
 
             case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
                 if((btnState & MotionEvent.BUTTON_PRIMARY) == MotionEvent.BUTTON_PRIMARY) {
                     leftPressed = false;
                 }
@@ -269,10 +268,6 @@ public void setCursorVisible(boolean visible) {
         logger.log(Level.FINE, "Cannot hide mouse till API 24");
     }
 
-    @Override
-    public void setMouseGrab(boolean grab) {
-        logger.log(Level.FINE, "Cannot grab mouse till API 26");
-    }
 
     @Override
     public int getButtonCount() {

jme3-android/src/main/java/com/jme3/input/android/AndroidMouseInput24.java

@@ -79,7 +79,6 @@ public boolean onGenericMotion(MotionEvent event) {
                     break;
 
                 case MotionEvent.ACTION_BUTTON_RELEASE:
-                case MotionEvent.ACTION_CANCEL:
                     if(btnAction == MotionEvent.BUTTON_PRIMARY) {
                         leftPressed = false;
                     }

jme3-android/src/main/java/com/jme3/input/android/AndroidMouseInput26.java

@@ -77,7 +77,6 @@ public boolean onCapturedPointer(MotionEvent event) {
                 break;
 
             case MotionEvent.ACTION_BUTTON_RELEASE:
-            case MotionEvent.ACTION_CANCEL:
                 if(btnAction == MotionEvent.BUTTON_PRIMARY) {
                     leftPressed = false;
                 }
@@ -108,8 +107,8 @@ public boolean onCapturedPointer(MotionEvent event) {
     }
 
     @Override
-    public void setMouseGrab(boolean grab) {
-        if(grab) {
+    public void setCursorVisible(boolean visible) {
+        if(!visible) {
             inputHandler.getView().requestPointerCapture();
         } else {
             inputHandler.getView().releasePointerCapture();

jme3-core/src/main/java/com/jme3/app/ChaseCameraAppState.java

@@ -127,7 +127,7 @@ public final void registerWithInput() {
         initToggleRotateInput();
 
         inputManager.addListener(this, inputs);
-        inputManager.setMouseGrab(!dragToRotate);
+        inputManager.setCursorVisible(dragToRotate);
     }
 
     @Override
@@ -441,7 +441,7 @@ public void setDragToRotate(boolean dragToRotate) {
         this.dragToRotate = dragToRotate;
         this.canRotate = !dragToRotate;
         if (inputManager != null) {
-            inputManager.setMouseGrab(!dragToRotate);
+            inputManager.setCursorVisible(dragToRotate);
         }
     }
 

jme3-core/src/main/java/com/jme3/input/ChaseCamera.java

@@ -925,7 +925,7 @@ public boolean isDragToRotate() {
     public void setDragToRotate(boolean dragToRotate) {
         this.dragToRotate = dragToRotate;
         this.canRotate = !dragToRotate;
-        inputManager.setMouseGrab(!dragToRotate);
+        inputManager.setCursorVisible(dragToRotate);
     }
 
     /**

jme3-core/src/main/java/com/jme3/input/FlyByCamera.java

@@ -205,9 +205,8 @@ public float getZoomSpeed() {
      */
     public void setEnabled(boolean enable) {
         if (enabled && !enable) {
-            if (inputManager != null) {
-                inputManager.setMouseGrab(!dragToRotate);
-                inputManager.setCursorVisible(!dragToRotate || (dragToRotate && canRotate));
+            if (inputManager != null && (!dragToRotate || (dragToRotate && canRotate))) {
+                inputManager.setCursorVisible(true);
             }
         }
         enabled = enable;
@@ -247,7 +246,7 @@ public boolean isDragToRotate() {
     public void setDragToRotate(boolean dragToRotate) {
         this.dragToRotate = dragToRotate;
         if (inputManager != null) {
-            inputManager.setMouseGrab(!dragToRotate);
+            inputManager.setCursorVisible(dragToRotate);
         }
     }
 
@@ -288,7 +287,7 @@ public void registerWithInput(InputManager inputManager) {
         inputManager.addMapping(CameraInput.FLYCAM_LOWER, new KeyTrigger(KeyInput.KEY_Z));
 
         inputManager.addListener(this, mappings);
-        inputManager.setMouseGrab(!dragToRotate && isEnabled());
+        inputManager.setCursorVisible(dragToRotate || !isEnabled());
 
         Joystick[] joysticks = inputManager.getJoysticks();
         if (joysticks != null && joysticks.length > 0) {
@@ -350,7 +349,7 @@ public void unregisterInput() {
         }
 
         inputManager.removeListener(this);
-        inputManager.setMouseGrab(false);
+        inputManager.setCursorVisible(!dragToRotate);
 
         // Joysticks cannot be "unassigned" in the same way, but mappings are removed with listener.
         // Joystick-specific mapping might persist but won't trigger this listener.

jme3-core/src/main/java/com/jme3/input/InputManager.java

@@ -96,7 +96,6 @@ public class InputManager implements RawInputListener {
     private long frameDelta = 0;
     private boolean eventsPermitted = false;
     private boolean mouseVisible = true;
-    private boolean mouseGrab = false;
     private boolean safeMode = false;
     private float globalAxisDeadZone = 0.05f;
     private final Vector2f cursorPos = new Vector2f();
@@ -701,18 +700,6 @@ public void setCursorVisible(boolean visible) {
         }
     }
 
-    /**
-     * Set whether to grab the mouse or not.
-     *
-     * @param grab whether to grab the mouse or not.
-     */
-    public void setMouseGrab(boolean grab) {
-        if (mouseGrab != grab) {
-            mouseGrab = grab;
-            mouse.setMouseGrab(mouseGrab);
-        }
-    }
-
     /**
      * Returns the current cursor position. The position is relative to the
      * bottom-left of the screen and is in pixels.

jme3-core/src/main/java/com/jme3/input/MouseInput.java

@@ -75,13 +75,6 @@ public interface MouseInput extends Input {
      */
     public void setCursorVisible(boolean visible);
 
-    /**
-     * Set whether to grab the mouse or not.
-     *
-     * @param grab whether to grab the mouse or not.
-     */
-    public void setMouseGrab(boolean grab);
-
     /**
      * Returns the number of buttons the mouse has. Typically 3 for most mice.
      *

jme3-core/src/main/java/com/jme3/input/dummy/DummyMouseInput.java

@@ -48,10 +48,6 @@ public void setCursorVisible(boolean visible) {
             throw new IllegalStateException("Input not initialized.");
     }
 
-    @Override
-    public void setMouseGrab(boolean grab) {
-    }
-
     @Override
     public int getButtonCount() {
         return 0;

jme3-desktop/src/main/java/com/jme3/input/AWTMouseInput.java

@@ -183,10 +183,6 @@ private int convertButton(int i) {
     public void setCursorVisible(final boolean visible) {
     }
 
-    @Override
-    public void setMouseGrab(boolean grab) {
-    }
-
     @Override
     public int getButtonCount() {
         return 3;
@@ -239,4 +235,4 @@ public void mouseExited(java.awt.event.MouseEvent e) {
     public void mouseWheelMoved(MouseWheelEvent e) {
       onWheelScroll(e.getWheelRotation() * WHEEL_SCALE, e.getWheelRotation() * WHEEL_SCALE);
     }
-}
+}