moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-04-05 15:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use event time on input events rather than current uptime

Browse Source
This commit is contained in:
Cameron Gutman
2022-08-02 18:07:15 -05:00
parent b70a47f5e5
commit eb2e79977d
6 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/limelight/binding/input/touch/AbsoluteTouchContext.java
View File

@@ -1,6 +1,5 @@
package com.limelight.binding.input.touch;
import android.os.SystemClock;
import android.view.View;
import com.limelight.nvstream.NvConnection;
@@ -53,7 +52,7 @@ public class AbsoluteTouchContext implements TouchContext {
}
@Override
public boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger)
public boolean touchDownEvent(int eventX, int eventY, long eventTime, boolean isNewFinger)
{
if (!isNewFinger) {
// We don't handle finger transitions for absolute mode
@@ -62,7 +61,7 @@ public class AbsoluteTouchContext implements TouchContext {
lastTouchLocationX = lastTouchDownX = eventX;
lastTouchLocationY = lastTouchDownY = eventY;
lastTouchDownTime = SystemClock.uptimeMillis();
lastTouchDownTime = eventTime;
cancelled = confirmedTap = confirmedLongPress = false;
if (actionIndex == 0) {
@@ -90,7 +89,7 @@ public class AbsoluteTouchContext implements TouchContext {
}
@Override
public void touchUpEvent(int eventX, int eventY)
public void touchUpEvent(int eventX, int eventY, long eventTime)
{
if (cancelled) {
return;
@@ -130,7 +129,7 @@ public class AbsoluteTouchContext implements TouchContext {
lastTouchLocationX = lastTouchUpX = eventX;
lastTouchLocationY = lastTouchUpY = eventY;
lastTouchUpTime = SystemClock.uptimeMillis();
lastTouchUpTime = eventTime;
}
private synchronized void startLongPressTimer() {
@@ -214,7 +213,7 @@ public class AbsoluteTouchContext implements TouchContext {
}
@Override
public boolean touchMoveEvent(int eventX, int eventY)
public boolean touchMoveEvent(int eventX, int eventY, long eventTime)
{
if (cancelled) {
return true;

15
app/src/main/java/com/limelight/binding/input/touch/RelativeTouchContext.java
View File

@@ -1,6 +1,5 @@
package com.limelight.binding.input.touch;
import android.os.SystemClock;
import android.view.View;
import com.limelight.nvstream.NvConnection;
@@ -66,7 +65,7 @@ public class RelativeTouchContext implements TouchContext {
yDelta <= TAP_MOVEMENT_THRESHOLD;
}
private boolean isTap()
private boolean isTap(long eventTime)
{
if (confirmedDrag || confirmedMove || confirmedScroll) {
return false;
@@ -79,7 +78,7 @@ public class RelativeTouchContext implements TouchContext {
return false;
}
long timeDelta = SystemClock.uptimeMillis() - originalTouchTime;
long timeDelta = eventTime - originalTouchTime;
return isWithinTapBounds(lastTouchX, lastTouchY) && timeDelta <= TAP_TIME_THRESHOLD;
}
@@ -94,7 +93,7 @@ public class RelativeTouchContext implements TouchContext {
}
@Override
public boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger)
public boolean touchDownEvent(int eventX, int eventY, long eventTime, boolean isNewFinger)
{
// Get the view dimensions to scale inputs on this touch
xFactor = referenceWidth / (double)targetView.getWidth();
@@ -105,7 +104,7 @@ public class RelativeTouchContext implements TouchContext {
if (isNewFinger) {
maxPointerCountInGesture = pointerCount;
originalTouchTime = SystemClock.uptimeMillis();
originalTouchTime = eventTime;
cancelled = confirmedDrag = confirmedMove = confirmedScroll = false;
distanceMoved = 0;
@@ -119,7 +118,7 @@ public class RelativeTouchContext implements TouchContext {
}
@Override
public void touchUpEvent(int eventX, int eventY)
public void touchUpEvent(int eventX, int eventY, long eventTime)
{
if (cancelled) {
return;
@@ -134,7 +133,7 @@ public class RelativeTouchContext implements TouchContext {
// Raise the button after a drag
conn.sendMouseButtonUp(buttonIndex);
}
else if (isTap())
else if (isTap(eventTime))
{
// Lower the mouse button
conn.sendMouseButtonDown(buttonIndex);
@@ -229,7 +228,7 @@ public class RelativeTouchContext implements TouchContext {
}
@Override
public boolean touchMoveEvent(int eventX, int eventY)
public boolean touchMoveEvent(int eventX, int eventY, long eventTime)
{
if (cancelled) {
return true;

6
app/src/main/java/com/limelight/binding/input/touch/TouchContext.java
View File

@@ -3,9 +3,9 @@ package com.limelight.binding.input.touch;
public interface TouchContext {
int getActionIndex();
void setPointerCount(int pointerCount);
boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger);
boolean touchMoveEvent(int eventX, int eventY);
void touchUpEvent(int eventX, int eventY);
boolean touchDownEvent(int eventX, int eventY, long eventTime, boolean isNewFinger);
boolean touchMoveEvent(int eventX, int eventY, long eventTime);
void touchUpEvent(int eventX, int eventY, long eventTime);
void cancelTouch();
boolean isCancelled();
}