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

Disabled half-assed mouse detection

Browse Source
This commit is contained in:
pelya
2012-06-13 13:27:06 +03:00
parent 690a8c70f9
commit b88fe18cf4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project/java/Video.java
View File

@@ -276,12 +276,14 @@ abstract class DifferentTouchInput
} }
if( (event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_HOVER_MOVE ) // Support bluetooth/USB mouse - available since Android 3.1 if( (event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_HOVER_MOVE ) // Support bluetooth/USB mouse - available since Android 3.1
{ {
/*
if( !ExternalMouseDetected ) if( !ExternalMouseDetected )
{ {
ExternalMouseDetected = true; ExternalMouseDetected = true;
Settings.nativeSetExternalMouseDetected(); Settings.nativeSetExternalMouseDetected();
Toast.makeText(MainActivity.instance, R.string.hardware_mouse_detected, Toast.LENGTH_SHORT).show(); Toast.makeText(MainActivity.instance, R.string.hardware_mouse_detected, Toast.LENGTH_SHORT).show();
} }
*/
// TODO: it is possible that multiple pointers return that event, but we're handling only pointer #0 // TODO: it is possible that multiple pointers return that event, but we're handling only pointer #0
if( touchEvents[0].down ) if( touchEvents[0].down )
action = Mouse.SDL_FINGER_UP; action = Mouse.SDL_FINGER_UP;
@@ -345,15 +347,19 @@ abstract class DifferentTouchInput
{ {
if( event.getSource() != InputDevice.SOURCE_TOUCHPAD ) if( event.getSource() != InputDevice.SOURCE_TOUCHPAD )
{ {
if( !ExternalMouseDetected && event.getSource() == InputDevice.SOURCE_MOUSE ) /*
if( !ExternalMouseDetected &&
( event.getSource() == InputDevice.SOURCE_MOUSE || event.getSource() == InputDevice.SOURCE_STYLUS ) )
{ {
ExternalMouseDetected = true; ExternalMouseDetected = true;
Settings.nativeSetExternalMouseDetected(); Settings.nativeSetExternalMouseDetected();
Toast.makeText(MainActivity.instance, R.string.hardware_mouse_detected, Toast.LENGTH_SHORT).show(); Toast.makeText(MainActivity.instance, R.string.hardware_mouse_detected, Toast.LENGTH_SHORT).show();
} }
*/
process(event); process(event);
return; return;
} }
int x = (int)((event.getX() - xmin) / xmax * 65535.0f); int x = (int)((event.getX() - xmin) / xmax * 65535.0f);
int y = (int)((event.getY() - ymin) / ymax * 65535.0f); int y = (int)((event.getY() - ymin) / ymax * 65535.0f);
// Use only left square part of a touch surface - I've heard reports that it breaks functionality, feel free to uncomment and test it. // Use only left square part of a touch surface - I've heard reports that it breaks functionality, feel free to uncomment and test it.