ANDROID: Input system overhaul

Rewritten input system with many new feature.
Fixed related bugs and shortcomings on the way.

4 files changed, 216 insertions, 615 deletions

diff --git a/backends/platform/android/org/inodes/gus/scummvm/Event.java b/backends/platform/android/org/inodes/gus/scummvm/Event.java
deleted file mode 100644
index f9c7aba93b..0000000000
--- a/backends/platform/android/org/inodes/gus/scummvm/Event.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package org.inodes.gus.scummvm;
-
-import android.view.KeyEvent;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Event {
-	// Common::EventType enum.
-	// Must be kept in sync with common/events.h
-	public final static int EVENT_INVALID = 0;
-	public final static int EVENT_KEYDOWN = 1;
-	public final static int EVENT_KEYUP = 2;
-	public final static int EVENT_MOUSEMOVE = 3;
-	public final static int EVENT_LBUTTONDOWN = 4;
-	public final static int EVENT_LBUTTONUP = 5;
-	public final static int EVENT_RBUTTONDOWN = 6;
-	public final static int EVENT_RBUTTONUP = 7;
-	public final static int EVENT_WHEELUP = 8;
-	public final static int EVENT_WHEELDOWN = 9;
-	public final static int EVENT_QUIT = 10;
-	public final static int EVENT_SCREEN_CHANGED = 11;
-	public final static int EVENT_PREDICTIVE_DIALOG = 12;
-	public final static int EVENT_MBUTTONDOWN = 13;
-	public final static int EVENT_MBUTTONUP = 14;
-	public final static int EVENT_MAINMENU = 15;
-	public final static int EVENT_RTL = 16;
-
-	// common/keyboard.h
-	public final static int ASCII_F1 = 315;
-	public final static int ASCII_F2 = 316;
-	public final static int ASCII_F3 = 317;
-	public final static int ASCII_F4 = 318;
-	public final static int ASCII_F5 = 319;
-	public final static int ASCII_F6 = 320;
-	public final static int ASCII_F7 = 321;
-	public final static int ASCII_F8 = 322;
-	public final static int ASCII_F9 = 323;
-	public final static int ASCII_F10 = 324;
-	public final static int ASCII_F11 = 325;
-	public final static int ASCII_F12 = 326;
-	public final static int KBD_CTRL  = 1 << 0;
-	public final static int KBD_ALT	  = 1 << 1;
-	public final static int KBD_SHIFT = 1 << 2;
-
-	public final static int KEYCODE_INVALID = 0;
-	public final static int KEYCODE_BACKSPACE = 8;
-	public final static int KEYCODE_TAB = 9;
-	public final static int KEYCODE_CLEAR = 12;
-	public final static int KEYCODE_RETURN = 13;
-	public final static int KEYCODE_PAUSE = 19;
-	public final static int KEYCODE_ESCAPE = 27;
-	public final static int KEYCODE_SPACE = 32;
-	public final static int KEYCODE_EXCLAIM = 33;
-	public final static int KEYCODE_QUOTEDBL = 34;
-	public final static int KEYCODE_HASH = 35;
-	public final static int KEYCODE_DOLLAR = 36;
-	public final static int KEYCODE_AMPERSAND = 38;
-	public final static int KEYCODE_QUOTE = 39;
-	public final static int KEYCODE_LEFTPAREN = 40;
-	public final static int KEYCODE_RIGHTPAREN = 41;
-	public final static int KEYCODE_ASTERISK = 42;
-	public final static int KEYCODE_PLUS = 43;
-	public final static int KEYCODE_COMMA = 44;
-	public final static int KEYCODE_MINUS = 45;
-	public final static int KEYCODE_PERIOD = 46;
-	public final static int KEYCODE_SLASH = 47;
-	public final static int KEYCODE_0 = 48;
-	public final static int KEYCODE_1 = 49;
-	public final static int KEYCODE_2 = 50;
-	public final static int KEYCODE_3 = 51;
-	public final static int KEYCODE_4 = 52;
-	public final static int KEYCODE_5 = 53;
-	public final static int KEYCODE_6 = 54;
-	public final static int KEYCODE_7 = 55;
-	public final static int KEYCODE_8 = 56;
-	public final static int KEYCODE_9 = 57;
-	public final static int KEYCODE_COLON = 58;
-	public final static int KEYCODE_SEMICOLON = 59;
-	public final static int KEYCODE_LESS = 60;
-	public final static int KEYCODE_EQUALS = 61;
-	public final static int KEYCODE_GREATER = 62;
-	public final static int KEYCODE_QUESTION = 63;
-	public final static int KEYCODE_AT = 64;
-	public final static int KEYCODE_LEFTBRACKET = 91;
-	public final static int KEYCODE_BACKSLASH = 92;
-	public final static int KEYCODE_RIGHTBRACKET = 93;
-	public final static int KEYCODE_CARET = 94;
-	public final static int KEYCODE_UNDERSCORE = 95;
-	public final static int KEYCODE_BACKQUOTE = 96;
-	public final static int KEYCODE_a = 97;
-	public final static int KEYCODE_b = 98;
-	public final static int KEYCODE_c = 99;
-	public final static int KEYCODE_d = 100;
-	public final static int KEYCODE_e = 101;
-	public final static int KEYCODE_f = 102;
-	public final static int KEYCODE_g = 103;
-	public final static int KEYCODE_h = 104;
-	public final static int KEYCODE_i = 105;
-	public final static int KEYCODE_j = 106;
-	public final static int KEYCODE_k = 107;
-	public final static int KEYCODE_l = 108;
-	public final static int KEYCODE_m = 109;
-	public final static int KEYCODE_n = 110;
-	public final static int KEYCODE_o = 111;
-	public final static int KEYCODE_p = 112;
-	public final static int KEYCODE_q = 113;
-	public final static int KEYCODE_r = 114;
-	public final static int KEYCODE_s = 115;
-	public final static int KEYCODE_t = 116;
-	public final static int KEYCODE_u = 117;
-	public final static int KEYCODE_v = 118;
-	public final static int KEYCODE_w = 119;
-	public final static int KEYCODE_x = 120;
-	public final static int KEYCODE_y = 121;
-	public final static int KEYCODE_z = 122;
-	public final static int KEYCODE_DELETE = 127;
-	// Numeric keypad
-	public final static int KEYCODE_KP0 = 256;
-	public final static int KEYCODE_KP1 = 257;
-	public final static int KEYCODE_KP2 = 258;
-	public final static int KEYCODE_KP3 = 259;
-	public final static int KEYCODE_KP4 = 260;
-	public final static int KEYCODE_KP5 = 261;
-	public final static int KEYCODE_KP6 = 262;
-	public final static int KEYCODE_KP7 = 263;
-	public final static int KEYCODE_KP8 = 264;
-	public final static int KEYCODE_KP9 = 265;
-	public final static int KEYCODE_KP_PERIOD = 266;
-	public final static int KEYCODE_KP_DIVIDE = 267;
-	public final static int KEYCODE_KP_MULTIPLY = 268;
-	public final static int KEYCODE_KP_MINUS = 269;
-	public final static int KEYCODE_KP_PLUS = 270;
-	public final static int KEYCODE_KP_ENTER = 271;
-	public final static int KEYCODE_KP_EQUALS = 272;
-	// Arrows + Home/End pad
-	public final static int KEYCODE_UP = 273;
-	public final static int KEYCODE_DOWN = 274;
-	public final static int KEYCODE_RIGHT = 275;
-	public final static int KEYCODE_LEFT = 276;
-	public final static int KEYCODE_INSERT = 277;
-	public final static int KEYCODE_HOME = 278;
-	public final static int KEYCODE_END = 279;
-	public final static int KEYCODE_PAGEUP = 280;
-	public final static int KEYCODE_PAGEDOWN = 281;
-	// Function keys
-	public final static int KEYCODE_F1 = 282;
-	public final static int KEYCODE_F2 = 283;
-	public final static int KEYCODE_F3 = 284;
-	public final static int KEYCODE_F4 = 285;
-	public final static int KEYCODE_F5 = 286;
-	public final static int KEYCODE_F6 = 287;
-	public final static int KEYCODE_F7 = 288;
-	public final static int KEYCODE_F8 = 289;
-	public final static int KEYCODE_F9 = 290;
-	public final static int KEYCODE_F10 = 291;
-	public final static int KEYCODE_F11 = 292;
-	public final static int KEYCODE_F12 = 293;
-	public final static int KEYCODE_F13 = 294;
-	public final static int KEYCODE_F14 = 295;
-	public final static int KEYCODE_F15 = 296;
-	// Key state modifier keys
-	public final static int KEYCODE_NUMLOCK = 300;
-	public final static int KEYCODE_CAPSLOCK = 301;
-	public final static int KEYCODE_SCROLLOCK = 302;
-	public final static int KEYCODE_RSHIFT = 303;
-	public final static int KEYCODE_LSHIFT = 304;
-	public final static int KEYCODE_RCTRL = 305;
-	public final static int KEYCODE_LCTRL = 306;
-	public final static int KEYCODE_RALT = 307;
-	public final static int KEYCODE_LALT = 308;
-	public final static int KEYCODE_RMETA = 309;
-	public final static int KEYCODE_LMETA = 310;
-	public final static int KEYCODE_LSUPER = 311; // Left "Windows" key
-	public final static int KEYCODE_RSUPER = 312; // Right "Windows" key
-	public final static int KEYCODE_MODE = 313; // "Alt Gr" key
-	public final static int KEYCODE_COMPOSE = 314; // Multi-key compose key
-	// Miscellaneous function keys
-	public final static int KEYCODE_HELP = 315;
-	public final static int KEYCODE_PRINT = 316;
-	public final static int KEYCODE_SYSREQ = 317;
-	public final static int KEYCODE_BREAK = 318;
-	public final static int KEYCODE_MENU = 319;
-	public final static int KEYCODE_POWER = 320; // Power Macintosh power key
-	public final static int KEYCODE_EURO = 321; // Some european keyboards
-	public final static int KEYCODE_UNDO = 322; // Atari keyboard has Undo
-
-	// Android KeyEvent keycode -> ScummVM keycode
-	public final static Map<Integer, Integer> androidKeyMap;
-	static {
-		Map<Integer, Integer> map = new HashMap<Integer, Integer>();
-
-		map.put(KeyEvent.KEYCODE_DEL, KEYCODE_BACKSPACE);
-		map.put(KeyEvent.KEYCODE_TAB, KEYCODE_TAB);
-		map.put(KeyEvent.KEYCODE_CLEAR, KEYCODE_CLEAR);
-		map.put(KeyEvent.KEYCODE_ENTER, KEYCODE_RETURN);
-		//map.put(??, KEYCODE_PAUSE);
-		map.put(KeyEvent.KEYCODE_BACK, KEYCODE_ESCAPE);
-		map.put(KeyEvent.KEYCODE_SPACE, KEYCODE_SPACE);
-		//map.put(??, KEYCODE_EXCLAIM);
-		//map.put(??, KEYCODE_QUOTEDBL);
-		map.put(KeyEvent.KEYCODE_POUND, KEYCODE_HASH);
-		//map.put(??, KEYCODE_DOLLAR);
-		//map.put(??, KEYCODE_AMPERSAND);
-		map.put(KeyEvent.KEYCODE_APOSTROPHE, KEYCODE_QUOTE);
-		//map.put(??, KEYCODE_LEFTPAREN);
-		//map.put(??, KEYCODE_RIGHTPAREN);
-		//map.put(??, KEYCODE_ASTERISK);
-		map.put(KeyEvent.KEYCODE_PLUS, KEYCODE_PLUS);
-		map.put(KeyEvent.KEYCODE_COMMA, KEYCODE_COMMA);
-		map.put(KeyEvent.KEYCODE_MINUS, KEYCODE_MINUS);
-		map.put(KeyEvent.KEYCODE_PERIOD, KEYCODE_PERIOD);
-		map.put(KeyEvent.KEYCODE_SLASH, KEYCODE_SLASH);
-		map.put(KeyEvent.KEYCODE_0, KEYCODE_0);
-		map.put(KeyEvent.KEYCODE_1, KEYCODE_1);
-		map.put(KeyEvent.KEYCODE_2, KEYCODE_2);
-		map.put(KeyEvent.KEYCODE_3, KEYCODE_3);
-		map.put(KeyEvent.KEYCODE_4, KEYCODE_4);
-		map.put(KeyEvent.KEYCODE_5, KEYCODE_5);
-		map.put(KeyEvent.KEYCODE_6, KEYCODE_6);
-		map.put(KeyEvent.KEYCODE_7, KEYCODE_7);
-		map.put(KeyEvent.KEYCODE_8, KEYCODE_8);
-		map.put(KeyEvent.KEYCODE_9, KEYCODE_9);
-		//map.put(??, KEYCODE_COLON);
-		map.put(KeyEvent.KEYCODE_SEMICOLON, KEYCODE_SEMICOLON);
-		//map.put(??, KEYCODE_LESS);
-		map.put(KeyEvent.KEYCODE_EQUALS, KEYCODE_EQUALS);
-		//map.put(??, KEYCODE_GREATER);
-		//map.put(??, KEYCODE_QUESTION);
-		map.put(KeyEvent.KEYCODE_AT, KEYCODE_AT);
-		map.put(KeyEvent.KEYCODE_LEFT_BRACKET, KEYCODE_LEFTBRACKET);
-		map.put(KeyEvent.KEYCODE_BACKSLASH, KEYCODE_BACKSLASH);
-		map.put(KeyEvent.KEYCODE_RIGHT_BRACKET, KEYCODE_RIGHTBRACKET);
-		//map.put(??, KEYCODE_CARET);
-		//map.put(??, KEYCODE_UNDERSCORE);
-		//map.put(??, KEYCODE_BACKQUOTE);
-		map.put(KeyEvent.KEYCODE_A, KEYCODE_a);
-		map.put(KeyEvent.KEYCODE_B, KEYCODE_b);
-		map.put(KeyEvent.KEYCODE_C, KEYCODE_c);
-		map.put(KeyEvent.KEYCODE_D, KEYCODE_d);
-		map.put(KeyEvent.KEYCODE_E, KEYCODE_e);
-		map.put(KeyEvent.KEYCODE_F, KEYCODE_f);
-		map.put(KeyEvent.KEYCODE_G, KEYCODE_g);
-		map.put(KeyEvent.KEYCODE_H, KEYCODE_h);
-		map.put(KeyEvent.KEYCODE_I, KEYCODE_i);
-		map.put(KeyEvent.KEYCODE_J, KEYCODE_j);
-		map.put(KeyEvent.KEYCODE_K, KEYCODE_k);
-		map.put(KeyEvent.KEYCODE_L, KEYCODE_l);
-		map.put(KeyEvent.KEYCODE_M, KEYCODE_m);
-		map.put(KeyEvent.KEYCODE_N, KEYCODE_n);
-		map.put(KeyEvent.KEYCODE_O, KEYCODE_o);
-		map.put(KeyEvent.KEYCODE_P, KEYCODE_p);
-		map.put(KeyEvent.KEYCODE_Q, KEYCODE_q);
-		map.put(KeyEvent.KEYCODE_R, KEYCODE_r);
-		map.put(KeyEvent.KEYCODE_S, KEYCODE_s);
-		map.put(KeyEvent.KEYCODE_T, KEYCODE_t);
-		map.put(KeyEvent.KEYCODE_U, KEYCODE_u);
-		map.put(KeyEvent.KEYCODE_V, KEYCODE_v);
-		map.put(KeyEvent.KEYCODE_W, KEYCODE_w);
-		map.put(KeyEvent.KEYCODE_X, KEYCODE_x);
-		map.put(KeyEvent.KEYCODE_Y, KEYCODE_y);
-		map.put(KeyEvent.KEYCODE_Z, KEYCODE_z);
-		//map.put(KeyEvent.KEYCODE_DEL, KEYCODE_DELETE); use BACKSPACE instead
-		//map.put(??, KEYCODE_KP_*);
-		map.put(KeyEvent.KEYCODE_DPAD_UP, KEYCODE_UP);
-		map.put(KeyEvent.KEYCODE_DPAD_DOWN, KEYCODE_DOWN);
-		map.put(KeyEvent.KEYCODE_DPAD_RIGHT, KEYCODE_RIGHT);
-		map.put(KeyEvent.KEYCODE_DPAD_LEFT, KEYCODE_LEFT);
-		//map.put(??, KEYCODE_INSERT);
-		//map.put(??, KEYCODE_HOME);
-		//map.put(??, KEYCODE_END);
-		//map.put(??, KEYCODE_PAGEUP);
-		//map.put(??, KEYCODE_PAGEDOWN);
-		//map.put(??, KEYCODE_F{1-15});
-		map.put(KeyEvent.KEYCODE_NUM, KEYCODE_NUMLOCK);
-		//map.put(??, KEYCODE_CAPSLOCK);
-		//map.put(??, KEYCODE_SCROLLLOCK);
-		map.put(KeyEvent.KEYCODE_SHIFT_RIGHT, KEYCODE_RSHIFT);
-		map.put(KeyEvent.KEYCODE_SHIFT_LEFT, KEYCODE_LSHIFT);
-		//map.put(??, KEYCODE_RCTRL);
-		//map.put(??, KEYCODE_LCTRL);
-		map.put(KeyEvent.KEYCODE_ALT_RIGHT, KEYCODE_RALT);
-		map.put(KeyEvent.KEYCODE_ALT_LEFT, KEYCODE_LALT);
-		// ?? META, SUPER
-		// ?? MODE, COMPOSE
-		// ?? HELP, PRINT, SYSREQ, BREAK, EURO, UNDO
-		map.put(KeyEvent.KEYCODE_MENU, KEYCODE_MENU);
-		map.put(KeyEvent.KEYCODE_POWER, KEYCODE_POWER);
-
-		androidKeyMap = Collections.unmodifiableMap(map);
-	}
-
-	public int type;
-	public boolean synthetic;
-	public int kbd_keycode;
-	public int kbd_ascii;
-	public int kbd_flags;
-	public int mouse_x;
-	public int mouse_y;
-	public boolean mouse_relative;	// Used for trackball events
-
-	public Event() {
-		type = EVENT_INVALID;
-		synthetic = false;
-	}
-
-	public Event(int type) {
-		this.type = type;
-		synthetic = false;
-	}
-
-	public static Event KeyboardEvent(int type, int keycode, int ascii,
-									  int flags) {
-		Event e = new Event();
-		e.type = type;
-		e.kbd_keycode = keycode;
-		e.kbd_ascii = ascii;
-		e.kbd_flags = flags;
-		return e;
-	}
-
-	public static Event MouseEvent(int type, int x, int y) {
-		Event e = new Event();
-		e.type = type;
-		e.mouse_x = x;
-		e.mouse_y = y;
-		return e;
-	}
-}
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
index ed4e00d769..fe225af48b 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
@@ -9,14 +9,12 @@ import android.media.AudioTrack;
 
 import javax.microedition.khronos.opengles.GL10;
 import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGL11;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.egl.EGLContext;
 import javax.microedition.khronos.egl.EGLDisplay;
 import javax.microedition.khronos.egl.EGLSurface;
 
 import java.io.File;
-import java.util.Map;
 import java.util.LinkedHashMap;
 
 public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
@@ -49,7 +47,8 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable {
 	final public native void setPause(boolean pause);
 	final public native void enableZoning(boolean enable);
 	// Feed an event to ScummVM.  Safe to call from other threads.
-	final public native void pushEvent(Event e);
+	final public native void pushEvent(int type, int arg1, int arg2, int arg3,
+										int arg4, int arg5);
 
 	// Callbacks from C++ peer instance
 	abstract protected void getDPI(float[] values);
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
index 2cf6f58941..1978b690d0 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
@@ -3,33 +3,18 @@ package org.inodes.gus.scummvm;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.content.res.AssetManager;
-import android.content.res.Configuration;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.SurfaceHolder;
-import android.view.View;
-import android.view.ViewConfiguration;
+import android.view.MotionEvent;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
-import java.io.IOException;
-
 public class ScummVMActivity extends Activity {
-	private boolean _do_right_click;
-	private boolean _last_click_was_right;
-
-	// game pixels to move per trackball/dpad event.
-	// FIXME: replace this with proper mouse acceleration
-	private final static int TRACKBALL_SCALE = 2;
 
 	private class MyScummVM extends ScummVM {
 		private boolean usingSmallScreen() {
@@ -106,13 +91,13 @@ public class ScummVMActivity extends Activity {
 	}
 
 	private MyScummVM _scummvm;
+	private ScummVMEvents _events;
 	private Thread _scummvm_thread;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		_do_right_click = false;
 		setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
 		setContentView(R.layout.main);
@@ -139,18 +124,6 @@ public class ScummVMActivity extends Activity {
 
 		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.setOnKeyListener(new View.OnKeyListener() {
-				public boolean onKey(View v, int code, KeyEvent ev) {
-					return onKeyDown(code, ev);
-				}
-			});
-
 		main_surface.requestFocus();
 
 		getFilesDir().mkdirs();
@@ -166,6 +139,11 @@ public class ScummVMActivity extends Activity {
 			"--savepath=" + getDir("saves", 0).getPath()
 		});
 
+		_events = new ScummVMEvents(this, _scummvm);
+
+		main_surface.setOnKeyListener(_events);
+		main_surface.setOnTouchListener(_events);
+
 		_scummvm_thread = new Thread(_scummvm, "ScummVM");
 		_scummvm_thread.start();
 	}
@@ -210,8 +188,8 @@ public class ScummVMActivity extends Activity {
 
 		super.onDestroy();
 
-		if (_scummvm != null) {
-			_scummvm.pushEvent(new Event(Event.EVENT_QUIT));
+		if (_events != null) {
+			_events.sendQuitEvent();
 
 			try {
 				// 1s timeout
@@ -224,259 +202,12 @@ public class ScummVMActivity extends Activity {
 		}
 	}
 
-	static final int MSG_MENU_LONG_PRESS = 1;
-
-	private final Handler keycodeMenuTimeoutHandler = new Handler() {
-			@Override
-			public void handleMessage(Message msg) {
-				if (msg.what == MSG_MENU_LONG_PRESS) {
-					InputMethodManager imm = (InputMethodManager)
-						getSystemService(INPUT_METHOD_SERVICE);
-					if (imm != null)
-						imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
-				}
-			}
-		};
-
-	@Override
-	public boolean onKeyUp(int keyCode, KeyEvent kevent) {
-		return onKeyDown(keyCode, kevent);
-	}
-
-	@Override
-	public boolean onKeyMultiple(int keyCode, int repeatCount,
-									KeyEvent kevent) {
-		return onKeyDown(keyCode, kevent);
-	}
-
 	@Override
-	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.
-
-			// Ignore keyrepeat for menu
-			if (kevent.getRepeatCount() > 0)
-				return false;
-
-			boolean 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);
-			return true;
-
-		case KeyEvent.KEYCODE_DPAD_CENTER:
-		case KeyEvent.KEYCODE_DPAD_UP:
-		case KeyEvent.KEYCODE_DPAD_DOWN:
-		case KeyEvent.KEYCODE_DPAD_LEFT:
-		case KeyEvent.KEYCODE_DPAD_RIGHT: {
-			// HTC Hero doesn't seem to generate
-			// MotionEvent.ACTION_DOWN events on trackball press :(
-			// We'll have to just fake one here.
-			// Some other handsets lack a trackball, so the DPAD is
-			// the only way of moving the cursor.
-			int motion_action;
-
-			// FIXME: this logic is a mess.
-			if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
-				switch (kevent.getAction()) {
-				case KeyEvent.ACTION_DOWN:
-					motion_action = MotionEvent.ACTION_DOWN;
-					break;
-
-				case KeyEvent.ACTION_UP:
-					motion_action = MotionEvent.ACTION_UP;
-					break;
-
-				// ACTION_MULTIPLE
-				default:
-					return false;
-				}
-			} else {
-				motion_action = MotionEvent.ACTION_MOVE;
-			}
-
-			Event e = new Event(getEventType(motion_action));
-
-			e.mouse_x = 0;
-			e.mouse_y = 0;
-			e.mouse_relative = true;
-
-			switch (keyCode) {
-			case KeyEvent.KEYCODE_DPAD_UP:
-				e.mouse_y = -TRACKBALL_SCALE;
-				break;
-
-			case KeyEvent.KEYCODE_DPAD_DOWN:
-				e.mouse_y = TRACKBALL_SCALE;
-				break;
-
-			case KeyEvent.KEYCODE_DPAD_LEFT:
-				e.mouse_x = -TRACKBALL_SCALE;
-				break;
-
-			case KeyEvent.KEYCODE_DPAD_RIGHT:
-				e.mouse_x = TRACKBALL_SCALE;
-				break;
-			}
-
-			_scummvm.pushEvent(e);
-
-			return true;
-		}
-
-		case KeyEvent.KEYCODE_BACK:
-			// skip isSystem() check and fall through to main code
-			break;
-
-		default:
-			if (kevent.isSystem())
-				return false;
-		}
-
-		// FIXME: what do I need to do for composed characters?
-
-		Event e = new Event();
-
-		switch (kevent.getAction()) {
-		case KeyEvent.ACTION_DOWN:
-			e.type = Event.EVENT_KEYDOWN;
-			e.synthetic = false;
-			break;
-
-		case KeyEvent.ACTION_UP:
-			e.type = Event.EVENT_KEYUP;
-			e.synthetic = false;
-			break;
-
-		case KeyEvent.ACTION_MULTIPLE:
-			// e.type is handled below
-			e.synthetic = true;
-			break;
-
-		default:
-			return false;
-		}
-
-		e.kbd_keycode = Event.androidKeyMap.containsKey(keyCode) ?
-			Event.androidKeyMap.get(keyCode) : Event.KEYCODE_INVALID;
-
-		e.kbd_ascii = kevent.getUnicodeChar();
-
-		if (e.kbd_ascii == 0)
-			e.kbd_ascii = e.kbd_keycode; // scummvm keycodes are mostly ascii
-
-		e.kbd_flags = 0;
-
-		if (kevent.isAltPressed())
-			e.kbd_flags |= Event.KBD_ALT;
-
-		// no ctrl key in android, so use sym (?)
-		if (kevent.isSymPressed())
-			e.kbd_flags |= Event.KBD_CTRL;
-
-		if (kevent.isShiftPressed()) {
-			if (keyCode >= KeyEvent.KEYCODE_0 &&
-					keyCode <= KeyEvent.KEYCODE_9) {
-				// Shift+number -> convert to F* key
-				int offset = keyCode == KeyEvent.KEYCODE_0 ?
-					10 : keyCode - KeyEvent.KEYCODE_1; // turn 0 into 10
-
-				e.kbd_keycode = Event.KEYCODE_F1 + offset;
-				e.kbd_ascii = Event.ASCII_F1 + offset;
-			} else {
-				e.kbd_flags |= Event.KBD_SHIFT;
-			}
-		}
-
-		if (kevent.getAction() == KeyEvent.ACTION_MULTIPLE) {
-			for (int i = 0; i <= kevent.getRepeatCount(); i++) {
-				e.type = Event.EVENT_KEYDOWN;
-				_scummvm.pushEvent(e);
-
-				e.type = Event.EVENT_KEYUP;
-				_scummvm.pushEvent(e);
-			}
-		} else {
-			_scummvm.pushEvent(e);
-		}
-
-		return true;
-	}
-
-	private int getEventType(int action) {
-		switch (action) {
-		case MotionEvent.ACTION_DOWN:
-			_last_click_was_right = _do_right_click;
-			return _last_click_was_right ?
-				Event.EVENT_RBUTTONDOWN : Event.EVENT_LBUTTONDOWN;
-
-		case MotionEvent.ACTION_UP:
-			return _last_click_was_right ?
-				Event.EVENT_RBUTTONUP : Event.EVENT_LBUTTONUP;
-
-		case MotionEvent.ACTION_MOVE:
-			return Event.EVENT_MOUSEMOVE;
-
-		default:
-			return Event.EVENT_INVALID;
-		}
-	}
-
-	@Override
-	public boolean onTrackballEvent(MotionEvent event) {
-		int type = getEventType(event.getAction());
-		if (type == Event.EVENT_INVALID)
-			return false;
-
-		Event e = new Event(type);
-		e.mouse_x =
-			(int)(event.getX() * event.getXPrecision()) * TRACKBALL_SCALE;
-		e.mouse_y =
-			(int)(event.getY() * event.getYPrecision()) * TRACKBALL_SCALE;
-		e.mouse_relative = true;
-
-		_scummvm.pushEvent(e);
-
-		return true;
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		int type = getEventType(event.getAction());
-
-		if (type == Event.EVENT_INVALID)
-			return false;
-
-		Event e = new Event(type);
-		e.mouse_x = (int)event.getX();
-		e.mouse_y = (int)event.getY();
-		e.mouse_relative = false;
-
-		_scummvm.pushEvent(e);
+	public boolean onTrackballEvent(MotionEvent e) {
+		if (_events != null)
+			return _events.onTrackballEvent(e);
 
-		return true;
+		return false;
 	}
 
 	private void showKeyboard(boolean show) {
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java
new file mode 100644
index 0000000000..3d3fdeece4
--- /dev/null
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java
@@ -0,0 +1,201 @@
+package org.inodes.gus.scummvm;
+
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.content.Context;
+import android.view.KeyEvent;
+import android.view.KeyCharacterMap;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.GestureDetector;
+import android.view.inputmethod.InputMethodManager;
+
+public class ScummVMEvents implements
+		android.view.View.OnKeyListener,
+		android.view.View.OnTouchListener,
+		android.view.GestureDetector.OnGestureListener,
+		android.view.GestureDetector.OnDoubleTapListener {
+
+	public static final int JE_SYS_KEY = 0;
+	public static final int JE_KEY = 1;
+	public static final int JE_DOWN = 2;
+	public static final int JE_SCROLL = 3;
+	public static final int JE_TAP = 4;
+	public static final int JE_DOUBLE_TAP = 5;
+	public static final int JE_BALL = 6;
+	public static final int JE_QUIT = 0x1000;
+
+	final protected Context _context;
+	final protected ScummVM _scummvm;
+	final protected GestureDetector _gd;
+	final protected int _longPress;
+	final protected int _slop;
+
+	public ScummVMEvents(Context context, ScummVM scummvm) {
+		_context = context;
+		_scummvm = scummvm;
+
+		_gd = new GestureDetector(context, this);
+		_gd.setOnDoubleTapListener(this);
+		_gd.setIsLongpressEnabled(false);
+
+		_longPress = ViewConfiguration.getLongPressTimeout();
+		_slop = ViewConfiguration.get(context).getScaledTouchSlop();
+
+	}
+
+	final public void sendQuitEvent() {
+		_scummvm.pushEvent(JE_QUIT, 0, 0, 0, 0, 0);
+	}
+
+	public boolean onTrackballEvent(MotionEvent e) {
+		_scummvm.pushEvent(JE_BALL, (int)(e.getX() * e.getXPrecision() * 100),
+							(int)(e.getY() * e.getYPrecision() * 100), 0, 0, 0);
+		return true;
+	}
+
+	final static int MSG_MENU_LONG_PRESS = 1;
+
+	final private Handler keyHandler = new Handler() {
+		@Override
+		public void handleMessage(Message msg) {
+			if (msg.what == MSG_MENU_LONG_PRESS) {
+				InputMethodManager imm = (InputMethodManager)
+					_context.getSystemService(_context.INPUT_METHOD_SERVICE);
+
+				if (imm != null)
+					imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+			}
+		}
+	};
+
+	// OnKeyListener
+	final public boolean onKey(View v, int keyCode, KeyEvent e) {
+		final int action = e.getAction();
+
+		if (e.isSystem()) {
+			// filter what we handle
+			switch (keyCode) {
+			case KeyEvent.KEYCODE_BACK:
+			case KeyEvent.KEYCODE_MENU:
+				break;
+
+			default:
+				return false;
+			}
+
+			// no repeats for system keys
+			if (e.getRepeatCount() > 0)
+				return false;
+
+			// 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 (keyCode == KeyEvent.KEYCODE_MENU) {
+				final boolean fired =
+					!keyHandler.hasMessages(MSG_MENU_LONG_PRESS);
+
+				keyHandler.removeMessages(MSG_MENU_LONG_PRESS);
+
+				if (action == KeyEvent.ACTION_DOWN) {
+					keyHandler.sendMessageDelayed(keyHandler.obtainMessage(
+									MSG_MENU_LONG_PRESS), _longPress);
+					return true;
+				}
+
+				if (fired)
+					return true;
+
+				// only send up events of the menu button to the native side
+				if (action != KeyEvent.ACTION_UP)
+					return true;
+			}
+
+			_scummvm.pushEvent(JE_SYS_KEY, action, keyCode, 0, 0, 0);
+
+			return true;
+		}
+
+		// sequence of characters
+		if (action == KeyEvent.ACTION_MULTIPLE &&
+				keyCode == KeyEvent.KEYCODE_UNKNOWN) {
+			KeyCharacterMap m = KeyCharacterMap.load(e.getDeviceId());
+
+			for (KeyEvent s : m.getEvents(e.getCharacters().toCharArray())) {
+				_scummvm.pushEvent(JE_KEY, s.getAction(), s.getKeyCode(),
+					s.getUnicodeChar() & KeyCharacterMap.COMBINING_ACCENT_MASK,
+					s.getMetaState(), s.getRepeatCount());
+			}
+
+			return true;
+		}
+
+		_scummvm.pushEvent(JE_KEY, action, keyCode,
+					e.getUnicodeChar() & KeyCharacterMap.COMBINING_ACCENT_MASK,
+					e.getMetaState(), e.getRepeatCount());
+
+		return true;
+	}
+
+	// OnTouchListener
+	final public boolean onTouch(View v, MotionEvent e) {
+		return _gd.onTouchEvent(e);
+	}
+
+	// OnGestureListener
+	final public boolean onDown(MotionEvent e) {
+		_scummvm.pushEvent(JE_DOWN, (int)e.getX(), (int)e.getY(), 0, 0, 0);
+		return true;
+	}
+
+	final public boolean onFling(MotionEvent e1, MotionEvent e2,
+									float velocityX, float velocityY) {
+		//Log.d(ScummVM.LOG_TAG, String.format("onFling: %s -> %s (%.3f %.3f)",
+		//										e1.toString(), e2.toString(),
+		//										velocityX, velocityY));
+
+		return true;
+	}
+
+	final public void onLongPress(MotionEvent e) {
+		// disabled, interferes with drag&drop
+	}
+
+	final public boolean onScroll(MotionEvent e1, MotionEvent e2,
+									float distanceX, float distanceY) {
+		_scummvm.pushEvent(JE_SCROLL, (int)e1.getX(), (int)e1.getY(),
+							(int)e2.getX(), (int)e2.getY(), _slop);
+
+		return true;
+	}
+
+	final public void onShowPress(MotionEvent e) {
+	}
+
+	final public boolean onSingleTapUp(MotionEvent e) {
+		_scummvm.pushEvent(JE_TAP, (int)e.getX(), (int)e.getY(),
+							(int)(e.getEventTime() - e.getDownTime()), 0, 0);
+
+		return true;
+	}
+
+	// OnDoubleTapListener
+	final public boolean onDoubleTap(MotionEvent e) {
+		return true;
+	}
+
+	final public boolean onDoubleTapEvent(MotionEvent e) {
+		_scummvm.pushEvent(JE_DOUBLE_TAP, (int)e.getX(), (int)e.getY(),
+							e.getAction(), _slop, 0);
+
+		return true;
+	}
+
+	final public boolean onSingleTapConfirmed(MotionEvent e) {
+		return true;
+	}
+}
+