From b0c4fa8df893a529d0660e99f2317d547dab681f Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 12 Aug 2004 12:27:14 +0000 Subject: [PATCH] Fixed Sys.setClipboard native stub naming --- src/native/common/org_lwjgl_Sys.h | 16 ++++++++-------- src/native/linux/org_lwjgl_Sys.cpp | 23 +++++------------------ src/native/win32/org_lwjgl_Sys.cpp | 15 +++------------ 3 files changed, 16 insertions(+), 38 deletions(-) diff --git a/src/native/common/org_lwjgl_Sys.h b/src/native/common/org_lwjgl_Sys.h index a90c2433..aee13160 100644 --- a/src/native/common/org_lwjgl_Sys.h +++ b/src/native/common/org_lwjgl_Sys.h @@ -75,14 +75,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nAlert JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL (JNIEnv *, jclass, jstring); -/* - * Class: org_lwjgl_Sys - * Method: setClipboard - * Signature: (Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_Sys_setClipboard - (JNIEnv *, jclass, jstring ); - /* * Class: org_lwjgl_Sys * Method: getClipboard @@ -91,6 +83,14 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_setClipboard JNIEXPORT jstring JNICALL Java_org_lwjgl_Sys_getClipboard (JNIEnv *, jclass); +/* + * Class: org_lwjgl_Sys + * Method: nSetClipboard + * Signature: (Ljava/lang/String;)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nSetClipboard + (JNIEnv *, jclass, jstring); + #ifdef __cplusplus } #endif diff --git a/src/native/linux/org_lwjgl_Sys.cpp b/src/native/linux/org_lwjgl_Sys.cpp index 8f692857..90880fdd 100644 --- a/src/native/linux/org_lwjgl_Sys.cpp +++ b/src/native/linux/org_lwjgl_Sys.cpp @@ -153,11 +153,6 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_Sys_getNativeLibraryVersion(JNIEnv *env return getVersionString(env); } -/* - * Class: org_lwjgl_Sys - * Method: openURL - * Signature: (Ljava/lang/String;)V - */ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL (JNIEnv * env, jclass clazz, jstring url) { @@ -166,23 +161,15 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL env->ReleaseStringUTFChars(url, urlString); } -/* - * Class: org_lwjgl_Sys - * Method: setClipboard - * Signature: (Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_Sys_setClipboard +JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nSetClipboard (JNIEnv * env, jclass clazz, jstring clipboard) { - const char * urlString = env->GetStringUTFChars(clipboard, NULL); - // TODO + const char * clipboard_string = env->GetStringUTFChars(clipboard, NULL); + const jsize clipboard_size = env->GetStringUTFLength(clipboard); + printf("string %s, size %d\n", clipboard_string, clipboard_size); + env->ReleaseStringUTFChars(clipboard, clipboard_string); } -/* - * Class: org_lwjgl_Sys - * Method: getClipboard - * Signature: ()Ljava/lang/String; - */ JNIEXPORT jstring JNICALL Java_org_lwjgl_Sys_getClipboard (JNIEnv * env, jclass clazz) { diff --git a/src/native/win32/org_lwjgl_Sys.cpp b/src/native/win32/org_lwjgl_Sys.cpp index a5f04fac..aa135946 100644 --- a/src/native/win32/org_lwjgl_Sys.cpp +++ b/src/native/win32/org_lwjgl_Sys.cpp @@ -176,23 +176,14 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL } -/* - * Class: org_lwjgl_Sys - * Method: setClipboard - * Signature: (Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_org_lwjgl_Sys_setClipboard +JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nSetClipboard (JNIEnv * env, jclass clazz, jstring clipboard) { - const char * urlString = env->GetStringUTFChars(clipboard, NULL); + const char * clipboardString = env->GetStringUTFChars(clipboard, NULL); // TODO + env->ReleaseStringUTFChars(clipboardString); } -/* - * Class: org_lwjgl_Sys - * Method: getClipboard - * Signature: ()Ljava/lang/String; - */ JNIEXPORT jstring JNICALL Java_org_lwjgl_Sys_getClipboard (JNIEnv * env, jclass clazz) {