diff options
| author | dhewg | 2011-03-30 23:38:22 +0200 |
|---|---|---|
| committer | dhewg | 2011-03-30 23:39:34 +0200 |
| commit | dd1c52fd8294daaf32e9047936d24c0c737f07da (patch) | |
| tree | 4a6a26293ebdf3926f77767fb76ed0480d0bdc8f /backends/platform/android | |
| parent | 2a2c7f5bef6b7ddcc6df3aca62683501cc740030 (diff) | |
| download | scummvm-rg350-dd1c52fd8294daaf32e9047936d24c0c737f07da.tar.gz scummvm-rg350-dd1c52fd8294daaf32e9047936d24c0c737f07da.tar.bz2 scummvm-rg350-dd1c52fd8294daaf32e9047936d24c0c737f07da.zip | |
ANDROID: Map right click to Camera/Search
Diffstat (limited to 'backends/platform/android')
| -rw-r--r-- | backends/platform/android/events.cpp | 15 | ||||
| -rw-r--r-- | backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index d845ab8ffc..2576287a83 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -331,6 +331,21 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3, return; + case JKEYCODE_CAMERA: + case JKEYCODE_SEARCH: + if (arg1 == JACTION_DOWN) + e.type = Common::EVENT_RBUTTONDOWN; + else + e.type = Common::EVENT_RBUTTONUP; + + e.mouse = getEventManager()->getMousePos(); + + lockMutex(_event_queue_lock); + _event_queue.push(e); + unlockMutex(_event_queue_lock); + + return; + default: LOGW("unmapped system key: %d", arg2); return; diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java index cae88ea111..8182f194a8 100644 --- a/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java +++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java @@ -80,6 +80,8 @@ public class ScummVMEvents implements switch (keyCode) { case KeyEvent.KEYCODE_BACK: case KeyEvent.KEYCODE_MENU: + case KeyEvent.KEYCODE_CAMERA: + case KeyEvent.KEYCODE_SEARCH: break; default: |