miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the last bug with hardware mouse detection

Browse Source
This commit is contained in:
pelya
2012-02-03 17:41:43 +02:00
parent bfcd7ae8b6
commit fa13f76061
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -9,4 +9,4 @@ project/res/values*
project/AndroidManifest.xml
project/jni/Settings.mk
libapplication.so
project/jni/application/src

2
project/java/Video.java
View File

@@ -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 )

4
project/jni/application/gemrb/AndroidAppSettings.cfg
View File

@@ -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

10
project/jni/sdl-1.3/src/video/android/SDL_androidinput.c
View File

@@ -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;
}