Fixed uninitialized variable when computing toggle mask. Also
reduced priority of some mouse motion log messages.
This commit is contained in:
parent
c8737de4ad
commit
59c5e4bf13
|
@ -391,7 +391,7 @@ bool CServer::onMouseMovePrimary(SInt32 x, SInt32 y)
|
||||||
|
|
||||||
void CServer::onMouseMoveSecondary(SInt32 dx, SInt32 dy)
|
void CServer::onMouseMoveSecondary(SInt32 dx, SInt32 dy)
|
||||||
{
|
{
|
||||||
log((CLOG_DEBUG1 "onMouseMoveSecondary %+d,%+d", dx, dy));
|
log((CLOG_DEBUG2 "onMouseMoveSecondary %+d,%+d", dx, dy));
|
||||||
|
|
||||||
// mouse move on secondary (client's) screen
|
// mouse move on secondary (client's) screen
|
||||||
assert(m_active != NULL);
|
assert(m_active != NULL);
|
||||||
|
@ -465,7 +465,7 @@ void CServer::onMouseMoveSecondary(SInt32 dx, SInt32 dy)
|
||||||
if (newScreen == NULL || newScreen == m_active) {
|
if (newScreen == NULL || newScreen == m_active) {
|
||||||
// do nothing if mouse didn't move
|
// do nothing if mouse didn't move
|
||||||
if (m_x != xOld || m_y != yOld) {
|
if (m_x != xOld || m_y != yOld) {
|
||||||
log((CLOG_DEBUG1 "move on %s to %d,%d", m_active->m_name.c_str(), m_x, m_y));
|
log((CLOG_DEBUG2 "move on %s to %d,%d", m_active->m_name.c_str(), m_x, m_y));
|
||||||
m_active->m_protocol->sendMouseMove(m_x, m_y);
|
m_active->m_protocol->sendMouseMove(m_x, m_y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -334,7 +334,7 @@ void CXWindowsPrimaryScreen::warpCursorNoLock(
|
||||||
// warp the mouse
|
// warp the mouse
|
||||||
XWarpPointer(display, None, getRoot(), 0, 0, 0, 0, x, y);
|
XWarpPointer(display, None, getRoot(), 0, 0, 0, 0, x, y);
|
||||||
XSync(display, False);
|
XSync(display, False);
|
||||||
log((CLOG_DEBUG1 "warped to %d,%d", x, y));
|
log((CLOG_DEBUG2 "warped to %d,%d", x, y));
|
||||||
|
|
||||||
// discard mouse events since we just added one we don't want
|
// discard mouse events since we just added one we don't want
|
||||||
XEvent xevent;
|
XEvent xevent;
|
||||||
|
@ -386,7 +386,7 @@ KeyModifierMask CXWindowsPrimaryScreen::getToggleMask() const
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
// convert to KeyModifierMask
|
// convert to KeyModifierMask
|
||||||
KeyModifierMask mask;
|
KeyModifierMask mask = 0;
|
||||||
if (state & m_numLockMask)
|
if (state & m_numLockMask)
|
||||||
mask |= KeyModifierNumLock;
|
mask |= KeyModifierNumLock;
|
||||||
if (state & m_capsLockMask)
|
if (state & m_capsLockMask)
|
||||||
|
|
Loading…
Reference in New Issue