mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-22 07:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clipboard: SDL_GetClipboardText() now follows the SDL_GetStringRule.

Browse Source 
Reference Issue #10229.
This commit is contained in:
Ryan C. Gordon
2024-07-15 14:00:52 -04:00
parent 3bc81a81f5
commit 158fc459f1
6 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/testautomation_clipboard.c
View File

@@ -163,12 +163,11 @@ static int clipboard_testClipboardDataFunctions(void *arg)
clipboard_cleanup_count - last_clipboard_cleanup_count);
expected_text = "TEST";
text = SDL_GetClipboardText();
text = (char *) SDL_GetClipboardText();
SDLTest_AssertCheck(
text && SDL_strcmp(text, expected_text) == 0,
"Verify clipboard text, expected \"%s\", got \"%s\"",
expected_text, text);
SDL_free(text);
boolResult = SDL_HasClipboardData(test_mime_types[TEST_MIME_TYPE_TEXT]);
SDLTest_AssertCheck(
@@ -265,12 +264,11 @@ static int clipboard_testClipboardDataFunctions(void *arg)
clipboard_cleanup_count - last_clipboard_cleanup_count);
expected_text = "TEST";
text = SDL_GetClipboardText();
text = (char *) SDL_GetClipboardText();
SDLTest_AssertCheck(
text && SDL_strcmp(text, expected_text) == 0,
"Verify clipboard text, expected \"%s\", got \"%s\"",
expected_text, text);
SDL_free(text);
boolResult = SDL_HasClipboardData(test_mime_types[TEST_MIME_TYPE_TEXT]);
SDLTest_AssertCheck(
@@ -386,7 +384,7 @@ static int clipboard_testClipboardTextFunctions(void *arg)
char *text = SDL_strdup(textRef);
SDL_bool boolResult;
int intResult;
char *charResult;
const char *charResult;
int last_clipboard_update_count;
SDL_AddEventWatch(ClipboardEventWatch, NULL);
@@ -403,7 +401,6 @@ static int clipboard_testClipboardTextFunctions(void *arg)
charResult && SDL_strcmp(charResult, "") == 0,
"Verify SDL_GetClipboardText returned \"\", got %s",
charResult);
SDL_free(charResult);
boolResult = SDL_HasClipboardText();
SDLTest_AssertCheck(
boolResult == SDL_FALSE,
@@ -436,7 +433,6 @@ static int clipboard_testClipboardTextFunctions(void *arg)
charResult && SDL_strcmp(textRef, charResult) == 0,
"Verify SDL_GetClipboardText returned correct string, expected '%s', got '%s'",
textRef, charResult);
SDL_free(charResult);
SDLTest_AssertCheck(
clipboard_update_count == last_clipboard_update_count + 1,
"Verify clipboard update count incremented by 1, got %d",

7
test/testcontroller.c
View File

@@ -680,14 +680,13 @@ static void CopyMapping(void)
static void PasteMapping(void)
{
if (controller) {
char *mapping = SDL_GetClipboardText();
const char *mapping = SDL_GetClipboardText();
if (MappingHasBindings(mapping)) {
StopBinding();
SetAndFreeGamepadMapping(mapping);
SDL_SetGamepadMapping(controller->id, mapping);
RefreshControllerName();
} else {
/* Not a valid mapping, ignore it */
SDL_free(mapping);
}
}
}
@@ -743,7 +742,7 @@ static void CopyControllerName(void)
static void PasteControllerName(void)
{
SDL_free(controller_name);
controller_name = SDL_GetClipboardText();
controller_name = SDL_strdup(SDL_GetClipboardText());
CommitControllerName();
}