Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-11-13 07:17:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] network: defer clipboard offers until claimed

Browse Source
This commit is contained in:
Geoffrey McRae
2026-10-01 08:26:40 +10:00
parent 3b8f051164
commit 437e19c13b
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
client/transports/Network/clipboard.c
View File

@@ -1108,7 +1108,7 @@ static bool networkClipboardQueueLocalOfferNL(
NetworkClipboard * clipboard) NetworkClipboard * clipboard)
{ {
if (!clipboard->localOffer.offerID || !clipboard->localOffer.count || if (!clipboard->localOffer.offerID || !clipboard->localOffer.count ||
(!clipboard->claimPending && !clipboard->claimed)) !clipboard->claimed)
return false; return false;
struct NetworkClipboardBatch batch = { 0 }; struct NetworkClipboardBatch batch = { 0 };
@@ -2982,12 +2982,22 @@ static bool networkClipboardRelease(void * opaque)
NetworkClipboard * clipboard = opaque; NetworkClipboard * clipboard = opaque;
LG_LOCK(clipboard->stateLock); LG_LOCK(clipboard->stateLock);
if ((!clipboard->claimPending && !clipboard->claimed) || if (!clipboard->claimPending && !clipboard->claimed)
!clipboard->localOffer.offerID)
{ {
LG_UNLOCK(clipboard->stateLock); LG_UNLOCK(clipboard->stateLock);
return false; return false;
} }
if (!clipboard->localOffer.offerID)
{
LG_UNLOCK(clipboard->stateLock);
return true;
}
if (clipboard->claimPending)
{
clipboard->localOffer = (struct NetworkLocalOffer) { 0 };
LG_UNLOCK(clipboard->stateLock);
return true;
}
const uint64_t offerID = clipboard->localOffer.offerID; const uint64_t offerID = clipboard->localOffer.offerID;
const bool queued = networkClipboardQueueControlNL(clipboard, const bool queued = networkClipboardQueueControlNL(clipboard,
@@ -3044,14 +3054,16 @@ static bool networkClipboardNotifyTypes(void * opaque,
clipboard->localOffer.indices[types[index]] = index; clipboard->localOffer.indices[types[index]] = index;
} }
const bool queued = networkClipboardQueueLocalOfferNL(clipboard); const bool deferred = clipboard->claimPending;
if (!queued) const bool accepted = deferred ||
networkClipboardQueueLocalOfferNL(clipboard);
if (!accepted)
clipboard->localOffer = previous; clipboard->localOffer = previous;
LG_UNLOCK(clipboard->stateLock); LG_UNLOCK(clipboard->stateLock);
if (queued) if (accepted && !deferred)
networkClipboardFlushQueued(clipboard); networkClipboardFlushQueued(clipboard);
return queued; return accepted;
} }
static bool networkClipboardOfferFiles(void * opaque, uint64_t dataset) static bool networkClipboardOfferFiles(void * opaque, uint64_t dataset)
@@ -3082,14 +3094,16 @@ static bool networkClipboardOfferFiles(void * opaque, uint64_t dataset)
clipboard->localOffer.indices[LG_CLIPBOARD_DATA_FILES] = 0; clipboard->localOffer.indices[LG_CLIPBOARD_DATA_FILES] = 0;
clipboard->localOffer.files = true; clipboard->localOffer.files = true;
const bool queued = networkClipboardQueueLocalOfferNL(clipboard); const bool deferred = clipboard->claimPending;
if (!queued) const bool accepted = deferred ||
networkClipboardQueueLocalOfferNL(clipboard);
if (!accepted)
clipboard->localOffer = previous; clipboard->localOffer = previous;
LG_UNLOCK(clipboard->stateLock); LG_UNLOCK(clipboard->stateLock);
if (queued) if (accepted && !deferred)
networkClipboardFlushQueued(clipboard); networkClipboardFlushQueued(clipboard);
return queued; return accepted;
} }
static LG_ClipboardResult networkClipboardDataBegin(void * opaque, static LG_ClipboardResult networkClipboardDataBegin(void * opaque,