From e1c047206914af65dc553796acce226f7ad04679 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Tue, 20 Sep 2022 22:29:54 -0500
Subject: [PATCH] Properly split touch events between regions outside the
 StreamView and the OSC

This restores the ability to use area outside the StreamView for the virtual trackpad and adds the ability to use OSC and the non-StreamView region for input at the same time.

Fixes #1129
---
 app/src/main/java/com/limelight/Game.java | 15 +++++++++++++++
 app/src/main/res/layout/activity_game.xml |  6 ++++++
 2 files changed, 21 insertions(+)

diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java
index d00adb25..9d958c64 100644
--- a/app/src/main/java/com/limelight/Game.java
+++ b/app/src/main/java/com/limelight/Game.java
@@ -239,6 +239,21 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         streamView.setOnTouchListener(this);
         streamView.setInputCallbacks(this);
 
+        // Listen for touch events outside of the game surface to enable trackpad mode
+        // to work on areas outside of the StreamView itself. We use a separate View
+        // for this rather than just handling it at the Activity level, because that
+        // allows proper touch splitting, which the OSC relies upon.
+        View backgroundTouchView = findViewById(R.id.backgroundTouchView);
+        backgroundTouchView.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                // We pass this to handleMotionEvent() as if it came from the Activity-level
+                // onTouchEvent() callback, otherwise it will assume it's from the StreamView
+                // and compute the incorrect video bounds when handling absolute input.
+                return handleMotionEvent(null, event);
+            }
+        });
+
         boolean needsInputBatching = false;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             // Request unbuffered input event dispatching for all input classes we handle here.
diff --git a/app/src/main/res/layout/activity_game.xml b/app/src/main/res/layout/activity_game.xml
index 931de24a..ea204a95 100644
--- a/app/src/main/res/layout/activity_game.xml
+++ b/app/src/main/res/layout/activity_game.xml
@@ -4,6 +4,12 @@
     android:layout_height="match_parent"
     tools:context=".Game" >
 
+    <View
+        android:id="@+id/backgroundTouchView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center" />
+
     <com.limelight.ui.StreamView
         android:id="@+id/surfaceView"
         android:layout_width="match_parent"