#6346 Make server bypass lock to screen if it's disable from config option

# Conflicts:
#	src/lib/server/Server.cpp
#	src/lib/server/Server.h
This commit is contained in:
XinyuHou
2016-11-24 12:22:39 +00:00
committed by Nick Bolton
parent 535627c871
commit 84dfeec2ed
4 changed files with 16 additions and 1 deletions

View File

@ -92,6 +92,7 @@ Server::Server(
m_sendFileThread(NULL),
m_writeToDropDirThread(NULL),
m_ignoreFileTransfer(false),
m_disableLockToScreen(false),
m_enableClipboard(true),
m_sendDragInfoThread(NULL),
m_waitDragInfoThread(true),
@ -421,6 +422,10 @@ Server::isLockedToScreenServer() const
bool
Server::isLockedToScreen() const
{
if (m_disableLockToScreen) {
return false;
}
// locked if we say we're locked
if (isLockedToScreenServer()) {
LOG((CLOG_NOTE "Cursor is locked to screen, check Scroll Lock key"));
@ -1177,6 +1182,9 @@ Server::processOptions()
else if (id == kOptionRelativeMouseMoves) {
newRelativeMoves = (value != 0);
}
else if (id == kOptionDisableLockToScreen) {
m_disableLockToScreen = true;
}
else if (id == kOptionClipboardSharing) {
m_enableClipboard = (value != 0);