|
@@ -215,6 +215,7 @@ static jmethodID midSetOrientation;
|
|
static jmethodID midGetContext;
|
|
static jmethodID midGetContext;
|
|
static jmethodID midIsAndroidTV;
|
|
static jmethodID midIsAndroidTV;
|
|
static jmethodID midIsChromebook;
|
|
static jmethodID midIsChromebook;
|
|
|
|
+static jmethodID midIsDeXMode;
|
|
static jmethodID midInputGetInputDeviceIds;
|
|
static jmethodID midInputGetInputDeviceIds;
|
|
static jmethodID midSendMessage;
|
|
static jmethodID midSendMessage;
|
|
static jmethodID midShowTextInput;
|
|
static jmethodID midShowTextInput;
|
|
@@ -320,6 +321,8 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv* mEnv, jclass c
|
|
"isAndroidTV","()Z");
|
|
"isAndroidTV","()Z");
|
|
midIsChromebook = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
|
|
midIsChromebook = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
|
|
"isChromebook", "()Z");
|
|
"isChromebook", "()Z");
|
|
|
|
+ midIsDeXMode = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
|
|
|
|
+ "isDeXMode", "()Z");
|
|
midInputGetInputDeviceIds = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
|
|
midInputGetInputDeviceIds = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
|
|
"inputGetInputDeviceIds", "(I)[I");
|
|
"inputGetInputDeviceIds", "(I)[I");
|
|
midSendMessage = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
|
|
midSendMessage = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
|
|
@@ -354,7 +357,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv* mEnv, jclass c
|
|
!midClipboardSetText || !midClipboardGetText || !midClipboardHasText ||
|
|
!midClipboardSetText || !midClipboardGetText || !midClipboardHasText ||
|
|
!midOpenAPKExpansionInputStream || !midGetManifestEnvironmentVariables || !midGetDisplayDPI ||
|
|
!midOpenAPKExpansionInputStream || !midGetManifestEnvironmentVariables || !midGetDisplayDPI ||
|
|
!midCreateCustomCursor || !midSetCustomCursor || !midSetSystemCursor || !midSupportsRelativeMouse || !midSetRelativeMouseEnabled ||
|
|
!midCreateCustomCursor || !midSetCustomCursor || !midSetSystemCursor || !midSupportsRelativeMouse || !midSetRelativeMouseEnabled ||
|
|
- !midIsChromebook) {
|
|
|
|
|
|
+ !midIsChromebook || !midIsDeXMode) {
|
|
__android_log_print(ANDROID_LOG_WARN, "SDL", "Missing some Java callbacks, do you have the latest version of SDLActivity.java?");
|
|
__android_log_print(ANDROID_LOG_WARN, "SDL", "Missing some Java callbacks, do you have the latest version of SDLActivity.java?");
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2036,6 +2039,12 @@ SDL_bool SDL_IsChromebook(void)
|
|
return (*env)->CallStaticBooleanMethod(env, mActivityClass, midIsChromebook);
|
|
return (*env)->CallStaticBooleanMethod(env, mActivityClass, midIsChromebook);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+SDL_bool SDL_IsDeXMode(void)
|
|
|
|
+{
|
|
|
|
+ JNIEnv *env = Android_JNI_GetEnv();
|
|
|
|
+ return (*env)->CallStaticBooleanMethod(env, mActivityClass, midIsDeXMode);
|
|
|
|
+}
|
|
|
|
+
|
|
const char * SDL_AndroidGetInternalStoragePath(void)
|
|
const char * SDL_AndroidGetInternalStoragePath(void)
|
|
{
|
|
{
|
|
static char *s_AndroidInternalFilesPath = NULL;
|
|
static char *s_AndroidInternalFilesPath = NULL;
|