ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Android) fix up motion events incorrectly removing every active motion event

This commit is contained in:
ToadKing 2013-02-10 18:52:37 -05:00
parent 5fad427e15
commit 18d30fb441
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
android/native/jni/input_android.c
View File

@ -172,10 +172,16 @@ static void android_input_poll(void *data)
action == AMOTION_EVENT_ACTION_CANCEL || action == AMOTION_EVENT_ACTION_POINTER_UP) || action == AMOTION_EVENT_ACTION_CANCEL || action == AMOTION_EVENT_ACTION_POINTER_UP) ||
(source == AINPUT_SOURCE_MOUSE && action != AMOTION_EVENT_ACTION_DOWN); (source == AINPUT_SOURCE_MOUSE && action != AMOTION_EVENT_ACTION_DOWN);
int max = min(AMotionEvent_getPointerCount(event), MAX_TOUCH); if (keyup)
for (motion_pointer = 0; motion_pointer < max; motion_pointer++)
{ {
if (!keyup) memmove(pointer + motion_pointer, pointer + motion_pointer + 1, (MAX_TOUCH - motion_pointer - 1) * sizeof(struct input_pointer));
if (pointer_count > 0)
pointer_count--;
}
else
{
int pointer_max = min(AMotionEvent_getPointerCount(event), MAX_TOUCH);
for (motion_pointer = 0; motion_pointer < pointer_max; motion_pointer++)
{ {
x = AMotionEvent_getX(event, motion_pointer); x = AMotionEvent_getX(event, motion_pointer);
y = AMotionEvent_getY(event, motion_pointer); y = AMotionEvent_getY(event, motion_pointer);
@ -186,12 +192,6 @@ static void android_input_poll(void *data)
pointer_count = max(pointer_count, motion_pointer + 1); pointer_count = max(pointer_count, motion_pointer + 1);
} }
else
{
memmove(pointer + motion_pointer, pointer + motion_pointer + 1, (MAX_TOUCH - motion_pointer - 1) * sizeof(struct input_pointer));
if (pointer_count > 0)
pointer_count--;
}
} }
} }