rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Used StreamChunker to send clipboard in chunks #4601

This commit is contained in:
Xinyu Hou 2015-05-20 19:54:17 +01:00
parent cf5347c8f6
commit 490667e21b
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/lib/client/ServerProxy.cpp
View File

@ -19,6 +19,8 @@
#include "client/ServerProxy.h" #include "client/ServerProxy.h"
#include "client/Client.h" #include "client/Client.h"
#include "synergy/ClipboardChunk.h"
#include "synergy/StreamChunker.h"
#include "synergy/Clipboard.h" #include "synergy/Clipboard.h"
#include "synergy/ProtocolUtil.h" #include "synergy/ProtocolUtil.h"
#include "synergy/option_types.h" #include "synergy/option_types.h"
@ -69,6 +71,11 @@ ServerProxy::ServerProxy(Client* client, synergy::IStream* stream, IEventQueue*
new TMethodEventJob<ServerProxy>(this, new TMethodEventJob<ServerProxy>(this,
&ServerProxy::handleData)); &ServerProxy::handleData));
m_events->adoptHandler(m_events->forClipboard().clipboardSending(),
this,
new TMethodEventJob<ServerProxy>(this,
&ServerProxy::handleClipboardSendingEvent));
// send heartbeat // send heartbeat
setKeepAliveRate(kKeepAliveRate); setKeepAliveRate(kKeepAliveRate);
} }
@ -358,8 +365,11 @@ void
ServerProxy::onClipboardChanged(ClipboardID id, const IClipboard* clipboard) ServerProxy::onClipboardChanged(ClipboardID id, const IClipboard* clipboard)
{ {
String data = IClipboard::marshall(clipboard); String data = IClipboard::marshall(clipboard);
LOG((CLOG_DEBUG1 "sending clipboard %d seqnum=%d, size=%d", id, m_seqNum, data.size())); LOG((CLOG_DEBUG "sending clipboard %d seqnum=%d", id, m_seqNum));
ProtocolUtil::writef(m_stream, kMsgDClipboard, id, m_seqNum, &data);
StreamChunker::sendClipboard(data, data.size(), id, m_seqNum, m_events, this);
LOG((CLOG_DEBUG "sent clipboard size=%d", data.size()));
} }
void void
@ -928,6 +938,38 @@ ServerProxy::dragInfoReceived()
m_client->dragInfoReceived(fileNum, content); m_client->dragInfoReceived(fileNum, content);
} }
void
ServerProxy::handleClipboardSendingEvent(const Event& event, void*)
{
void* data = event.getData();
ClipboardChunk* clipboardData = reinterpret_cast<ClipboardChunk*>(data);
LOG((CLOG_DEBUG1 "sending clipboard chunk"));
char* chunk = clipboardData->m_chunk;
ClipboardID id = chunk[0];
UInt32* seq = reinterpret_cast<UInt32*>(&chunk[1]);
UInt32 sequence = *seq;
UInt8 mark = chunk[5];
String dataChunk(&chunk[6], clipboardData->m_dataSize);
switch (mark) {
case kDataStart:
LOG((CLOG_DEBUG2 "file sending start: size=%s", dataChunk.c_str()));
break;
case kDataChunk:
LOG((CLOG_DEBUG2 "file chunk sending: size=%i", dataChunk.size()));
break;
case kDataEnd:
LOG((CLOG_DEBUG2 "file sending finished"));
break;
}
ProtocolUtil::writef(m_stream, kMsgDClipboard, id, sequence, mark, &dataChunk);
}
void void
ServerProxy::fileChunkSending(UInt8 mark, char* data, size_t dataSize) ServerProxy::fileChunkSending(UInt8 mark, char* data, size_t dataSize)
{ {

1
src/lib/client/ServerProxy.h
View File

@ -106,6 +106,7 @@ private:
void infoAcknowledgment(); void infoAcknowledgment();
void fileChunkReceived(); void fileChunkReceived();
void dragInfoReceived(); void dragInfoReceived();
void handleClipboardSendingEvent(const Event&, void*);
private: private:
typedef EResult (ServerProxy::*MessageParser)(const UInt8*); typedef EResult (ServerProxy::*MessageParser)(const UInt8*);