From 3095826f0a85e411ff1f469df84d0e78e9ceb37e Mon Sep 17 00:00:00 2001
From: tehwan <tehwan@gmail.com>
Date: Fri, 21 Jan 2011 17:28:19 +0000
Subject: [PATCH] 1.3 merge r871:872 into trunk and 1.4

---
 lib/server/CServer.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/server/CServer.cpp b/lib/server/CServer.cpp
index ae26bdaf..45dfb632 100644
--- a/lib/server/CServer.cpp
+++ b/lib/server/CServer.cpp
@@ -169,6 +169,14 @@ CServer::CServer(const CConfig& config, CPrimaryClient* primaryClient) :
 	// enable primary client
 	m_primaryClient->enable();
 	m_inputFilter->setPrimaryClient(m_primaryClient);
+
+	// Determine if scroll lock is already set. If so, lock the cursor to the primary screen
+	int keyValue = m_primaryClient->getToggleMask ();
+	if (m_primaryClient->getToggleMask () & KeyModifierScrollLock) {
+		LOG((CLOG_DEBUG "scroll lock on initially. locked to screen"));
+		m_lockedToScreen = true;
+	}
+
 }
 
 CServer::~CServer()