Ticket #9249: android-alternative-mouse.patch

backends/platform/android/org/inodes/gus/scummvm/AlternativeTouchScreenMouse.java

@@ +1 @@
+package org.inodes.gus.scummvm;
+
+import android.util.Log;
+import android.view.View;
+import android.view.MotionEvent;
+import android.view.HapticFeedbackConstants;
+
+public class AlternativeTouchScreenMouse implements View.OnTouchListener {
+        private ScummVM scummvm;
+        private int press_type;
+        private int release_type;
+        private boolean longpress;
+        private float down_x;
+        private float down_y;
+
+        private final static long LONG_PRESS_TIMEOUT = 1000;
+        private final static float LONG_PRESS_MOVE_THRESHOLD = 8;
+
+        AlternativeTouchScreenMouse(ScummVM vm) {
+                scummvm = vm;
+                press_type = Event.EVENT_INVALID;
+                release_type = Event.EVENT_INVALID;
+                longpress = true;
+                down_x = 0;
+                down_y = 0;
+        }
+
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+                Event e;
+                switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                        longpress = true;
+                        down_x = event.getX();
+                        down_y = event.getY();
+                        press_type = Event.EVENT_LBUTTONDOWN;
+                        release_type = Event.EVENT_LBUTTONUP;
+                        break;
+                case MotionEvent.ACTION_UP:
+                        e = new Event(press_type);
+                        e.mouse_x = (int)event.getX();
+                        e.mouse_y = (int)event.getY();
+                        e.mouse_relative = false;
+                        scummvm.pushEvent(e);
+
+                        e = new Event(release_type);
+                        e.mouse_x = (int)event.getX();
+                        e.mouse_y = (int)event.getY();
+                        e.mouse_relative = false;
+                        scummvm.pushEvent(e);
+                        break;
+                case MotionEvent.ACTION_MOVE:
+                        if(longpress && press_type != Event.EVENT_RBUTTONDOWN) {
+                                if((event.getEventTime() - event.getDownTime()) > LONG_PRESS_TIMEOUT) {
+                                        press_type = Event.EVENT_RBUTTONDOWN;
+                                        release_type = Event.EVENT_RBUTTONUP;
+                                        v.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                                }
+                                else if((Math.abs(event.getX() - down_x) > LONG_PRESS_MOVE_THRESHOLD) || (Math.abs(event.getY() - down_y) > LONG_PRESS_MOVE_THRESHOLD)) {
+                                        longpress = false;
+                                }
+                        }
+                        e = new Event(Event.EVENT_MOUSEMOVE);
+                        e.mouse_x = (int)event.getX();
+                        e.mouse_y = (int)event.getY();
+                        e.mouse_relative = false;
+                        scummvm.pushEvent(e);
+                        break;
+                default:
+                        return false;
+                }
+
+                return true;
+        }
+
+}

backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java

@@ -17 +17 @@
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.inputmethod.InputMethodManager;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.Toast;
 
 import java.io.IOException;
@@ -29 +31 @@
         // FIXME: replace this with proper mouse acceleration
         private final static int TRACKBALL_SCALE = 2;
 
+        private final static int MENU_TOGGLE_MOUSE = 0;
+
         private class MyScummVM extends ScummVM {
                 private boolean scummvmRunning = false;
 
@@ -105 +109 @@
                         }
                 }
         }
+
+        private class OriginalTouchScreenMouse implements View.OnTouchListener {
+                public boolean onTouch(View v, MotionEvent event) {
+                        return onTouchEvent(event);
+                }
+        }
+        
+        private OriginalTouchScreenMouse original_mouse;
+        private AlternativeTouchScreenMouse alternative_mouse;
+
         private MyScummVM scummvm;
         private Thread scummvm_thread;
 
@@ -137 +151 @@
                 }
 
                 SurfaceView main_surface = (SurfaceView)findViewById(R.id.main_surface);
-                main_surface.setOnTouchListener(new View.OnTouchListener() {
-                                public boolean onTouch(View v, MotionEvent event) {
-                                        return onTouchEvent(event);
-                                }
-                        });
+                //main_surface.setOnTouchListener(new View.OnTouchListener() {
+                //              public boolean onTouch(View v, MotionEvent event) {
+                //                      return onTouchEvent(event);
+                //              }
+                //      });
                 main_surface.setOnKeyListener(new View.OnKeyListener() {
                                 public boolean onKey(View v, int code, KeyEvent ev) {
                                         return onKeyDown(code, ev);
@@ -151 +165 @@
 
                 // Start ScummVM
                 scummvm = new MyScummVM();
+                original_mouse = new OriginalTouchScreenMouse();
+                alternative_mouse = new AlternativeTouchScreenMouse(scummvm);
+                main_surface.setOnTouchListener(original_mouse);
                 scummvm_thread = new Thread(new Runnable() {
                                 public void run() {
                                         try {
@@ -247 +264 @@
                 };
 
         @Override
+        public boolean onCreateOptionsMenu(Menu menu) {
+        menu.add(0, MENU_TOGGLE_MOUSE, 0, "Toggle Alternative Mouse").setCheckable(true).setChecked(false);
+                return true;
+        }
+
+        @Override
+        public boolean onPrepareOptionsMenu(Menu menu) {
+                scummvm.pushEvent(new Event(Event.EVENT_MAINMENU));
+                return true;
+        }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+                        case MENU_TOGGLE_MOUSE:
+                                SurfaceView main_surface = (SurfaceView)findViewById(R.id.main_surface);
+                                if(item.isChecked())
+                                {
+                                        main_surface.setOnTouchListener(original_mouse);
+                                        item.setTitle("Toggle Alternative Mouse");
+                                        item.setChecked(false);
+                                }
+                                else
+                                {
+                                        main_surface.setOnTouchListener(alternative_mouse);
+                                        item.setTitle("Toggle Original Mouse");
+                                        item.setChecked(true);
+                                }
+                                break;
+
+        }
+        return false;
+    }
+
+        @Override
         public boolean onKeyUp(int keyCode, KeyEvent kevent) {
                 return onKeyDown(keyCode, kevent);
         }
@@ -261 +313 @@
         public boolean onKeyDown(int keyCode, KeyEvent kevent) {
                 // Filter out "special" keys
                 switch (keyCode) {
-                case KeyEvent.KEYCODE_MENU:
-                        // Have to reimplement hold-down-menu-brings-up-softkeybd
-                        // ourselves, since we are otherwise hijacking the menu
-                        // key :(
-                        // See com.android.internal.policy.impl.PhoneWindow.onKeyDownPanel()
-                        // for the usual Android implementation of this feature.
-                        if (kevent.getRepeatCount() > 0)
-                                // Ignore keyrepeat for menu
-                                return false;
-                        boolean timeout_fired = false;
-                        if (getResources().getConfiguration().keyboard ==
-                                Configuration.KEYBOARD_NOKEYS) {
-                                timeout_fired = !keycodeMenuTimeoutHandler.hasMessages(MSG_MENU_LONG_PRESS);
-                                keycodeMenuTimeoutHandler.removeMessages(MSG_MENU_LONG_PRESS);
-                                if (kevent.getAction() == KeyEvent.ACTION_DOWN) {
-                                        keycodeMenuTimeoutHandler.sendMessageDelayed(
-                                                                                                                                 keycodeMenuTimeoutHandler.obtainMessage(MSG_MENU_LONG_PRESS),
-                                                                                                                                 ViewConfiguration.getLongPressTimeout());
-                                        return true;
-                                }
-                        }
-                        if (kevent.getAction() == KeyEvent.ACTION_UP) {
-                                if (!timeout_fired)
-                                        scummvm.pushEvent(new Event(Event.EVENT_MAINMENU));
-                                return true;
-                        }
-                        return false;
+//              case KeyEvent.KEYCODE_MENU:
+//                      // Have to reimplement hold-down-menu-brings-up-softkeybd
+//                      // ourselves, since we are otherwise hijacking the menu
+//                      // key :(
+//                      // See com.android.internal.policy.impl.PhoneWindow.onKeyDownPanel()
+//                      // for the usual Android implementation of this feature.
+//                      if (kevent.getRepeatCount() > 0)
+//                              // Ignore keyrepeat for menu
+//                              return false;
+//                      boolean timeout_fired = false;
+//                      if (getResources().getConfiguration().keyboard ==
+//                              Configuration.KEYBOARD_NOKEYS) {
+//                              timeout_fired = !keycodeMenuTimeoutHandler.hasMessages(MSG_MENU_LONG_PRESS);
+//                              keycodeMenuTimeoutHandler.removeMessages(MSG_MENU_LONG_PRESS);
+//                              if (kevent.getAction() == KeyEvent.ACTION_DOWN) {
+//                                      keycodeMenuTimeoutHandler.sendMessageDelayed(
+//                                                                                                                               keycodeMenuTimeoutHandler.obtainMessage(MSG_MENU_LONG_PRESS),
+//                                                                                                                               ViewConfiguration.getLongPressTimeout());
+//                                      return true;
+//                              }
+//                      }
+//                      if (kevent.getAction() == KeyEvent.ACTION_UP) {
+//                              if (!timeout_fired)
+//                                      scummvm.pushEvent(new Event(Event.EVENT_MAINMENU));
+//                              return true;
+//                      }
+//                      return false;
                 case KeyEvent.KEYCODE_CAMERA:
                 case KeyEvent.KEYCODE_SEARCH:
                         _do_right_click = (kevent.getAction() == KeyEvent.ACTION_DOWN);