Calculate and take into account window decoration, nav bar and/or insets

to remove potential pointer offset caused by them.

Add an option to disable the behavior.

Fixed nav bar hiding content in general settings and while connected.

Author: iiordanov

bVNC/src/main/java/com/iiordanov/bVNC/RemoteCanvasActivity.java

@@ -55,4 +55,17 @@ public interface TouchInputDelegate {
      * @return true if DPad should be rotated
      */
     boolean getRotateDpad();
+
+
+    /**
+     * Gets pointer offset in x axis due to e.g. insets
+     * @return the width of the left inset
+     */
+    int getxPointerOffset();
+
+    /**
+     * Gets pointer offset in y axis due to e.g. window decorations
+     * @return the height of the window decoration
+     */
+    int getyPointerOffset();
 }

bVNC/src/main/java/com/iiordanov/bVNC/input/TouchInputDelegate.java

@@ -21,11 +21,14 @@
 package com.iiordanov.bVNC.input;
 import com.undatech.opaque.Viewable;
 
+import android.annotation.SuppressLint;
+import android.os.Build;
 import android.os.SystemClock;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 
+import androidx.annotation.NonNull;
 import androidx.core.view.InputDeviceCompat;
 
 import com.iiordanov.bVNC.Constants;
@@ -39,7 +42,7 @@ abstract class TouchInputHandlerGeneric extends GestureDetector.SimpleOnGestureL
         implements TouchInputHandler, ScaleGestureDetector.OnScaleGestureListener {
     private static final String TAG = "InputHandlerGeneric";
     protected final boolean debugLogging;
-    int maxSwipeSpeed = 1;
+    int maxSwipeSpeed;
     // If swipe events are registered once every baseSwipeTime miliseconds, then
     // swipeSpeed will be one. If more often, swipe-speed goes up, if less, down.
     final long baseSwipeTime = 400;
@@ -79,8 +82,8 @@ abstract class TouchInputHandlerGeneric extends GestureDetector.SimpleOnGestureL
     boolean scrollRight = false;
     // These variables indicate whether the dpad should be used as arrow keys
     // and whether it should be rotated.
-    boolean useDpadAsArrows = false;
-    boolean rotateDpad = false;
+    boolean useDpadAsArrows;
+    boolean rotateDpad;
     // The variables which indicates how many scroll events to send per swipe
     // event and the maximum number to send at one time.
     long swipeSpeed = 1;
@@ -124,8 +127,8 @@ abstract class TouchInputHandlerGeneric extends GestureDetector.SimpleOnGestureL
 
         displayDensity = viewable.getDisplayDensity();
 
-        distXQueue = new LinkedList<Float>();
-        distYQueue = new LinkedList<Float>();
+        distXQueue = new LinkedList<>();
+        distYQueue = new LinkedList<>();
 
         baseSwipeDist = baseSwipeDist * displayDensity;
         startSwipeDist = startSwipeDist * displayDensity;
@@ -139,32 +142,39 @@ abstract class TouchInputHandlerGeneric extends GestureDetector.SimpleOnGestureL
      * @return the appropriate X coordinate.
      */
     protected int getX(MotionEvent e) {
-        float scale = viewable.getZoomFactor();
-        return (int) (viewable.getAbsX() + e.getX() / scale);
+        return getScaledX(e, viewable.getZoomFactor());
+    }
+
+    private int getScaledX(MotionEvent e, float scale) {
+        int xoff = touchInputDelegate.getxPointerOffset();
+        return (int) (viewable.getAbsX() + (e.getX() - (float)xoff)/ scale);
     }
 
     /**
      * Function to get appropriate Y coordinate from motion event for this input handler.
      * @return the appropriate Y coordinate.
      */
     protected int getY(MotionEvent e) {
-        float scale = viewable.getZoomFactor();
-        return (int) (viewable.getAbsY() + (e.getY() - 1.f * viewable.getTop()) / scale);
+        return getScaledY(e, viewable.getZoomFactor());
+    }
+
+    private int getScaledY(MotionEvent e, float scale) {
+        int yoff = touchInputDelegate.getyPointerOffset();
+        return (int) (viewable.getAbsY() + (e.getY() - (float)yoff) / scale);
     }
 
     /**
      * Handles actions performed by a mouse-like device.
      * @param e touch or generic motion event
-     * @return
      */
     protected boolean handleMouseActions(MotionEvent e) {
         boolean used = false;
         final int action = e.getActionMasked();
         final int meta = e.getMetaState();
         final int bstate = e.getButtonState();
         float scale = viewable.getZoomFactor();
-        int x = (int) (viewable.getAbsX() + e.getX() / scale);
-        int y = (int) (viewable.getAbsY() + (e.getY() - 1.f * viewable.getTop()) / scale);
+        int x = getScaledX(e, scale);
+        int y = getScaledY(e, scale);
 
         switch (action) {
             // If a mouse button was pressed or mouse was moved.
@@ -270,9 +280,6 @@ protected boolean handleMouseActions(MotionEvent e) {
 
     /**
      * Sends scroll events with previously set direction and speed.
-     * @param x
-     * @param y
-     * @param meta
      */
     protected void sendScrollEvents(int x, int y, int meta) {
         GeneralUtils.debugLog(debugLogging, TAG, "sendScrollEvents");
@@ -298,11 +305,11 @@ protected void sendScrollEvents(int x, int y, int meta) {
         remoteInput.getPointer().releaseButton(x, y, meta);
     }
 
-    /*
+    /**
      * @see android.view.GestureDetector.SimpleOnGestureListener#onSingleTapConfirmed(android.view.MotionEvent)
      */
     @Override
-    public boolean onSingleTapConfirmed(MotionEvent e) {
+    public boolean onSingleTapConfirmed(@NonNull MotionEvent e) {
         GeneralUtils.debugLog(debugLogging, TAG, "onSingleTapConfirmed, e: " + e);
         performLeftClick(e);
         return true;
@@ -317,7 +324,7 @@ private void performLeftClick(MotionEvent e) {
         viewable.movePanToMakePointerVisible();
     }
 
-    /*
+    /**
      * @see android.view.GestureDetector.SimpleOnGestureListener#onDoubleTap(android.view.MotionEvent)
      */
     @Override
@@ -336,7 +343,7 @@ public boolean onDoubleTap(MotionEvent e) {
         return true;
     }
 
-    /*
+    /**
      * @see android.view.GestureDetector.SimpleOnGestureListener#onLongPress(android.view.MotionEvent)
      */
     @Override
@@ -402,9 +409,10 @@ private void detectImmersiveSwipe(float y) {
         }
     }
 
-    /*
-     * @see com.iiordanov.bVNC.input.InputHandler#0yonTouchEvent(android.view.MotionEvent)
+    /**
+     * @see com.iiordanov.bVNC.input.TouchInputHandlerGeneric#onTouchEvent(android.view.MotionEvent)
      */
+    @SuppressLint("ObsoleteSdkInt")
     @Override
     public boolean onTouchEvent(MotionEvent e) {
         GeneralUtils.debugLog(debugLogging, TAG, "onTouchEvent, e: " + e);
@@ -421,7 +429,7 @@ public boolean onTouchEvent(MotionEvent e) {
             disregardNextOnFling = true;
         }
 
-        if (android.os.Build.VERSION.SDK_INT >= 14) {
+        if (Build.VERSION.SDK_INT >= 14) {
             // Handle and consume actions performed by a (e.g. USB or bluetooth) mouse.
             if (handleMouseActions(e))
                 return true;
@@ -537,15 +545,14 @@ public boolean onTouchEvent(MotionEvent e) {
                 break;
 
             case 2:
-                switch (action) {
-                    case MotionEvent.ACTION_POINTER_DOWN:
-                        if (!inScaling) {
-                            // This boolean prevents the right-click from firing simultaneously as a middle button click.
-                            thirdPointerWasDown = true;
-                            remoteInput.getPointer().middleButtonDown(getX(e), getY(e), meta);
-                            // Enter middle-drag mode.
-                            middleDragMode = true;
-                        }
+                if (action == MotionEvent.ACTION_POINTER_DOWN) {
+                    if (!inScaling) {
+                        // This boolean prevents the right-click from firing simultaneously as a middle button click.
+                        thirdPointerWasDown = true;
+                        remoteInput.getPointer().middleButtonDown(getX(e), getY(e), meta);
+                        // Enter middle-drag mode.
+                        middleDragMode = true;
+                    }
                 }
                 break;
         }
@@ -554,7 +561,7 @@ public boolean onTouchEvent(MotionEvent e) {
         return gestureDetector.onTouchEvent(e);
     }
 
-    /*
+    /**
      * @see android.view.ScaleGestureDetector.OnScaleGestureListener#onScale(android.view.ScaleGestureDetector)
      */
     @Override
@@ -625,7 +632,7 @@ public boolean onScale(ScaleGestureDetector detector) {
             }
 
             if (eventConsumed && viewable != null) {
-                if (inScaling == false) {
+                if (!inScaling) {
                     inScaling = true;
                 }
                 GeneralUtils.debugLog(debugLogging, TAG, "Changing zoom level: " + detector.getScaleFactor());
@@ -635,11 +642,11 @@ public boolean onScale(ScaleGestureDetector detector) {
         return eventConsumed;
     }
 
-    /*
+    /**
      * @see android.view.ScaleGestureDetector.OnScaleGestureListener#onScaleBegin(android.view.ScaleGestureDetector)
      */
     @Override
-    public boolean onScaleBegin(ScaleGestureDetector detector) {
+    public boolean onScaleBegin(@NonNull ScaleGestureDetector detector) {
         GeneralUtils.debugLog(debugLogging, TAG, "onScaleBegin (" + xInitialFocus + "," + yInitialFocus + ")");
         inScaling = false;
         scalingJustFinished = false;
@@ -652,11 +659,11 @@ public boolean onScaleBegin(ScaleGestureDetector detector) {
         return true;
     }
 
-    /*
+    /**
      * @see android.view.ScaleGestureDetector.OnScaleGestureListener#onScaleEnd(android.view.ScaleGestureDetector)
      */
     @Override
-    public void onScaleEnd(ScaleGestureDetector detector) {
+    public void onScaleEnd(@NonNull ScaleGestureDetector detector) {
         GeneralUtils.debugLog(debugLogging, TAG, "onScaleEnd");
         inScaling = false;
         inSwiping = false;
@@ -665,8 +672,6 @@ public void onScaleEnd(ScaleGestureDetector detector) {
 
     /**
      * Returns the sign of the given number.
-     * @param number
-     * @return
      */
     protected float getSign(float number) {
         float sign;

bVNC/src/main/java/com/iiordanov/bVNC/input/TouchInputHandlerGeneric.java

@@ -27,6 +27,8 @@
 import android.widget.ImageButton;
 import android.widget.RelativeLayout;
 
+import androidx.annotation.NonNull;
+
 import com.undatech.opaque.InputCarriable;
 import com.undatech.opaque.util.GeneralUtils;
 import com.undatech.remoteClientUi.R;
@@ -191,7 +193,7 @@ private void initializeSingleHandedMode(MotionEvent e) {
      * @see com.iiordanov.bVNC.input.InputHandlerGeneric#onSingleTapConfirmed(android.view.MotionEvent)
      */
     @Override
-    public boolean onSingleTapConfirmed(MotionEvent e) {
+    public boolean onSingleTapConfirmed(@NonNull MotionEvent e) {
         GeneralUtils.debugLog(debugLogging, TAG, "onSingleTapConfirmed");
 
         boolean buttonsVisible = (singleHandOpts.getVisibility() == View.VISIBLE);

bVNC/src/main/java/com/iiordanov/bVNC/input/TouchInputHandlerSingleHanded.java

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/canvasLayout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@android:color/background_dark"
     android:orientation="vertical"
-    android:fitsSystemWindows="true"
+    android:fitsSystemWindows="false"
     >
 
     <com.iiordanov.bVNC.RemoteCanvas

bVNC/src/main/res/layout-large/canvas.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/canvasLayout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@android:color/background_dark"
     android:orientation="vertical"
-    android:fitsSystemWindows="true"
+    android:fitsSystemWindows="false"
     >
 
     <com.iiordanov.bVNC.RemoteCanvas

bVNC/src/main/res/layout/canvas.xml

@@ -417,6 +417,7 @@ Known issues:
     <string name="landscape_force">Force Landscape Orientation</string>
 
     <string name="left_handed_mode">Left-Handed Mode</string>
+    <string name="disable_pointer_offset_correction">Disable pointer offset correction</string>
 
     <string name="list_caption">List</string>
     <string name="list_name_caption">List Name</string>

bVNC/src/main/res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"     android:paddingRight="26dip">
+    <EditTextPreference/>
     <SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="disableImmersive"
@@ -40,6 +41,10 @@
         android:key="scrollSpeed"
         android:max="9"
         android:title="@string/scroll_speed" />
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="disablePointerOffsetCalculation"
+        android:title="@string/disable_pointer_offset_correction" />
     <PreferenceCategory android:title="@string/applies_to_new_connections_only">
         <!--input_methods android:key must match Constants.defaultInputMethodTag -->
         <ListPreference

bVNC/src/main/res/xml/global_preferences.xml

@@ -4,4 +4,5 @@
             android:defaultValue="true"
             android:key="preferSendingUnicode"
             android:title="@string/prefer_sending_unicode" />
+        <EditTextPreference/>
 </PreferenceScreen>

bVNC/src/main/res/xml/global_preferences_rdp.xml

@@ -1,3 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <EditTextPreference/>
 </PreferenceScreen>