backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-07 22:23:12 +08:00
Code Issues Projects Releases Wiki Activity

#123 Made disable clipboard take effect on server

Browse Source
This commit is contained in:
Xinyu Hou
2016-09-15 16:19:10 -04:00
committed by Andrew Nelless
parent 9c0bac7c7d
commit 673829f511
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,6 +92,7 @@ Server::Server(
m_writeToDropDirThread(NULL),
m_ignoreFileTransfer(false),
m_enableDragDrop(enableDragDrop),
m_enableClipboard(true),
m_sendDragInfoThread(NULL),
m_waitDragInfoThread(true)
{
@@ -485,7 +486,7 @@ Server::switchScreen(BaseClientProxy* dst,
// update the primary client's clipboards if we're leaving the
// primary screen.
if (m_active == m_primaryClient) {
if (m_active == m_primaryClient && m_enableClipboard) {
for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
ClipboardInfo& clipboard = m_clipboards[id];
if (clipboard.m_clipboardOwner == getName(m_primaryClient)) {
@@ -506,9 +507,11 @@ Server::switchScreen(BaseClientProxy* dst,
m_primaryClient->getToggleMask(),
forScreensaver);
// send the clipboard data to new active screen
for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
m_active->setClipboard(id, &m_clipboards[id].m_clipboard);
if (m_enableClipboard) {
// send the clipboard data to new active screen
for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
m_active->setClipboard(id, &m_clipboards[id].m_clipboard);
}
}
Server::SwitchToScreenInfo* info =
@@ -1166,6 +1169,9 @@ Server::processOptions()
else if (id == kOptionRelativeMouseMoves) {
newRelativeMoves = (value != 0);
}
else if (id == kOptionClipboardSharing) {
m_enableClipboard = (value != 0);
}
}
if (m_relativeMoves && !newRelativeMoves) {
stopRelativeMoves();