geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retry to open the clipboard in case another application has it open 

This fixes 'testautomation --filter clipboard_testClipboardTextFunctions' on Windows
main
Sam Lantinga 2023-07-03 16:06:59 -07:00
parent 3bd5e5ca3c
commit b6645bb255
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/video/windows/SDL_windowsclipboard.c
View File

@ -102,23 +102,31 @@ int WIN_SetClipboardText(SDL_VideoDevice *_this, const char *text)
char *WIN_GetClipboardText(SDL_VideoDevice *_this) char *WIN_GetClipboardText(SDL_VideoDevice *_this)
{ {
char *text; char *text = NULL;
text = NULL; if (IsClipboardFormatAvailable(TEXT_FORMAT)) {
if (IsClipboardFormatAvailable(TEXT_FORMAT) && /* Retry to open the clipboard in case another application has it open */
OpenClipboard(GetWindowHandle(_this))) { const int MAX_ATTEMPTS = 3;
HANDLE hMem; int attempt;
LPTSTR tstr;
hMem = GetClipboardData(TEXT_FORMAT); for (attempt = 0; attempt < MAX_ATTEMPTS; ++attempt) {
if (hMem) { if (OpenClipboard(GetWindowHandle(_this))) {
tstr = (LPTSTR)GlobalLock(hMem); HANDLE hMem;
text = WIN_StringToUTF8(tstr); LPTSTR tstr;
GlobalUnlock(hMem);
} else { hMem = GetClipboardData(TEXT_FORMAT);
WIN_SetError("Couldn't get clipboard data"); if (hMem) {
tstr = (LPTSTR)GlobalLock(hMem);
text = WIN_StringToUTF8(tstr);
GlobalUnlock(hMem);
} else {
WIN_SetError("Couldn't get clipboard data");
}
CloseClipboard();
break;
}
SDL_Delay(10);
} }
CloseClipboard();
} }
if (text == NULL) { if (text == NULL) {
text = SDL_strdup(""); text = SDL_strdup("");