Final fixes to controlling mouse with trackball

This commit is contained in:
pelya
2010-11-26 23:14:50 +02:00
parent 3259404912
commit 6d09ef7de4
3 changed files with 30 additions and 7 deletions

View File

@@ -70,7 +70,7 @@
<string name="leftclick_near_cursor">Touch near mouse cursor</string>
<string name="leftclick_multitouch">Touch screen with second finger</string>
<string name="leftclick_pressure">Touch screen with force</string>
<string name="leftclick_dpadcenter">Trackball click / select key</string>
<string name="leftclick_dpadcenter">Trackball click / joystick center</string>
<string name="pointandclick_question">Advanced features</string>
<string name="pointandclick_keepaspectratio">Keep 4:3 screen aspect ratio</string>

View File

@@ -21,8 +21,8 @@ RedefinedKeys="LCTRL m t h e"
AppTouchscreenKeyboardKeysAmount=0
AppTouchscreenKeyboardKeysAmountAutoFire=0
MultiABI=n
AppVersionCode=208302
AppVersionName="2083.02"
AppVersionCode=208303
AppVersionName="2083.03"
CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl"
CustomBuildScript=n
AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DBUILD_RELEASE'

View File

@@ -1055,12 +1055,35 @@ extern void SDL_ANDROID_MainThreadPushKeyboardKey(int pressed, SDL_scancode key)
if( clickDoesNotMoveMouseX < 0 )
SDL_GetMouseState( &clickDoesNotMoveMouseX, &clickDoesNotMoveMouseY );
if( key == SDL_KEY(LEFT) || key == SDL_KEY(RIGHT) )
clickDoesNotMoveMouseXspeed += key == SDL_KEY(LEFT) ? -1 : 1;
if( key == SDL_KEY(LEFT) )
{
if( clickDoesNotMoveMouseXspeed > 0 )
clickDoesNotMoveMouseXspeed = 0;
clickDoesNotMoveMouseXspeed --;
}
else if( key == SDL_KEY(RIGHT) )
{
if( clickDoesNotMoveMouseXspeed < 0 )
clickDoesNotMoveMouseXspeed = 0;
clickDoesNotMoveMouseXspeed ++;
}
else
clickDoesNotMoveMouseXspeed = 0;
if( key == SDL_KEY(UP) || key == SDL_KEY(DOWN) )
clickDoesNotMoveMouseYspeed += key == SDL_KEY(UP) ? -1 : 1;
if( key == SDL_KEY(UP) )
{
if( clickDoesNotMoveMouseYspeed > 0 )
clickDoesNotMoveMouseYspeed = 0;
clickDoesNotMoveMouseYspeed --;
}
else if( key == SDL_KEY(DOWN) )
{
if( clickDoesNotMoveMouseYspeed < 0 )
clickDoesNotMoveMouseYspeed = 0;
clickDoesNotMoveMouseYspeed ++;
}
else
clickDoesNotMoveMouseYspeed = 0;
clickDoesNotMoveMouseX += clickDoesNotMoveMouseXspeed;
clickDoesNotMoveMouseY += clickDoesNotMoveMouseYspeed;