mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clipboard: Ensure SDL_ClearClipboardData clears data even when no data has been set

This commit is contained in:
Erik Soma 2025-01-02 09:53:30 -05:00 committed by Sam Lantinga
parent f8f8d87bfa
commit c6b5c21aaf
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/SDL_clipboard.c
View File

@ -99,11 +99,6 @@ bool SDL_SetClipboardData(SDL_ClipboardDataCallback callback, SDL_ClipboardClean
return SDL_SetError("Invalid parameters"); return SDL_SetError("Invalid parameters");
} }
if (!callback && !_this->clipboard_callback) {
// Nothing to do, don't modify the system clipboard
return true;
}
SDL_CancelClipboardData(0); SDL_CancelClipboardData(0);
++_this->clipboard_sequence; ++_this->clipboard_sequence;

15
test/testautomation_clipboard.c
View File

@ -108,6 +108,13 @@ static int SDLCALL clipboard_testClipboardDataFunctions(void *arg)
result == true, result == true,
"Validate SDL_ClearClipboardData result, expected true, got %i", "Validate SDL_ClearClipboardData result, expected true, got %i",
result); result);
expected_text = "";
text = SDL_GetClipboardText();
SDLTest_AssertCheck(
text && SDL_strcmp(text, expected_text) == 0,
"Verify clipboard text, expected \"%s\", got \"%s\"",
expected_text, text);
SDL_free(text);
/* Test clearing clipboard data when it's already clear */ /* Test clearing clipboard data when it's already clear */
last_clipboard_update_count = clipboard_update_count; last_clipboard_update_count = clipboard_update_count;
@ -117,8 +124,8 @@ static int SDLCALL clipboard_testClipboardDataFunctions(void *arg)
"Validate SDL_ClearClipboardData result, expected true, got %i", "Validate SDL_ClearClipboardData result, expected true, got %i",
result); result);
SDLTest_AssertCheck( SDLTest_AssertCheck(
clipboard_update_count == last_clipboard_update_count, clipboard_update_count != last_clipboard_update_count,
"Verify clipboard update unchanged, got %d", "Verify clipboard update count changed, got %d",
clipboard_update_count - last_clipboard_update_count); clipboard_update_count - last_clipboard_update_count);
/* Validate error handling */ /* Validate error handling */
@ -430,8 +437,8 @@ static int SDLCALL clipboard_testClipboardTextFunctions(void *arg)
"Verify SDL_HasClipboardText returned false, got %s", "Verify SDL_HasClipboardText returned false, got %s",
(boolResult) ? "true" : "false"); (boolResult) ? "true" : "false");
SDLTest_AssertCheck( SDLTest_AssertCheck(
clipboard_update_count == last_clipboard_update_count, clipboard_update_count == last_clipboard_update_count + 1,
"Verify clipboard update unchanged, got %d", "Verify clipboard update count incremented by 1, got %d",
clipboard_update_count - last_clipboard_update_count); clipboard_update_count - last_clipboard_update_count);