From a3adc77d1899adb2f4bb4820dbdb052e4d5e0459 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Tue, 1 Dec 2020 12:17:13 +0700 Subject: [PATCH 1/2] [awt_xawt] fixe --- app/src/main/jni/awt_xawt/XToolkit.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/jni/awt_xawt/XToolkit.c b/app/src/main/jni/awt_xawt/XToolkit.c index 27d289908..8a77f9982 100644 --- a/app/src/main/jni/awt_xawt/XToolkit.c +++ b/app/src/main/jni/awt_xawt/XToolkit.c @@ -25,6 +25,7 @@ #include +#include #include // extern JavaVM *jvm; @@ -330,23 +331,19 @@ Java_java_awt_KeyboardFocusManager_initIDs */ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv (JNIEnv *env , jclass clazz, jstring key) { -/* char *ptr = NULL; const char *keystr = NULL; jstring ret = NULL; - keystr = JNU_GetStringPlatformChars(env, key, NULL); + keystr = (*env)->GetStringUTFChars(env, key, NULL); if (keystr) { ptr = getenv(keystr); if (ptr) { - ret = JNU_NewStringPlatform(env, (const char *) ptr); + ret = (*env)->NewStringUTF(env, (const char *) ptr); } - JNU_ReleaseStringPlatformChars(env, key, (const char*)keystr); + (*env)->ReleaseStringUTFChars(env, key, (const char*)keystr); } return ret; -*/ - - return (*env)->NewStringUTF(env, getenv(keystr)); } /* From 640bbec725ef8c5700622c33f07308716b156ef1 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Tue, 1 Dec 2020 12:21:19 +0700 Subject: [PATCH 2/2] [awt_xawt] JNI_OnLoad --- app/src/main/jni/awt_xawt/XToolkit.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/src/main/jni/awt_xawt/XToolkit.c b/app/src/main/jni/awt_xawt/XToolkit.c index 8a77f9982..45889c860 100644 --- a/app/src/main/jni/awt_xawt/XToolkit.c +++ b/app/src/main/jni/awt_xawt/XToolkit.c @@ -97,17 +97,6 @@ JNIEXPORT jlong JNICALL Java_sun_awt_X11_XToolkit_getDefaultXColormap return (jlong) 0; } -JNIEXPORT jint JNICALL -JNI_OnLoad(JavaVM *vm, void *reserved) -{ - // jvm = vm; - - //Set the gtk backend to x11 on all the systems - // putenv("GDK_BACKEND=x11"); - - return JNI_VERSION_1_2; -} - /* * Class: sun_awt_X11_XToolkit * Method: nativeLoadSystemColors