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

Patched to compile on Android (I hope).

This commit is contained in:
Ryan C. Gordon 2015-04-01 14:45:09 -04:00
parent f9041771d5
commit 64237d7f01
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1610,6 +1610,11 @@ const char * SDL_AndroidGetExternalStoragePath()
return s_AndroidExternalFilesPath; return s_AndroidExternalFilesPath;
} }
jclass Android_JNI_GetActivityClass(void)
{
return mActivityClass;
}
#endif /* __ANDROID__ */ #endif /* __ANDROID__ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

1
src/core/android/SDL_android.h
View File

@ -78,6 +78,7 @@ int Android_JNI_GetTouchDeviceIds(int **ids);
#include <jni.h> #include <jni.h>
JNIEnv *Android_JNI_GetEnv(void); JNIEnv *Android_JNI_GetEnv(void);
int Android_JNI_SetupThread(void); int Android_JNI_SetupThread(void);
jclass Android_JNI_GetActivityClass(void);
/* Generic messages */ /* Generic messages */
int Android_JNI_SendMessage(int command, int param); int Android_JNI_SendMessage(int command, int param);

4
src/video/android/SDL_androidtouch.c
View File

@ -56,9 +56,11 @@ static void
SeparateEventsHintWatcher(void *userdata, const char *name, SeparateEventsHintWatcher(void *userdata, const char *name,
const char *oldValue, const char *newValue) const char *oldValue, const char *newValue)
{ {
separate_mouse_and_touch = (newValue && (SDL_strcmp(newValue, "1") == 0)); jclass mActivityClass = Android_JNI_GetActivityClass();
JNIEnv *env = Android_JNI_GetEnv(); JNIEnv *env = Android_JNI_GetEnv();
jfieldID fid = (*env)->GetStaticFieldID(env, mActivityClass, "mSeparateMouseAndTouch", "Z"); jfieldID fid = (*env)->GetStaticFieldID(env, mActivityClass, "mSeparateMouseAndTouch", "Z");
separate_mouse_and_touch = (newValue && (SDL_strcmp(newValue, "1") == 0));
(*env)->SetStaticBooleanField(env, mActivityClass, fid, separate_mouse_and_touch ? JNI_TRUE : JNI_FALSE); (*env)->SetStaticBooleanField(env, mActivityClass, fid, separate_mouse_and_touch ? JNI_TRUE : JNI_FALSE);
} }