eden-emu/SDL
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Android: also protect Hat/Joy/PadDown,Up so there are not sent without window

Browse source
This commit is contained in:
Sylvain 2023-06-22 16:19:43 +02:00 • committed by Sylvain Becker
parent a3e0cd5208
commit 8f83ccd750
1 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/core/android/SDL_android.c
View file

@ -1032,7 +1032,17 @@ JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown)(
JNIEnv *env, jclass jcls, JNIEnv *env, jclass jcls,
jint device_id, jint keycode) jint device_id, jint keycode)
{ {
return Android_OnPadDown(device_id, keycode); int ret = -1;
SDL_LockMutex(Android_ActivityMutex);
if (Android_Window) {
ret = Android_OnPadDown(device_id, keycode);
}
SDL_UnlockMutex(Android_ActivityMutex);
return ret;
} }
/* Padup */ /* Padup */
@ -1040,7 +1050,17 @@ JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadUp)(
JNIEnv *env, jclass jcls, JNIEnv *env, jclass jcls,
jint device_id, jint keycode) jint device_id, jint keycode)
{ {
return Android_OnPadUp(device_id, keycode); int ret = -1;
SDL_LockMutex(Android_ActivityMutex);
if (Android_Window) {
ret = Android_OnPadUp(device_id, keycode);
}
SDL_UnlockMutex(Android_ActivityMutex);
return ret;
} }
/* Joy */ /* Joy */
@ -1048,7 +1068,13 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativeJoy)(
JNIEnv *env, jclass jcls, JNIEnv *env, jclass jcls,
jint device_id, jint axis, jfloat value) jint device_id, jint axis, jfloat value)
{ {
Android_OnJoy(device_id, axis, value); SDL_LockMutex(Android_ActivityMutex);
if (Android_Window) {
Android_OnJoy(device_id, axis, value);
}
SDL_UnlockMutex(Android_ActivityMutex);
} }
/* POV Hat */ /* POV Hat */
@ -1056,7 +1082,13 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativeHat)(
JNIEnv *env, jclass jcls, JNIEnv *env, jclass jcls,
jint device_id, jint hat_id, jint x, jint y) jint device_id, jint hat_id, jint x, jint y)
{ {
Android_OnHat(device_id, hat_id, x, y); SDL_LockMutex(Android_ActivityMutex);
if (Android_Window) {
Android_OnHat(device_id, hat_id, x, y);
}
SDL_UnlockMutex(Android_ActivityMutex);
} }
JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeAddJoystick)( JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeAddJoystick)(