From 7e4364b484ba07aa99cd6ee7e045437aa5f3013c Mon Sep 17 00:00:00 2001
From: Xawotihs <Xawotihs@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 27 Apr 2011 21:19:25 +0000
Subject: [PATCH] - Allows writing on sdcard - Bound "back" key to menu,
 "volume down" to next phase and "volume down" to interrupt ... like on the
 N900 :)

---
 JGE/src/SDLmain.cpp                      | 53 +++++++++++++++---------
 projects/mtg/Android/AndroidManifest.xml |  1 +
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/JGE/src/SDLmain.cpp b/JGE/src/SDLmain.cpp
index 2bdeb479b..87fffd302 100644
--- a/JGE/src/SDLmain.cpp
+++ b/JGE/src/SDLmain.cpp
@@ -108,7 +108,7 @@ class SdlApp {
         void OnMouseClicked(const SDL_MouseButtonEvent& event);
         void OnMouseMoved(const SDL_MouseMotionEvent& event);
         void OnEvent(SDL_Event* Event) {
-          if(Event->type < SDL_USEREVENT) DebugTrace("Received Event : " << Event->type);
+            if(Event->type < SDL_USEREVENT) DebugTrace("Event received" << Event->type);
             switch(Event->type){
             case SDL_QUIT:
             {
@@ -149,9 +149,19 @@ class SdlApp {
               lastMouseUpTime = eventTime;
               break;
             }
-            case WAGIC_UPDATE_EVENT:
-              OnUpdate();
+            case SDL_FINGERMOTION:
+            {
+              DebugTrace("FingerMotion : touchId " << Event->tfinger.touchId
+                         << ", fingerId " << Event->tfinger.fingerId
+                         << ", state " << Event->tfinger.state
+                         << ", x " << Event->tfinger.x
+                         << ", y " << Event->tfinger.y
+                         << ", dy " << Event->tfinger.dx
+                         << ", dy " << Event->tfinger.dy
+                         << ", pressure " << Event->tfinger.pressure
+                         );
               break;
+            }
             case SDL_MULTIGESTURE:
             {
               DebugTrace("Multigesure : touchId " << Event->mgesture.touchId
@@ -162,6 +172,9 @@ class SdlApp {
                          << ", numFinder " << Event->mgesture.numFingers);
               break;
             }
+            case WAGIC_UPDATE_EVENT:
+              OnUpdate();
+              break;
             }
         }
         void OnUpdate();
@@ -182,22 +195,24 @@ SdlApp *g_SdlApp = NULL;
 
 static const struct { LocalKeySym keysym; JButton keycode; } gDefaultBindings[] =
 {
-  { SDLK_RETURN,       JGE_BTN_MENU },
-  { SDLK_KP_ENTER,     JGE_BTN_MENU },
-  { SDLK_ESCAPE,       JGE_BTN_MENU },
-  { SDLK_BACKSPACE,    JGE_BTN_CTRL },
-  { SDLK_UP,           JGE_BTN_UP },
-  { SDLK_DOWN,         JGE_BTN_DOWN },
-  { SDLK_LEFT,         JGE_BTN_LEFT },
-  { SDLK_RIGHT,        JGE_BTN_RIGHT },
-  { SDLK_SPACE,        JGE_BTN_OK },
-  { SDLK_TAB,          JGE_BTN_CANCEL },
-  { SDLK_j,            JGE_BTN_PRI },
-  { SDLK_k,            JGE_BTN_SEC },
-  { SDLK_q,            JGE_BTN_PREV },
-  { SDLK_a,            JGE_BTN_NEXT },
-  { SDLK_f,            JGE_BTN_FULLSCREEN },
-  { SDL_SCANCODE_AC_BACK, JGE_BTN_MENU },
+  { SDLK_RETURN,        JGE_BTN_MENU },
+  { SDLK_KP_ENTER,      JGE_BTN_MENU },
+  { SDLK_ESCAPE,        JGE_BTN_MENU },
+  { SDLK_BACKSPACE,     JGE_BTN_CTRL },
+  { SDLK_UP,            JGE_BTN_UP },
+  { SDLK_DOWN,          JGE_BTN_DOWN },
+  { SDLK_LEFT,          JGE_BTN_LEFT },
+  { SDLK_RIGHT,         JGE_BTN_RIGHT },
+  { SDLK_SPACE,         JGE_BTN_OK },
+  { SDLK_TAB,           JGE_BTN_CANCEL },
+  { SDLK_j,             JGE_BTN_PRI },
+  { SDLK_k,             JGE_BTN_SEC },
+  { SDLK_q,             JGE_BTN_PREV },
+  { SDLK_a,             JGE_BTN_NEXT },
+  { SDLK_f,             JGE_BTN_FULLSCREEN },
+  { SDLK_AC_BACK,       JGE_BTN_MENU },
+  { SDLK_VOLUMEUP,      JGE_BTN_PREV },
+  { SDLK_VOLUMEDOWN,    JGE_BTN_SEC},
 };
 
 void JGECreateDefaultBindings()
diff --git a/projects/mtg/Android/AndroidManifest.xml b/projects/mtg/Android/AndroidManifest.xml
index 4ad887b38..5d131ad26 100644
--- a/projects/mtg/Android/AndroidManifest.xml
+++ b/projects/mtg/Android/AndroidManifest.xml
@@ -3,6 +3,7 @@
       package="org.libsdl.app"
       android:versionCode="1"
       android:versionName="1.0">
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
     <application android:label="@string/app_name" android:icon="@drawable/icon" android:debuggable="true" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
         <activity android:name="SDLActivity"
                   android:configChanges="orientation"