mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-30 15:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android: remove SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH

Browse Source 
java layer runs as if separate mouse and touch was 1,
Use SDL_HINT_MOUSE_TOUCH_EVENTS and SDL_HINT_TOUCH_MOUSE_EVENTS
for generating synthetic touch/mouse events
This commit is contained in:
Sylvain Becker
2019-04-04 17:01:02 +02:00
parent e41576188d
commit bfdd0b228a
6 changed files with 9 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/android/SDL_android.c
View File

@@ -280,9 +280,6 @@ static jmethodID midPollHapticDevices;
static jmethodID midHapticRun;
static jmethodID midHapticStop;
/* static fields */
static jfieldID fidSeparateMouseAndTouch;
/* Accelerometer data storage */
static SDL_DisplayOrientation displayOrientation;
static float fLastAccelerometer[3];
@@ -537,12 +534,6 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl
__android_log_print(ANDROID_LOG_WARN, "SDL", "Missing some Java callbacks, do you have the latest version of SDLActivity.java?");
}
fidSeparateMouseAndTouch = (*env)->GetStaticFieldID(env, mActivityClass, "mSeparateMouseAndTouch", "Z");
if (!fidSeparateMouseAndTouch) {
__android_log_print(ANDROID_LOG_WARN, "SDL", "Missing some Java static fields, do you have the latest version of SDLActivity.java?");
}
checkJNIReady();
}
@@ -2206,13 +2197,6 @@ void Android_JNI_InitTouch() {
(*env)->CallStaticVoidMethod(env, mActivityClass, midInitTouch);
}
/* sets the mSeparateMouseAndTouch field */
void Android_JNI_SetSeparateMouseAndTouch(SDL_bool new_value)
{
JNIEnv *env = Android_JNI_GetEnv();
(*env)->SetStaticBooleanField(env, mActivityClass, fidSeparateMouseAndTouch, new_value ? JNI_TRUE : JNI_FALSE);
}
void Android_JNI_PollInputDevices(void)
{
JNIEnv *env = Android_JNI_GetEnv();