diff options
author | dhewg | 2011-04-06 18:08:38 +0200 |
---|---|---|
committer | dhewg | 2011-04-06 18:27:15 +0200 |
commit | a565e63c48b2bb55b9e1197addddd3c03cf85c48 (patch) | |
tree | ee64fe4f2e466d40b2e0d885dd7ed08a7b781d03 /backends/platform/android/org/inodes | |
parent | b45640c47b97c36442d01c35e73b4cae9ad5648e (diff) | |
download | scummvm-rg350-a565e63c48b2bb55b9e1197addddd3c03cf85c48.tar.gz scummvm-rg350-a565e63c48b2bb55b9e1197addddd3c03cf85c48.tar.bz2 scummvm-rg350-a565e63c48b2bb55b9e1197addddd3c03cf85c48.zip |
ANDROID: Add multitouch support
Diffstat (limited to 'backends/platform/android/org/inodes')
-rw-r--r-- | backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java index 8182f194a8..2d5c100a1c 100644 --- a/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java +++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java @@ -25,7 +25,8 @@ public class ScummVMEvents implements public static final int JE_SCROLL = 4; public static final int JE_TAP = 5; public static final int JE_DOUBLE_TAP = 6; - public static final int JE_BALL = 7; + public static final int JE_MULTI = 7; + public static final int JE_BALL = 8; public static final int JE_QUIT = 0x1000; final protected Context _context; @@ -160,6 +161,18 @@ public class ScummVMEvents implements // OnTouchListener final public boolean onTouch(View v, MotionEvent e) { + final int action = e.getAction(); + + // constants from APIv5: + // (action & ACTION_POINTER_INDEX_MASK) >> ACTION_POINTER_INDEX_SHIFT + final int pointer = (action & 0xff00) >> 8; + + if (pointer > 0) { + _scummvm.pushEvent(JE_MULTI, pointer, action & 0xff, // ACTION_MASK + (int)e.getX(), (int)e.getY(), 0); + return true; + } + return _gd.onTouchEvent(e); } |