encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added locking for Android joystick events

This commit is contained in:
Sam Lantinga 2022-09-02 16:52:55 -07:00
parent e8f6b7503a
commit 47f2373dc1
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/joystick/android/SDL_sysjoystick.c
View File

@ -208,12 +208,14 @@ Android_OnPadDown(int device_id, int keycode)
SDL_joylist_item *item; SDL_joylist_item *item;
int button = keycode_to_SDL(keycode); int button = keycode_to_SDL(keycode);
if (button >= 0) { if (button >= 0) {
SDL_LockJoysticks();
item = JoystickByDeviceId(device_id); item = JoystickByDeviceId(device_id);
if (item && item->joystick) { if (item && item->joystick) {
SDL_PrivateJoystickButton(item->joystick, button, SDL_PRESSED); SDL_PrivateJoystickButton(item->joystick, button, SDL_PRESSED);
} else { } else {
SDL_SendKeyboardKey(SDL_PRESSED, button_to_scancode(button)); SDL_SendKeyboardKey(SDL_PRESSED, button_to_scancode(button));
} }
SDL_UnlockJoysticks();
return 0; return 0;
} }
@ -226,12 +228,14 @@ Android_OnPadUp(int device_id, int keycode)
SDL_joylist_item *item; SDL_joylist_item *item;
int button = keycode_to_SDL(keycode); int button = keycode_to_SDL(keycode);
if (button >= 0) { if (button >= 0) {
SDL_LockJoysticks();
item = JoystickByDeviceId(device_id); item = JoystickByDeviceId(device_id);
if (item && item->joystick) { if (item && item->joystick) {
SDL_PrivateJoystickButton(item->joystick, button, SDL_RELEASED); SDL_PrivateJoystickButton(item->joystick, button, SDL_RELEASED);
} else { } else {
SDL_SendKeyboardKey(SDL_RELEASED, button_to_scancode(button)); SDL_SendKeyboardKey(SDL_RELEASED, button_to_scancode(button));
} }
SDL_UnlockJoysticks();
return 0; return 0;
} }
@ -242,10 +246,14 @@ int
Android_OnJoy(int device_id, int axis, float value) Android_OnJoy(int device_id, int axis, float value)
{ {
/* Android gives joy info normalized as [-1.0, 1.0] or [0.0, 1.0] */ /* Android gives joy info normalized as [-1.0, 1.0] or [0.0, 1.0] */
SDL_joylist_item *item = JoystickByDeviceId(device_id); SDL_joylist_item *item;
SDL_LockJoysticks();
item = JoystickByDeviceId(device_id);
if (item && item->joystick) { if (item && item->joystick) {
SDL_PrivateJoystickAxis(item->joystick, axis, (Sint16) (32767.*value)); SDL_PrivateJoystickAxis(item->joystick, axis, (Sint16) (32767.*value));
} }
SDL_UnlockJoysticks();
return 0; return 0;
} }
@ -259,7 +267,10 @@ Android_OnHat(int device_id, int hat_id, int x, int y)
const int DPAD_RIGHT_MASK = (1 << SDL_CONTROLLER_BUTTON_DPAD_RIGHT); const int DPAD_RIGHT_MASK = (1 << SDL_CONTROLLER_BUTTON_DPAD_RIGHT);
if (x >= -1 && x <= 1 && y >= -1 && y <= 1) { if (x >= -1 && x <= 1 && y >= -1 && y <= 1) {
SDL_joylist_item *item = JoystickByDeviceId(device_id); SDL_joylist_item *item;
SDL_LockJoysticks();
item = JoystickByDeviceId(device_id);
if (item && item->joystick) { if (item && item->joystick) {
int dpad_state = 0; int dpad_state = 0;
int dpad_delta; int dpad_delta;
@ -291,6 +302,7 @@ Android_OnHat(int device_id, int hat_id, int x, int y)
item->dpad_state = dpad_state; item->dpad_state = dpad_state;
} }
} }
SDL_UnlockJoysticks();
return 0; return 0;
} }