morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 08:24:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11486 from akallabeth/sdl-clip-update

Browse Source 
[client,sdl] fix clipboard updates
This commit is contained in:
akallabeth
2025-04-10 14:24:48 +02:00
committed by GitHub
parent 7471d11875 da21ac3792
commit 4b55f0fb2e
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
client/SDL/SDL3/sdl_clip.cpp
View File

@@ -90,6 +90,8 @@ static const std::vector<const char*>& s_mime_image()
static const char s_mime_gnome_copied_files[] = "x-special/gnome-copied-files";
static const char s_mime_mate_copied_files[] = "x-special/mate-copied-files";
static const char s_mime_freerdp_update[] = "x-special/freerdp-clipboard-update";
static const char* s_type_HtmlFormat = "HTML Format";
static const char* s_type_FileGroupDescriptorW = "FileGroupDescriptorW";
@@ -164,12 +166,23 @@ BOOL sdlClip::uninit(CliprdrClientContext* clip)
return TRUE;
}
static bool contains(const char** mime_types, Sint32 count)
{
for (Sint32 x = 0; x < count; x++)
{
const auto mime = mime_types[x];
if (mime && (strcmp(s_mime_freerdp_update, mime) == 0))
return true;
}
return false;
}
bool sdlClip::handle_update(const SDL_ClipboardEvent& ev)
{
if (!_ctx || !_sync || ev.owner)
{
/* TODO: Hack to identify our own updates */
if (ev.owner && (ev.reserved == 0x42))
_last_timestamp = ev.timestamp;
if (!_current_mimetypes.empty())
{
_cache_data.clear();
auto rc =
@@ -181,6 +194,16 @@ bool sdlClip::handle_update(const SDL_ClipboardEvent& ev)
return true;
}
if (ev.timestamp == _last_timestamp)
{
return true;
}
if (contains(ev.mime_types, ev.num_mime_types))
{
return true;
}
clearServerFormats();
std::string mime_html = s_mime_html;
@@ -519,15 +542,15 @@ UINT sdlClip::ReceiveServerFormatList(CliprdrClientContext* context,
clipboard->_current_mimetypes.push_back(s_mime_gnome_copied_files);
clipboard->_current_mimetypes.push_back(s_mime_mate_copied_files);
}
clipboard->_current_mimetypes.push_back(s_mime_freerdp_update);
auto s = clipboard->_current_mimetypes.size();
SDL_Event ev = { SDL_EVENT_CLIPBOARD_UPDATE };
ev.clipboard.owner = true;
ev.clipboard.timestamp = SDL_GetTicksNS();
ev.clipboard.num_mime_types = WINPR_ASSERTING_INT_CAST(Sint32, s);
ev.clipboard.mime_types = clipboard->_current_mimetypes.data();
/* TODO: Hack to identify our own updates */
ev.clipboard.reserved = 0x42;
auto rc = (SDL_PushEvent(&ev) == 1);
return clipboard->SendFormatListResponse(rc);
}

1
client/SDL/SDL3/sdl_clip.hpp
View File

@@ -144,6 +144,7 @@ class sdlClip
wClipboard* _system = nullptr;
std::atomic<bool> _sync = false;
HANDLE _event;
Uint64 _last_timestamp = 0;
std::vector<CliprdrFormat> _serverFormats;
CriticalSection _lock;