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

Fix some local->remote clipboard merge misses

Browse Source
This commit is contained in:
Lauri Kasanen
2021-04-13 13:49:43 +03:00
parent a1cf454f06
commit 95d34f7e58
9 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unix/xserver/hw/vnc/XserverDesktop.cc
View File

@@ -476,9 +476,9 @@ void XserverDesktop::handleClipboardAnnounce(bool available)
vncHandleClipboardAnnounce(available);
}
void XserverDesktop::handleClipboardData(const char* data_)
void XserverDesktop::handleClipboardData(const char* data_, int len)
{
vncHandleClipboardData(data_);
vncHandleClipboardData(data_, len);
}
void XserverDesktop::grabRegion(const rfb::Region& region)

2
unix/xserver/hw/vnc/XserverDesktop.h
View File

@@ -96,7 +96,7 @@ public:
const rfb::ScreenSet& layout);
virtual void handleClipboardRequest();
virtual void handleClipboardAnnounce(bool available);
virtual void handleClipboardData(const char* data);
virtual void handleClipboardData(const char* data, int len);
// rfb::PixelBuffer callbacks
virtual void grabRegion(const rfb::Region& r);

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

@@ -67,7 +67,7 @@ static int vncOwnSelection(Atom selection);
static int vncConvertSelection(ClientPtr client, Atom selection,
Atom target, Atom property,
Window requestor, CARD32 time,
const char* data);
const char* data, int len);
static int vncProcConvertSelection(ClientPtr client);
static void vncSelectionRequest(Atom selection, Atom target);
static int vncProcSendEvent(ClientPtr client);
@@ -161,7 +161,7 @@ void vncHandleClipboardAnnounce(int available)
}
}
void vncHandleClipboardData(const char* data)
void vncHandleClipboardData(const char* data, int len)
{
struct VncDataTarget* next;
@@ -177,7 +177,7 @@ void vncHandleClipboardData(const char* data)
vncDataTargetHead->property,
vncDataTargetHead->requestor,
vncDataTargetHead->time,
data);
data, len);
if (rc != Success) {
event.u.u.type = SelectionNotify;
event.u.selectionNotify.time = vncDataTargetHead->time;
@@ -280,7 +280,7 @@ static int vncOwnSelection(Atom selection)
static int vncConvertSelection(ClientPtr client, Atom selection,
Atom target, Atom property,
Window requestor, CARD32 time,
const char* data)
const char* data, int len)
{
Selection *pSel;
WindowPtr pWin;
@@ -370,7 +370,7 @@ static int vncConvertSelection(ClientPtr client, Atom selection,
rc = dixChangeWindowProperty(serverClient, pWin, realProperty,
XA_STRING, 8, PropModeReplace,
strlen(latin1), latin1, TRUE);
len, latin1, TRUE);
vncStrFree(latin1);
@@ -379,7 +379,7 @@ static int vncConvertSelection(ClientPtr client, Atom selection,
} else if (target == xaUTF8_STRING) {
rc = dixChangeWindowProperty(serverClient, pWin, realProperty,
xaUTF8_STRING, 8, PropModeReplace,
strlen(data), data, TRUE);
len, data, TRUE);
if (rc != Success)
return rc;
} else {
@@ -424,7 +424,7 @@ static int vncProcConvertSelection(ClientPtr client)
pSel->window == wid) {
rc = vncConvertSelection(client, stuff->selection,
stuff->target, stuff->property,
stuff->requestor, stuff->time, NULL);
stuff->requestor, stuff->time, NULL, 0);
if (rc != Success) {
xEvent event;

2
unix/xserver/hw/vnc/vncSelection.h
View File

@@ -26,7 +26,7 @@ void vncSelectionInit(void);
void vncHandleClipboardRequest(void);
void vncHandleClipboardAnnounce(int available);
void vncHandleClipboardData(const char* data);
void vncHandleClipboardData(const char* data, int len);
#ifdef __cplusplus
}