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

Fixed button event for stylus

Browse Source
This commit is contained in:
pelya
2012-06-15 19:07:11 +03:00
parent 37ad9e446c
commit e38ade1e6b
4 changed files with 36 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/java/Settings.java
View File

@@ -200,10 +200,10 @@ class Settings
System.out.println("android.os.Build.MODEL: " + android.os.Build.MODEL);
if( (android.os.Build.MODEL.equals("GT-N7000") || android.os.Build.MODEL.equals("SGH-I717"))
/* && android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.GINGERBREAD_MR1 */ )
&& android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.GINGERBREAD_MR1 )
{
// Samsung Galaxy Note generates a keypress when you hover a stylus over the screen, and that messes up OpenTTD dialogs
// And I don't know whether this is true for ICS update for Galaxy Note
// ICS update sends events in a proper way
Globals.RemapHwKeycode[112] = SDL_1_2_Keycodes.SDLK_UNKNOWN;
}

18
project/java/Video.java
View File

@@ -343,7 +343,6 @@ abstract class DifferentTouchInput
boolean hwMouseEvent = ( event.getSource() == InputDevice.SOURCE_MOUSE ||
event.getSource() == InputDevice.SOURCE_STYLUS ||
(event.getMetaState() & KeyEvent.FLAG_TRACKING) != 0 ); // Hack to recognize Galaxy Note Gingerbread stylus
//System.out.println("Event source: " + event.getSource() + " stylus: " + hwMouseEvent + " meta " + event.getMetaState());
if( ExternalMouseDetected != hwMouseEvent )
{
ExternalMouseDetected = hwMouseEvent;
@@ -393,13 +392,18 @@ abstract class DifferentTouchInput
private int buttonState = 0;
public void process(final MotionEvent event)
{
if( event.getButtonState() != buttonState )
//System.out.println("Got motion event, type " + (int)(event.getAction()) + " X " + (int)event.getX() + " Y " + (int)event.getY() + " buttons " + buttonState + " source " + event.getSource());
super.process(event); // Push mouse coordinate first
int buttonStateNew = event.getButtonState();
if( buttonStateNew != buttonState )
{
buttonState = event.getButtonState();
//System.out.println("IcsTouchInput: button state " + buttonState);
DemoGLSurfaceView.nativeMouseButtonsPressed(buttonState);
for( int i = 1; i <= MotionEvent.BUTTON_FORWARD; i *= 2 )
{
if( (buttonStateNew & i) != (buttonState & i) )
DemoGLSurfaceView.nativeMouseButtonsPressed(i, ((buttonStateNew & i) == 0) ? 0 : 1);
}
buttonState = buttonStateNew;
}
super.process(event);
}
}
}
@@ -697,7 +701,7 @@ class DemoGLSurfaceView extends GLSurfaceView_SDL {
public static native void nativeTouchpad( int x, int y, int down, int multitouch );
public static native void initJavaCallbacks();
public static native void nativeHardwareMouseDetected( int detected );
public static native void nativeMouseButtonsPressed( int buttons );
public static native void nativeMouseButtonsPressed( int buttonId, int pressedState );
}