|
|
@@ -104,7 +104,6 @@ MSWindowsScreen::MSWindowsScreen( |
|
|
m_xCenter(0), m_yCenter(0),
|
|
|
m_multimon(false),
|
|
|
m_xCursor(0), m_yCursor(0),
|
|
|
- m_xFractionalMove(0.0f), m_yFractionalMove(0.0f),
|
|
|
m_sequenceNumber(0),
|
|
|
m_mark(0),
|
|
|
m_markReceived(0),
|
|
|
@@ -570,21 +569,6 @@ void MSWindowsScreen::saveMousePosition(SInt32 x, SInt32 y) { |
|
|
LOG((CLOG_DEBUG5 "saved mouse position for next delta: %+d,%+d", x,y));
|
|
|
}
|
|
|
|
|
|
-void MSWindowsScreen::accumulateFractionalMove(float x, float y, SInt32& intX, SInt32& intY)
|
|
|
-{
|
|
|
- // Accumulate together the move into the running total
|
|
|
- m_xFractionalMove += x;
|
|
|
- m_yFractionalMove += y;
|
|
|
-
|
|
|
- // Return the integer part
|
|
|
- intX = (SInt32)m_xFractionalMove;
|
|
|
- intY = (SInt32)m_yFractionalMove;
|
|
|
-
|
|
|
- // And keep only the fractional part
|
|
|
- m_xFractionalMove -= intX;
|
|
|
- m_yFractionalMove -= intY;
|
|
|
-}
|
|
|
-
|
|
|
UInt32
|
|
|
MSWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask)
|
|
|
{
|
|
|
@@ -1365,8 +1349,8 @@ MSWindowsScreen::onMouseMove(SInt32 mx, SInt32 my) |
|
|
{
|
|
|
// compute motion delta (relative to the last known
|
|
|
// mouse position)
|
|
|
- float x = (float)mx - m_xCursor;
|
|
|
- float y = (float)my - m_yCursor;
|
|
|
+ SInt32 x = mx - m_xCursor;
|
|
|
+ SInt32 y = my - m_yCursor;
|
|
|
|
|
|
LOG((CLOG_DEBUG3
|
|
|
"mouse move - motion delta: %+d=(%+d - %+d),%+d=(%+d - %+d)",
|
|
|
@@ -1416,9 +1400,7 @@ MSWindowsScreen::onMouseMove(SInt32 mx, SInt32 my) |
|
|
}
|
|
|
else {
|
|
|
// send motion
|
|
|
- SInt32 ix, iy;
|
|
|
- accumulateFractionalMove(x, y, ix, iy);
|
|
|
- sendEvent(m_events->forIPrimaryScreen().motionOnSecondary(), MotionInfo::alloc(ix, iy));
|
|
|
+ sendEvent(m_events->forIPrimaryScreen().motionOnSecondary(), MotionInfo::alloc(x, y));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
0 comments on commit
c2372bc