From f0954a9a70124e56e2ca24e9166731452d705d4f Mon Sep 17 00:00:00 2001 From: Caspian Rychlik-Prince Date: Thu, 12 Aug 2004 14:30:13 +0000 Subject: [PATCH] Put getClipboard back. --- src/java/org/lwjgl/Sys.java | 8 ++++++++ src/native/common/org_lwjgl_Sys.h | 3 +++ src/native/linux/org_lwjgl_Sys.cpp | 5 +++++ src/native/win32/org_lwjgl_Sys.cpp | 5 +++++ 4 files changed, 21 insertions(+) diff --git a/src/java/org/lwjgl/Sys.java b/src/java/org/lwjgl/Sys.java index 19311e1f..acff80d3 100644 --- a/src/java/org/lwjgl/Sys.java +++ b/src/java/org/lwjgl/Sys.java @@ -259,5 +259,13 @@ public final class Sys { * Where necessary, we use a native implementation of openURL. */ private static native void nOpenURL(String url); + + /** + * Get the contents of the system clipboard. The system might not have a clipboard + * (particularly if it doesn't even have a keyboard) in which case we return null. + * Otherwise we return a String, which may be the empty string "". + * @return a String, or null if there is no system clipboard. + */ + public static native String getClipboard(); } diff --git a/src/native/common/org_lwjgl_Sys.h b/src/native/common/org_lwjgl_Sys.h index 18786ea6..b863353c 100644 --- a/src/native/common/org_lwjgl_Sys.h +++ b/src/native/common/org_lwjgl_Sys.h @@ -76,6 +76,9 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL (JNIEnv *, jclass, jstring); +JNIEXPORT jstring JNICALL Java_org_lwjgl_Sys_getClipboard + (JNIEnv *, jclass); + #ifdef __cplusplus } #endif diff --git a/src/native/linux/org_lwjgl_Sys.cpp b/src/native/linux/org_lwjgl_Sys.cpp index aab9247a..2bf764ce 100644 --- a/src/native/linux/org_lwjgl_Sys.cpp +++ b/src/native/linux/org_lwjgl_Sys.cpp @@ -167,3 +167,8 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL } +JNIEXPORT jstring JNICALL Java_org_lwjgl_Sys_getClipboard + (JNIEnv * env, jclass clazz) +{ + return NULL; +} diff --git a/src/native/win32/org_lwjgl_Sys.cpp b/src/native/win32/org_lwjgl_Sys.cpp index 03a2e128..47ee285e 100644 --- a/src/native/win32/org_lwjgl_Sys.cpp +++ b/src/native/win32/org_lwjgl_Sys.cpp @@ -177,3 +177,8 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL } +JNIEXPORT jstring JNICALL Java_org_lwjgl_Sys_getClipboard + (JNIEnv * env, jclass clazz) +{ + return NULL; +}