[UI] Android ImGui touch and mouse input

1 files changed, 35 insertions, 13 deletions

diff --git a/android/android_studio_project/app/src/main/java/jp/xenia/emulator/WindowedAppActivity.java b/android/android_studio_project/app/src/main/java/jp/xenia/emulator/WindowedAppActivity.java
index 323395057..69e0fbe59 100644
--- a/android/android_studio_project/app/src/main/java/jp/xenia/emulator/WindowedAppActivity.java
+++ b/android/android_studio_project/app/src/main/java/jp/xenia/emulator/WindowedAppActivity.java
@@ -1,8 +1,10 @@
 package jp.xenia.emulator;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.res.AssetManager;
 import android.os.Bundle;
+import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.View;
@@ -16,10 +18,7 @@ public abstract class WindowedAppActivity extends Activity {
         System.loadLibrary("xenia-app");
     }
 
-    private final WindowSurfaceOnLayoutChangeListener mWindowSurfaceOnLayoutChangeListener =
-            new WindowSurfaceOnLayoutChangeListener();
-    private final WindowSurfaceHolderCallback mWindowSurfaceHolderCallback =
-            new WindowSurfaceHolderCallback();
+    private final WindowSurfaceListener mWindowSurfaceListener = new WindowSurfaceListener();
 
     // May be 0 while destroying (mainly while the superclass is).
     private long mAppContext = 0;
@@ -35,6 +34,8 @@ public abstract class WindowedAppActivity extends Activity {
     private native void onWindowSurfaceLayoutChange(
             long appContext, int left, int top, int right, int bottom);
 
+    private native boolean onWindowSurfaceMotionEvent(long appContext, MotionEvent event);
+
     private native void onWindowSurfaceChanged(long appContext, Surface windowSurface);
 
     private native void paintWindow(long appContext, boolean forcePaint);
@@ -48,8 +49,10 @@ public abstract class WindowedAppActivity extends Activity {
 
         // Detach from the old surface.
         if (mWindowSurfaceView != null) {
-            mWindowSurfaceView.getHolder().removeCallback(mWindowSurfaceHolderCallback);
-            mWindowSurfaceView.removeOnLayoutChangeListener(mWindowSurfaceOnLayoutChangeListener);
+            mWindowSurfaceView.getHolder().removeCallback(mWindowSurfaceListener);
+            mWindowSurfaceView.setOnTouchListener(null);
+            mWindowSurfaceView.setOnGenericMotionListener(null);
+            mWindowSurfaceView.removeOnLayoutChangeListener(mWindowSurfaceListener);
             mWindowSurfaceView = null;
             if (mAppContext != 0) {
                 onWindowSurfaceChanged(mAppContext, null);
@@ -61,12 +64,12 @@ public abstract class WindowedAppActivity extends Activity {
         }
 
         mWindowSurfaceView = windowSurfaceView;
-        // The native window code assumes that, when the surface exists, it covers the entire
-        // window.
         // FIXME(Triang3l): This doesn't work if the layout has already been performed.
-        mWindowSurfaceView.addOnLayoutChangeListener(mWindowSurfaceOnLayoutChangeListener);
+        mWindowSurfaceView.addOnLayoutChangeListener(mWindowSurfaceListener);
+        mWindowSurfaceView.setOnGenericMotionListener(mWindowSurfaceListener);
+        mWindowSurfaceView.setOnTouchListener(mWindowSurfaceListener);
         final SurfaceHolder windowSurfaceHolder = mWindowSurfaceView.getHolder();
-        windowSurfaceHolder.addCallback(mWindowSurfaceHolderCallback);
+        windowSurfaceHolder.addCallback(mWindowSurfaceListener);
         // If setting after the creation of the surface.
         if (mAppContext != 0) {
             final Surface windowSurface = windowSurfaceHolder.getSurface();
@@ -115,7 +118,11 @@ public abstract class WindowedAppActivity extends Activity {
         super.onDestroy();
     }
 
-    private class WindowSurfaceOnLayoutChangeListener implements View.OnLayoutChangeListener {
+    private class WindowSurfaceListener implements
+            View.OnGenericMotionListener,
+            View.OnLayoutChangeListener,
+            View.OnTouchListener,
+            SurfaceHolder.Callback2 {
         @Override
         public void onLayoutChange(
                 final View v, final int left, final int top, final int right, final int bottom,
@@ -124,9 +131,24 @@ public abstract class WindowedAppActivity extends Activity {
                 onWindowSurfaceLayoutChange(mAppContext, left, top, right, bottom);
             }
         }
-    }
 
-    private class WindowSurfaceHolderCallback implements SurfaceHolder.Callback2 {
+        @Override
+        public boolean onGenericMotion(View v, MotionEvent event) {
+            if (mAppContext == 0) {
+                return false;
+            }
+            return onWindowSurfaceMotionEvent(mAppContext, event);
+        }
+
+        @SuppressLint("ClickableViewAccessibility")
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            if (mAppContext == 0) {
+                return false;
+            }
+            return onWindowSurfaceMotionEvent(mAppContext, event);
+        }
+
         @Override
         public void surfaceCreated(final SurfaceHolder holder) {
             if (mAppContext == 0) {