From fa13f76061d442b37a666f79332378349e2b119d Mon Sep 17 00:00:00 2001 From: pelya Date: Fri, 3 Feb 2012 17:41:43 +0200 Subject: [PATCH] Fixed the last bug with hardware mouse detection --- .gitignore | 2 +- project/java/Video.java | 2 +- project/jni/application/gemrb/AndroidAppSettings.cfg | 4 ++-- .../jni/sdl-1.3/src/video/android/SDL_androidinput.c | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 1cfc6f7b4..0443ffd12 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,4 @@ project/res/values* project/AndroidManifest.xml project/jni/Settings.mk libapplication.so - +project/jni/application/src diff --git a/project/java/Video.java b/project/java/Video.java index 54102b956..5acfa5d0c 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -226,7 +226,6 @@ abstract class DifferentTouchInput if( touchEvents[id].down ) action = Mouse.SDL_FINGER_MOVE; else - action = Mouse.SDL_FINGER_HOVER; if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR1 ) { // Noneycomb has no excuse for sending such hackish mouse events, it has a dedicated ACTION_HOVER_MOVE event @@ -237,6 +236,7 @@ abstract class DifferentTouchInput { // Beagleboard with Android 2.3.3 sends ACTION_MOVE for USB mouse movements, without sending ACTION_DOWN first // So we're guessing if we have Android 2.X and USB mouse, if there are no other fingers touching the screen + action = Mouse.SDL_FINGER_HOVER; for( int iii = 0; iii < touchEventMax; iii++ ) { if( touchEvents[iii].down ) diff --git a/project/jni/application/gemrb/AndroidAppSettings.cfg b/project/jni/application/gemrb/AndroidAppSettings.cfg index c83728ad1..3d2f633df 100644 --- a/project/jni/application/gemrb/AndroidAppSettings.cfg +++ b/project/jni/application/gemrb/AndroidAppSettings.cfg @@ -32,8 +32,8 @@ StartupMenuButtonTimeout=2000 HiddenMenuOptions='' FirstStartMenuOptions='' MultiABI=y -AppVersionCode=0700 -AppVersionName="0.7.0.0" +AppVersionCode=0701 +AppVersionName="0.7.0.1" ResetSdlConfigForThisVersion=y CompiledLibraries="sdl_mixer sdl_ttf ogg vorbis openal png python" CustomBuildScript=n diff --git a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c index 1e94ed0da..74d5514c9 100644 --- a/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c +++ b/project/jni/sdl-1.3/src/video/android/SDL_androidinput.c @@ -833,11 +833,11 @@ static int getClickTimeout(int v) { switch(v) { - case 0: return 300; - case 1: return 500; - case 2: return 700; - case 3: return 1000; - case 4: return 1500; + case 0: return 200; + case 1: return 300; + case 2: return 400; + case 3: return 700; + case 4: return 1000; } return 1000; }