Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-10 08:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] clipboard/wayland: avoid writing back to guest clipboard

Browse Source 
Copying rich text from the guest would be turned into plaintext on the client.
Prior to this change, this would be sent back to the guest, overwriting its
clipboard. This made it impossible to copy rich text inside the guest.

This commit detects such self-copies by checking if the receiver is the
current process, and rejecting it.
This commit is contained in:
Quantum 2021-01-13 15:21:34 -05:00 committed by Geoffrey McRae
parent 02421ef269
commit 17691f889b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/clipboards/Wayland/src/wayland.c
View File

@ -41,6 +41,8 @@ struct WCBState
char * stashedMimetype; char * stashedMimetype;
uint8_t * stashedContents; uint8_t * stashedContents;
ssize_t stashedSize; ssize_t stashedSize;
bool isReceiving;
bool isSelfCopy;
LG_ClipboardReleaseFn releaseFn; LG_ClipboardReleaseFn releaseFn;
LG_ClipboardRequestFn requestFn; LG_ClipboardRequestFn requestFn;
@ -217,6 +219,8 @@ static void dataDeviceHandleSelection(void * data,
abort(); abort();
} }
this->isReceiving = true;
this->isSelfCopy = false;
wl_data_offer_receive(offer, this->stashedMimetype, fds[1]); wl_data_offer_receive(offer, this->stashedMimetype, fds[1]);
close(fds[1]); close(fds[1]);
free(this->stashedMimetype); free(this->stashedMimetype);
@ -264,11 +268,13 @@ static void dataDeviceHandleSelection(void * data,
this->stashedSize = numRead; this->stashedSize = numRead;
this->stashedContents = buf; this->stashedContents = buf;
this->isReceiving = false;
close(fds[0]); close(fds[0]);
wl_data_offer_destroy(offer); wl_data_offer_destroy(offer);
this->notifyFn(this->stashedType, 0); if (!this->isSelfCopy)
this->notifyFn(this->stashedType, 0);
} }
static const struct wl_data_device_listener dataDeviceListener = { static const struct wl_data_device_listener dataDeviceListener = {
@ -321,7 +327,9 @@ static void dataSourceHandleSend(void * data, struct wl_data_source * source,
const char * mimetype, int fd) const char * mimetype, int fd)
{ {
struct WCBTransfer * transfer = (struct WCBTransfer *) data; struct WCBTransfer * transfer = (struct WCBTransfer *) data;
if (containsMimetype(transfer->mimetypes, mimetype)) if (this->isReceiving)
this->isSelfCopy = true;
else if (containsMimetype(transfer->mimetypes, mimetype))
{ {
// Consider making this do non-blocking sends to not stall the Wayland // Consider making this do non-blocking sends to not stall the Wayland
// event loop if it becomes a problem. This is "fine" in the sense that // event loop if it becomes a problem. This is "fine" in the sense that