From 59c5e4bf13f7f7418d91df4be18236ee884d2991 Mon Sep 17 00:00:00 2001 From: crs Date: Wed, 1 May 2002 14:36:52 +0000 Subject: [PATCH] Fixed uninitialized variable when computing toggle mask. Also reduced priority of some mouse motion log messages. --- server/CServer.cpp | 4 ++-- server/CXWindowsPrimaryScreen.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/CServer.cpp b/server/CServer.cpp index aaea5f20..2718f36b 100644 --- a/server/CServer.cpp +++ b/server/CServer.cpp @@ -391,7 +391,7 @@ bool CServer::onMouseMovePrimary(SInt32 x, SInt32 y) 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 assert(m_active != NULL); @@ -465,7 +465,7 @@ void CServer::onMouseMoveSecondary(SInt32 dx, SInt32 dy) if (newScreen == NULL || newScreen == m_active) { // do nothing if mouse didn't move 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); } } diff --git a/server/CXWindowsPrimaryScreen.cpp b/server/CXWindowsPrimaryScreen.cpp index bff3596b..35b7014e 100644 --- a/server/CXWindowsPrimaryScreen.cpp +++ b/server/CXWindowsPrimaryScreen.cpp @@ -334,7 +334,7 @@ void CXWindowsPrimaryScreen::warpCursorNoLock( // warp the mouse XWarpPointer(display, None, getRoot(), 0, 0, 0, 0, x, y); 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 XEvent xevent; @@ -386,7 +386,7 @@ KeyModifierMask CXWindowsPrimaryScreen::getToggleMask() const return 0; // convert to KeyModifierMask - KeyModifierMask mask; + KeyModifierMask mask = 0; if (state & m_numLockMask) mask |= KeyModifierNumLock; if (state & m_capsLockMask)