Remove clipboard

Author: pmer

CMakeLists.txt

@@ -76,7 +76,6 @@ set(SDL2_SOURCES ${SDL2_SOURCES}
     ${HERE}/src/audio/SDL_mixer.c
     ${HERE}/src/audio/SDL_wave.c
     ${HERE}/src/cpuinfo/SDL_cpuinfo.c
-    ${HERE}/src/events/SDL_clipboardevents.c
     ${HERE}/src/events/SDL_displayevents.c
     ${HERE}/src/events/SDL_events.c
     ${HERE}/src/events/SDL_keyboard.c
@@ -120,7 +119,6 @@ if(APPLE)
         ${HERE}/src/thread/pthread/SDL_systls.c
         ${HERE}/src/timer/unix/SDL_systimer.c
         ${HERE}/src/timer/unix/SDL_systimer.c
-        ${HERE}/src/video/cocoa/SDL_cocoaclipboard.m
         ${HERE}/src/video/cocoa/SDL_cocoaevents.m
         ${HERE}/src/video/cocoa/SDL_cocoakeyboard.m
         ${HERE}/src/video/cocoa/SDL_cocoamessagebox.m

android-project/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -4,7 +4,6 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.UiModeManager;
-import android.content.ClipboardManager;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -108,7 +107,6 @@ public enum NativeState {
     protected static View mTextEdit;
     protected static boolean mScreenKeyboardShown;
     protected static ViewGroup mLayout;
-    protected static SDLClipboardHandler mClipboardHandler;
     protected static Hashtable<Integer, PointerIcon> mCursors;
     protected static int mLastCursorID;
     protected static SDLGenericMotionListener_API12 mMotionListener;
@@ -198,7 +196,6 @@ public static void initialize() {
         mSurface = null;
         mTextEdit = null;
         mLayout = null;
-        mClipboardHandler = null;
         mCursors = new Hashtable<Integer, PointerIcon>();
         mLastCursorID = 0;
         mSDLThread = null;
@@ -270,8 +267,6 @@ public void onClick(DialogInterface dialog,int id) {
         mSingleton = this;
         SDL.setContext(this);
 
-        mClipboardHandler = new SDLClipboardHandler();
-
         mHIDDeviceManager = HIDDeviceManager.acquire(this);
 
         // Set up the surface
@@ -796,7 +791,6 @@ public static native void onNativeTouch(int touchDevId, int pointerFingerId,
                                             int action, float x,
                                             float y, float p);
     public static native void onNativeAccel(float x, float y, float z);
-    public static native void onNativeClipboardChanged();
     public static native void onNativeSurfaceCreated();
     public static native void onNativeSurfaceChanged();
     public static native void onNativeSurfaceDestroyed();
@@ -1436,27 +1430,6 @@ public void onSystemUiVisibilityChange(int visibility) {
         }
     }
 
-    /**
-     * This method is called by SDL using JNI.
-     */
-    public static boolean clipboardHasText() {
-        return mClipboardHandler.clipboardHasText();
-    }
-
-    /**
-     * This method is called by SDL using JNI.
-     */
-    public static String clipboardGetText() {
-        return mClipboardHandler.clipboardGetText();
-    }
-
-    /**
-     * This method is called by SDL using JNI.
-     */
-    public static void clipboardSetText(String string) {
-        mClipboardHandler.clipboardSetText(string);
-    }
-
     /**
      * This method is called by SDL using JNI.
      */
@@ -2269,44 +2242,3 @@ public boolean deleteSurroundingText(int beforeLength, int afterLength) {
     }
 }
 
-class SDLClipboardHandler implements
-    ClipboardManager.OnPrimaryClipChangedListener {
-
-    protected ClipboardManager mClipMgr;
-
-    SDLClipboardHandler() {
-       mClipMgr = (ClipboardManager) SDL.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-       mClipMgr.addPrimaryClipChangedListener(this);
-    }
-
-    public boolean clipboardHasText() {
-       return mClipMgr.hasPrimaryClip();
-    }
-
-    public String clipboardGetText() {
-        ClipData clip = mClipMgr.getPrimaryClip();
-        if (clip != null) {
-            ClipData.Item item = clip.getItemAt(0);
-            if (item != null) {
-                CharSequence text = item.getText();
-                if (text != null) {
-                    return text.toString();
-                }
-            }
-        }
-        return null;
-    }
-
-    public void clipboardSetText(String string) {
-       mClipMgr.removePrimaryClipChangedListener(this);
-       ClipData clip = ClipData.newPlainText(null, string);
-       mClipMgr.setPrimaryClip(clip);
-       mClipMgr.addPrimaryClipChangedListener(this);
-    }
-
-    @Override
-    public void onPrimaryClipChanged() {
-        SDLActivity.onNativeClipboardChanged();
-    }
-}
-

include/SDL.h

@@ -34,7 +34,6 @@
 #include "SDL_assert.h"
 #include "SDL_atomic.h"
 #include "SDL_audio.h"
-#include "SDL_clipboard.h"
 #include "SDL_cpuinfo.h"
 #include "SDL_endian.h"
 #include "SDL_error.h"

include/SDL_clipboard.h

@@ -140,15 +140,6 @@ typedef enum
     SDL_DOLLARRECORD,
     SDL_MULTIGESTURE,
 
-    /* Clipboard events */
-    SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */
-
-    /* Drag and drop events */
-    SDL_DROPFILE        = 0x1000, /**< The system requests a file open */
-    SDL_DROPTEXT,                 /**< text/plain drag-and-drop event */
-    SDL_DROPBEGIN,                /**< A new set of drops is beginning (NULL filename) */
-    SDL_DROPCOMPLETE,             /**< Current set of drops is now complete (NULL filename) */
-
     /* Audio hotplug events */
     SDL_AUDIODEVICEADDED = 0x1100, /**< A new audio device is available */
     SDL_AUDIODEVICEREMOVED,        /**< An audio device has been removed. */

include/SDL_events.h

@@ -120,9 +120,6 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeAccel)(
         JNIEnv *env, jclass jcls,
         jfloat x, jfloat y, jfloat z);
 
-JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeClipboardChanged)(
-        JNIEnv *env, jclass jcls);
-
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeLowMemory)(
         JNIEnv *env, jclass cls);
 
@@ -180,7 +177,6 @@ static JNINativeMethod SDLActivity_tab[] = {
     { "onNativeTouch",              "(IIIFFF)V", SDL_JAVA_INTERFACE(onNativeTouch) },
     { "onNativeMouse",              "(IIFFZ)V", SDL_JAVA_INTERFACE(onNativeMouse) },
     { "onNativeAccel",              "(FFF)V", SDL_JAVA_INTERFACE(onNativeAccel) },
-    { "onNativeClipboardChanged",   "()V", SDL_JAVA_INTERFACE(onNativeClipboardChanged) },
     { "nativeLowMemory",            "()V", SDL_JAVA_INTERFACE(nativeLowMemory) },
     { "onNativeLocaleChanged",      "()V", SDL_JAVA_INTERFACE(onNativeLocaleChanged) },
     { "nativeSendQuit",             "()V", SDL_JAVA_INTERFACE(nativeSendQuit) },
@@ -294,9 +290,6 @@ static JavaVM *mJavaVM = NULL;
 static jclass mActivityClass;
 
 /* method signatures */
-static jmethodID midClipboardGetText;
-static jmethodID midClipboardHasText;
-static jmethodID midClipboardSetText;
 static jmethodID midCreateCustomCursor;
 static jmethodID midGetContext;
 static jmethodID midGetDisplayDPI;
@@ -573,9 +566,6 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl
 
     mActivityClass = (jclass)((*env)->NewGlobalRef(env, cls));
 
-    midClipboardGetText = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardGetText", "()Ljava/lang/String;");
-    midClipboardHasText = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardHasText", "()Z");
-    midClipboardSetText = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardSetText", "(Ljava/lang/String;)V");
     midCreateCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "createCustomCursor", "([IIIII)I");
     midGetContext = (*env)->GetStaticMethodID(env, mActivityClass, "getContext","()Landroid/content/Context;");
     midGetDisplayDPI = (*env)->GetStaticMethodID(env, mActivityClass, "getDisplayDPI", "()Landroid/util/DisplayMetrics;");
@@ -603,10 +593,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl
     midShowTextInput =  (*env)->GetStaticMethodID(env, mActivityClass, "showTextInput", "(IIII)Z");
     midSupportsRelativeMouse = (*env)->GetStaticMethodID(env, mActivityClass, "supportsRelativeMouse", "()Z");
 
-    if (!midClipboardGetText ||
-        !midClipboardHasText ||
-        !midClipboardSetText ||
-        !midCreateCustomCursor ||
+    if (!midCreateCustomCursor ||
         !midGetContext ||
         !midGetDisplayDPI ||
         !midGetManifestEnvironmentVariables ||
@@ -1131,13 +1118,6 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeAccel)(
     bHasNewData = SDL_TRUE;
 }
 
-/* Clipboard */
-JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeClipboardChanged)(
-                                    JNIEnv *env, jclass jcls)
-{
-    SDL_SendClipboardUpdate();
-}
-
 /* Low memory */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeLowMemory)(
                                     JNIEnv *env, jclass cls)
@@ -1916,41 +1896,6 @@ int Android_JNI_FileClose(SDL_RWops *ctx)
     return 0;
 }
 
-int Android_JNI_SetClipboardText(const char *text)
-{
-    JNIEnv *env = Android_JNI_GetEnv();
-    jstring string = (*env)->NewStringUTF(env, text);
-    (*env)->CallStaticVoidMethod(env, mActivityClass, midClipboardSetText, string);
-    (*env)->DeleteLocalRef(env, string);
-    return 0;
-}
-
-char* Android_JNI_GetClipboardText(void)
-{
-    JNIEnv *env = Android_JNI_GetEnv();
-    char *text = NULL;
-    jstring string;
-
-    string = (*env)->CallStaticObjectMethod(env, mActivityClass, midClipboardGetText);
-    if (string) {
-        const char *utf = (*env)->GetStringUTFChars(env, string, 0);
-        if (utf) {
-            text = SDL_strdup(utf);
-            (*env)->ReleaseStringUTFChars(env, string, utf);
-        }
-        (*env)->DeleteLocalRef(env, string);
-    }
-
-    return (text == NULL) ? SDL_strdup("") : text;
-}
-
-SDL_bool Android_JNI_HasClipboardText(void)
-{
-    JNIEnv *env = Android_JNI_GetEnv();
-    jboolean retval = (*env)->CallStaticBooleanMethod(env, mActivityClass, midClipboardHasText);
-    return (retval == JNI_TRUE) ? SDL_TRUE : SDL_FALSE;
-}
-
 /* returns 0 on success or -1 on error (others undefined then)
  * returns truthy or falsy value in plugged, charged and battery
  * returns the value in seconds and percent or -1 if not available

src/core/android/SDL_android.c

@@ -76,11 +76,6 @@ int Android_JNI_FileClose(SDL_RWops* ctx);
 /* Environment support */
 void Android_JNI_GetManifestEnvironmentVariables(void);
 
-/* Clipboard support */
-int Android_JNI_SetClipboardText(const char* text);
-char* Android_JNI_GetClipboardText(void);
-SDL_bool Android_JNI_HasClipboardText(void);
-
 /* Power support */
 int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seconds, int* percent);
 

src/core/android/SDL_android.h

@@ -633,12 +633,6 @@ void SDL_WinRTApp::OnWindowActivated(CoreWindow^ sender, WindowActivatedEventArg
             /* TODO, WinRT: see if the Win32 bugfix from https://hg.libsdl.org/SDL/rev/d278747da408 needs to be applied (on window activation) */
             //WIN_CheckAsyncMouseRelease(data);
 
-            /* TODO, WinRT: implement clipboard support, if possible */
-            ///*
-            // * FIXME: Update keyboard state
-            // */
-            //WIN_CheckClipboardUpdate(data->videodata);
-
             // HACK: Resetting the mouse-cursor here seems to fix
             // https://bugzilla.libsdl.org/show_bug.cgi?id=3217, whereby a
             // WinRT app's mouse cursor may switch to Windows' 'wait' cursor,

src/core/winrt/SDL_winrtapp_direct3d.cpp

@@ -95,9 +95,6 @@
 #define SDL_UnlockAudioDevice SDL_UnlockAudioDevice_REAL
 #define SDL_CloseAudio SDL_CloseAudio_REAL
 #define SDL_CloseAudioDevice SDL_CloseAudioDevice_REAL
-#define SDL_SetClipboardText SDL_SetClipboardText_REAL
-#define SDL_GetClipboardText SDL_GetClipboardText_REAL
-#define SDL_HasClipboardText SDL_HasClipboardText_REAL
 #define SDL_GetCPUCount SDL_GetCPUCount_REAL
 #define SDL_GetCPUCacheLineSize SDL_GetCPUCacheLineSize_REAL
 #define SDL_HasRDTSC SDL_HasRDTSC_REAL

src/dynapi/SDL_dynapi_overrides.h

@@ -126,9 +126,6 @@ SDL_DYNAPI_PROC(void,SDL_UnlockAudio,(void),(),)
 SDL_DYNAPI_PROC(void,SDL_UnlockAudioDevice,(SDL_AudioDeviceID a),(a),)
 SDL_DYNAPI_PROC(void,SDL_CloseAudio,(void),(),)
 SDL_DYNAPI_PROC(void,SDL_CloseAudioDevice,(SDL_AudioDeviceID a),(a),)
-SDL_DYNAPI_PROC(int,SDL_SetClipboardText,(const char *a),(a),return)
-SDL_DYNAPI_PROC(char*,SDL_GetClipboardText,(void),(),return)
-SDL_DYNAPI_PROC(SDL_bool,SDL_HasClipboardText,(void),(),return)
 SDL_DYNAPI_PROC(int,SDL_GetCPUCount,(void),(),return)
 SDL_DYNAPI_PROC(int,SDL_GetCPUCacheLineSize,(void),(),return)
 SDL_DYNAPI_PROC(SDL_bool,SDL_HasRDTSC,(void),(),return)