backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-16 11:01:53 +08:00
Code Issues Projects Releases Wiki Activity

#4768 Interrupted both clipboards

Browse Source
This commit is contained in:
Jerry (Xinyu Hou)
2016-07-05 12:30:08 +01:00
parent 518fc7a676
commit 1a76acd446
6 changed files with 67 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/lib/synergy/StreamChunker.cpp
View File

@@ -17,6 +17,8 @@
#include "synergy/StreamChunker.h"
#include "mt/Lock.h"
#include "mt/Mutex.h"
#include "synergy/FileChunk.h"
#include "synergy/ClipboardChunk.h"
#include "synergy/protocol_types.h"
@@ -43,7 +45,7 @@ bool StreamChunker::s_isChunkingClipboard = false;
bool StreamChunker::s_interruptClipboard = false;
bool StreamChunker::s_isChunkingFile = false;
bool StreamChunker::s_interruptFile = false;
Mutex* StreamChunker::s_interruptMutex = NULL;
void
StreamChunker::sendFile(
@@ -144,10 +146,15 @@ StreamChunker::sendClipboard(
sendStopwatch.start();
while (true) {
if (s_interruptClipboard) {
s_interruptClipboard = false;
LOG((CLOG_DEBUG "clipboard transmission interrupted"));
break;
{
if (s_interruptMutex == NULL) {
s_interruptMutex = new Mutex();
}
Lock lock(s_interruptMutex);
if (s_interruptClipboard) {
LOG((CLOG_DEBUG "clipboard transmission interrupted"));
break;
}
}
if (sendStopwatch.getTime() > SEND_THRESHOLD) {
@@ -177,6 +184,8 @@ StreamChunker::sendClipboard(
events->addEvent(Event(events->forClipboard().clipboardSending(), eventTarget, end));
LOG((CLOG_DEBUG "sent clipboard size=%d", sentLength));
s_isChunkingClipboard = false;
}
@@ -201,10 +210,24 @@ StreamChunker::interruptFile()
}
void
StreamChunker::interruptClipboard()
StreamChunker::setClipboardInterrupt(bool interrupt)
{
if (s_isChunkingClipboard) {
s_interruptClipboard = true;
LOG((CLOG_INFO "previous clipboard data has become invalid"));
if (s_interruptMutex == NULL) {
s_interruptMutex = new Mutex();
}
Lock lock(s_interruptMutex);
if (interrupt) {
if (s_isChunkingClipboard) {
s_interruptClipboard = interrupt;
LOG((CLOG_INFO "previous clipboard data has become invalid"));
}
else {
LOG((CLOG_DEBUG "no clipboard to interrupt"));
}
}
else {
s_interruptClipboard = interrupt;
LOG((CLOG_DEBUG "reset clipboard interrupt"));
}
}