ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-03-24 04:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 5303 - Touch/Mouse events simulation doesn't work on Android 11

Browse source
This commit is contained in:
Sylvain Becker 2020-10-05 09:56:03 +02:00
parent cd6670bff3
commit 2e38c94950
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
View file

@ -1923,7 +1923,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
@Override @Override
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
/* Ref: http://developer.android.com/training/gestures/multi.html */ /* Ref: http://developer.android.com/training/gestures/multi.html */
final int touchDevId = event.getDeviceId(); int touchDevId = event.getDeviceId();
final int pointerCount = event.getPointerCount(); final int pointerCount = event.getPointerCount();
int action = event.getActionMasked(); int action = event.getActionMasked();
int pointerFingerId; int pointerFingerId;
@ -1931,6 +1931,16 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
int i = -1; int i = -1;
float x,y,p; float x,y,p;
/**
* Prevent id to be -1, since it's used in SDL internal for synthetic events
* Appears when using Android emulator, eg:
* adb shell input mouse tap 100 100
* adb shell input touchscreen tap 100 100
*/
if (touchDevId < 0) {
touchDevId -= 1;
}
// 12290 = Samsung DeX mode desktop mouse // 12290 = Samsung DeX mode desktop mouse
// 12290 = 0x3002 = 0x2002 | 0x1002 = SOURCE_MOUSE | SOURCE_TOUCHSCREEN // 12290 = 0x3002 = 0x2002 | 0x1002 = SOURCE_MOUSE | SOURCE_TOUCHSCREEN
// 0x2 = SOURCE_CLASS_POINTER // 0x2 = SOURCE_CLASS_POINTER