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

#6344 Make server recognise clipboard size limit

This commit is contained in:
Andrew Nelless 2017-01-24 16:11:43 +00:00 committed by Nick Bolton
parent 7e7760668a
commit 01109e0499
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/server/Server.cpp
View File

@ -94,6 +94,7 @@ Server::Server(
m_ignoreFileTransfer(false), m_ignoreFileTransfer(false),
m_disableLockToScreen(false), m_disableLockToScreen(false),
m_enableClipboard(true), m_enableClipboard(true),
m_maximumClipboardSize(INT32_MAX),
m_sendDragInfoThread(NULL), m_sendDragInfoThread(NULL),
m_waitDragInfoThread(true), m_waitDragInfoThread(true),
m_args(args) m_args(args)
@ -1186,12 +1187,20 @@ Server::processOptions()
m_disableLockToScreen = (value != 0); m_disableLockToScreen = (value != 0);
} }
else if (id == kOptionClipboardSharing) { else if (id == kOptionClipboardSharing) {
m_enableClipboard = (value != 0); m_enableClipboard = value;
if (!m_enableClipboard) {
if (m_enableClipboard == false) {
LOG((CLOG_NOTE "clipboard sharing is disabled")); LOG((CLOG_NOTE "clipboard sharing is disabled"));
} }
} }
else if (id == kOptionClipboardSharingSize) {
if (value <= 0) {
m_maximumClipboardSize = 0;
LOG((CLOG_NOTE "clipboard sharing is disabled because the "
"maximum shared clipboard size is set to 0"));
} else {
m_maximumClipboardSize = static_cast<size_t>(value);
}
}
} }
if (m_relativeMoves && !newRelativeMoves) { if (m_relativeMoves && !newRelativeMoves) {
stopRelativeMoves(); stopRelativeMoves();
@ -1235,7 +1244,7 @@ Server::handleShapeChanged(const Event&, void* vclient)
void void
Server::handleClipboardGrabbed(const Event& event, void* vclient) Server::handleClipboardGrabbed(const Event& event, void* vclient)
{ {
if (!m_enableClipboard) { if (!m_enableClipboard || (m_maximumClipboardSize == 0)) {
return; return;
} }

1
src/lib/server/Server.h
View File

@ -475,6 +475,7 @@ private:
bool m_ignoreFileTransfer; bool m_ignoreFileTransfer;
bool m_disableLockToScreen; bool m_disableLockToScreen;
bool m_enableClipboard; bool m_enableClipboard;
size_t m_maximumClipboardSize;
Thread* m_sendDragInfoThread; Thread* m_sendDragInfoThread;
bool m_waitDragInfoThread; bool m_waitDragInfoThread;