Skip to content

Commit

Permalink
Merged mouse drift fix from synergy-core (#424)
Browse files Browse the repository at this point in the history
Merged mouse drift fix from synergy-core
  • Loading branch information
AdrianKoshka committed Sep 3, 2019
2 parents 4dddbb5 + 69a65e4 commit 0ed18c6
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/lib/platform/OSXScreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class OSXScreen : public PlatformScreen {
void sendClipboardEvent(Event::Type type, ClipboardID id) const;

// message handlers
bool onMouseMove(SInt32 mx, SInt32 my);
bool onMouseMove(CGFloat mx, CGFloat my);
// mouse button handler. pressed is true if this is a mousedown
// event, false if it is a mouseup event. macButton is the index
// of the button pressed using the mac button mapping.
Expand Down
28 changes: 21 additions & 7 deletions src/lib/platform/OSXScreen.mm
Original file line number Diff line number Diff line change
Expand Up @@ -1077,20 +1077,20 @@
}

bool
OSXScreen::onMouseMove(SInt32 mx, SInt32 my)
OSXScreen::onMouseMove(CGFloat mx, CGFloat my)
{
LOG((CLOG_DEBUG2 "mouse move %+d,%+d", mx, my));
LOG((CLOG_DEBUG2 "mouse move %+f,%+f", mx, my));

SInt32 x = mx - m_xCursor;
SInt32 y = my - m_yCursor;
CGFloat x = mx - m_xCursor;
CGFloat y = my - m_yCursor;

if ((x == 0 && y == 0) || (mx == m_xCenter && mx == m_yCenter)) {
return true;
}

// save position to compute delta of next motion
m_xCursor = mx;
m_yCursor = my;
m_xCursor = (SInt32)mx;
m_yCursor = (SInt32)my;

if (m_isOnScreen) {
// motion on primary screen
Expand Down Expand Up @@ -1119,7 +1119,21 @@
}
else {
// send motion
sendEvent(m_events->forIPrimaryScreen().motionOnSecondary(), MotionInfo::alloc(x, y));
// Accumulate together the move into the running total
static CGFloat m_xFractionalMove = 0;
static CGFloat m_yFractionalMove = 0;

m_xFractionalMove += x;
m_yFractionalMove += y;

// Return the integer part
SInt32 intX = (SInt32)m_xFractionalMove;
SInt32 intY = (SInt32)m_yFractionalMove;

// And keep only the fractional part
m_xFractionalMove -= intX;
m_yFractionalMove -= intY;
sendEvent(m_events->forIPrimaryScreen().motionOnSecondary(), MotionInfo::alloc(intX, intY));
}
}

Expand Down

0 comments on commit 0ed18c6

Please sign in to comment.