publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move binclip clear to probing phase

Browse Source
This commit is contained in:
Lauri Kasanen
2021-10-05 12:47:58 +03:00
parent b2cfaafff9
commit b43575ebcb
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unix/xserver/hw/vnc/vncSelection.c
View File

@@ -593,6 +593,7 @@ static void vncHandleSelection(Atom selection, Atom target,
vncHasAtom(xaUTF8_STRING, (const Atom*)prop->data, prop->size) || vncHasAtom(xaUTF8_STRING, (const Atom*)prop->data, prop->size) ||
vncHasBinaryClipboardAtom((const Atom*)prop->data, prop->size)) { vncHasBinaryClipboardAtom((const Atom*)prop->data, prop->size)) {
LOG_DEBUG("Compatible format found, notifying clients"); LOG_DEBUG("Compatible format found, notifying clients");
vncClearBinaryClipboardData();
activeSelection = selection; activeSelection = selection;
vncAnnounceClipboard(TRUE); vncAnnounceClipboard(TRUE);
vncHandleClipboardRequest(); vncHandleClipboardRequest();
@@ -606,7 +607,6 @@ static void vncHandleSelection(Atom selection, Atom target,
unsigned i; unsigned i;
Bool skiphtml = FALSE; Bool skiphtml = FALSE;
Bool cleared = FALSE;
if (htmlPngPresent && if (htmlPngPresent &&
vncHasAtom(xaBinclips[xaHtmlIndex], (const Atom*)prop->data, prop->size) && vncHasAtom(xaBinclips[xaHtmlIndex], (const Atom*)prop->data, prop->size) &&
vncHasAtom(xaBinclips[xaPngIndex], (const Atom*)prop->data, prop->size)) vncHasAtom(xaBinclips[xaPngIndex], (const Atom*)prop->data, prop->size))
@@ -616,10 +616,6 @@ static void vncHandleSelection(Atom selection, Atom target,
if (skiphtml && i == xaHtmlIndex) if (skiphtml && i == xaHtmlIndex)
continue; continue;
if (vncHasAtom(xaBinclips[i], (const Atom*)prop->data, prop->size)) { if (vncHasAtom(xaBinclips[i], (const Atom*)prop->data, prop->size)) {
if (!cleared) {
vncClearBinaryClipboardData();
cleared = TRUE;
}
vncSelectionRequest(selection, xaBinclips[i]); vncSelectionRequest(selection, xaBinclips[i]);
//break; //break;
} }