screen rotate opti

jiaxinchen-max · Oct 16, 2024 · 229a16c · 229a16c
1 parent aa3e083
commit 229a16c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/app/src/main/java/com/termux/filepicker/TermuxFilesProvider.java b/app/src/main/java/com/termux/filepicker/TermuxFilesProvider.java
@@ -119,8 +119,7 @@ private static String getMimeType(File file) {
     public final void attachInfo(Context context, ProviderInfo info) {
         super.attachInfo(context, info);
         this.pkgName = Objects.requireNonNull(getContext()).getPackageName();
-        this.dataDir = Objects.requireNonNull(context.getFilesDir());
-//        this.dataDir = Objects.requireNonNull(context.getFilesDir().getParentFile());
+        this.dataDir = Objects.requireNonNull(context.getFilesDir().getParentFile());
 //        String path = dataDir.getPath();
 //        if (path.startsWith("/data/user/"))
 //            this.userDataDir = new File("/data/user_de/" + path.substring("/data/user/".length()));
@@ -299,8 +298,8 @@ private void includeFile(MatrixCursor result, String docId, File file) throws Fi
         //once private directory
         String path = file.getPath();
         if (path.equals(this.dataDir.getPath())) {
-//            displayName = "data";
-            displayName = file.getName();
+            displayName = "data";
+//            displayName = file.getName();
         } /*else if (androidDataDir != null && path.equals(androidDataDir.getPath())) {
             displayName = "android_data";
         } else if (androidObbDir != null && path.equals(androidObbDir.getPath())) {

diff --git a/termux-x11/src/main/java/com/termux/x11/controller/core/CursorLocker.java b/termux-x11/src/main/java/com/termux/x11/controller/core/CursorLocker.java
@@ -17,7 +17,7 @@ public CursorLocker(LorieView xServer) {
         this.xServer = xServer;
         maxDistance = (short)(xServer.screenInfo.width * 0.05f);
         Timer timer = new Timer();
-        timer.scheduleAtFixedRate(this, 0, 1000 / 60);
+        timer.schedule(this, 0, 1000 / 60);
     }
 
     public short getMaxDistance() {

diff --git a/termux-x11/src/main/java/com/termux/x11/controller/xserver/Pointer.java b/termux-x11/src/main/java/com/termux/x11/controller/xserver/Pointer.java
@@ -18,6 +18,7 @@ public int flag() {
         }
     }
 
+    private static final float EPSILON = 0.001f;
     public static final byte MAX_BUTTONS = 8;
     private final ArrayList<OnPointerMotionListener> onPointerMotionListeners = new ArrayList<>();
     private final Bitmask buttonMask = new Bitmask();
@@ -46,10 +47,16 @@ public Pointer(LorieView xServer) {
     }
 
     public void setX(int x) {
+        if (screenPointLiesOutsideImageBoundaryX(x)){
+            return;
+        }
         this.x = (short) x;
     }
 
     public void setY(int y) {
+        if (screenPointLiesOutsideImageBoundaryY(y)){
+            return;
+        }
         this.y = (short) y;
     }
 
@@ -70,13 +77,25 @@ public short getClampedY() {
     }
 
     public void moveTo(int x, int y) {
-        if (xServer.screenInfo.setCursorPosition(x,y)){
-//            setX(x);
-//            setY(y);
+        if (xServer.screenInfo.setCursorPosition(x, y)) {
+            setX(x);
+            setY(y);
             triggerOnPointerMove(this.x, this.y);
         }
     }
 
+    private boolean screenPointLiesOutsideImageBoundaryX(float screenX) {
+        float scaledX = screenX * xServer.screenInfo.scale.x;
+        float imageWidth = (float) xServer.screenInfo.imageWidth + EPSILON;
+        return scaledX < -EPSILON || scaledX > imageWidth;
+    }
+
+    private boolean screenPointLiesOutsideImageBoundaryY(float screenY) {
+        float scaledY = screenY * xServer.screenInfo.scale.y;
+        float imageHeight = (float) xServer.screenInfo.imageHeight + EPSILON;
+        return scaledY < -EPSILON || scaledY > imageHeight;
+    }
+
     public Bitmask getButtonMask() {
         return buttonMask;
     }