1.3 merge r871:872 into trunk and 1.4
This commit is contained in:
parent
bac6e971e3
commit
3095826f0a
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue