Skip to content
Permalink
Browse files

Fixes #2611 #2610, Touch events cause crash on Android, thanks Alvin …

…& Sylvain

This bug was introduced on this rev: https://hg.libsdl.org/SDL/rev/42f6bd8c8575
  • Loading branch information
gabomdq committed Jun 28, 2014
1 parent 02e9f81 commit 1ed1f7f2e3c4452abf7e98c5568092bc52ed2365
Showing with 5 additions and 5 deletions.
  1. +1 −1 src/events/SDL_mouse.c
  2. +4 −4 src/video/android/SDL_androidtouch.c
@@ -142,7 +142,7 @@ SDL_UpdateMouseFocus(SDL_Window * window, int x, int y, Uint32 buttonstate)
SDL_Mouse *mouse = SDL_GetMouse();
SDL_bool inWindow = SDL_TRUE;

if ((window->flags & SDL_WINDOW_MOUSE_CAPTURE) == 0) {
if (window != NULL && ((window->flags & SDL_WINDOW_MOUSE_CAPTURE) == 0)) {
int w, h;
SDL_GetWindowSize(window, &w, &h);
if (x < 0 || y < 0 || x >= w || y >= h) {
@@ -86,9 +86,9 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
/* Primary pointer down */
Android_GetWindowCoordinates(x, y, &window_x, &window_y);
/* send moved event */
SDL_SendMouseMotion(NULL, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
/* send mouse down event */
SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
SDL_SendMouseButton(Android_Window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
pointerFingerID = fingerId;
case ACTION_POINTER_DOWN:
/* Non primary pointer down */
@@ -100,7 +100,7 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
Android_GetWindowCoordinates(x, y, &window_x, &window_y);

/* send moved event */
SDL_SendMouseMotion(NULL, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
}
SDL_SendTouchMotion(touchDeviceId, fingerId, x, y, p);
break;
@@ -109,7 +109,7 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
/* Primary pointer up */
/* send mouse up */
pointerFingerID = (SDL_FingerID) 0;
SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
SDL_SendMouseButton(Android_Window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
case ACTION_POINTER_UP:
/* Non primary pointer up */
SDL_SendTouch(touchDeviceId, fingerId, SDL_FALSE, x, y, p);

0 comments on commit 1ed1f7f

Please sign in to comment.