rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Relative mouse motion for OS X.

This commit is contained in:
crs 2004-05-02 16:13:11 +00:00
parent a1bd77f91a
commit 500362d5c0
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/platform/COSXScreen.cpp
View File

@ -29,6 +29,7 @@
COSXScreen::COSXScreen(bool isPrimary) : COSXScreen::COSXScreen(bool isPrimary) :
m_isPrimary(isPrimary), m_isPrimary(isPrimary),
m_isOnScreen(m_isPrimary), m_isOnScreen(m_isPrimary),
m_cursorPosValid(false),
m_cursorHidden(false), m_cursorHidden(false),
m_keyState(NULL), m_keyState(NULL),
m_sequenceNumber(0), m_sequenceNumber(0),
@ -94,8 +95,11 @@ COSXScreen::getCursorPos(SInt32& x, SInt32& y) const
{ {
Point mouse; Point mouse;
GetGlobalMouse(&mouse); GetGlobalMouse(&mouse);
x = mouse.h; x = mouse.h;
y = mouse.v; y = mouse.v;
m_cursorPosValid = true;
m_xCursor = x;
m_yCursor = y;
} }
void void
@ -115,8 +119,9 @@ COSXScreen::warpCursor(SInt32 x, SInt32 y)
CGWarpMouseCursorPosition(pos); CGWarpMouseCursorPosition(pos);
// save new cursor position // save new cursor position
m_xCursor = x; m_xCursor = x;
m_yCursor = y; m_yCursor = y;
m_cursorPosValid = true;
} }
SInt32 SInt32
@ -157,6 +162,10 @@ COSXScreen::fakeMouseButton(ButtonID id, bool press) const
// use this API and if we want to support more buttons we have // use this API and if we want to support more buttons we have
// to recompile. // to recompile.
CGPoint pos; CGPoint pos;
if (!m_cursorPosValid) {
SInt32 x, y;
getCursorPos(x, y);
}
pos.x = m_xCursor; pos.x = m_xCursor;
pos.y = m_yCursor; pos.y = m_yCursor;
CGPostMouseEvent(pos, false, sizeof(m_buttons) / sizeof(m_buttons[0]), CGPostMouseEvent(pos, false, sizeof(m_buttons) / sizeof(m_buttons[0]),
@ -178,8 +187,32 @@ COSXScreen::fakeMouseMove(SInt32 x, SInt32 y) const
CGPostMouseEvent(pos, true, 0, m_buttons[0]); CGPostMouseEvent(pos, true, 0, m_buttons[0]);
// save new cursor position // save new cursor position
m_xCursor = x; m_xCursor = x;
m_yCursor = y; m_yCursor = y;
m_cursorPosValid = true;
}
void
COSXScreen::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const
{
// OS X does not appear to have a fake relative mouse move function.
// simulate it by getting the current mouse position and adding to
// that. this can yield the wrong answer but there's not much else
// we can do.
// get current position
Point oldPos;
GetGlobalMouse(&oldPos);
// synthesize event
CGPoint pos;
pos.x = oldPos.h + dx;
pos.y = oldPos.v + dy;
// FIXME -- is it okay to pass no buttons here?
CGPostMouseEvent(pos, true, 0, m_buttons[0]);
// we now assume we don't know the current cursor position
m_cursorPosValid = false;
} }
void void

2
lib/platform/COSXScreen.h
View File

@ -50,6 +50,7 @@ public:
// ISecondaryScreen overrides // ISecondaryScreen overrides
virtual void fakeMouseButton(ButtonID id, bool press) const; virtual void fakeMouseButton(ButtonID id, bool press) const;
virtual void fakeMouseMove(SInt32 x, SInt32 y) const; virtual void fakeMouseMove(SInt32 x, SInt32 y) const;
virtual void fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const;
virtual void fakeMouseWheel(SInt32 delta) const; virtual void fakeMouseWheel(SInt32 delta) const;
// IPlatformScreen overrides // IPlatformScreen overrides
@ -93,6 +94,7 @@ private:
// mouse state // mouse state
mutable SInt32 m_xCursor, m_yCursor; mutable SInt32 m_xCursor, m_yCursor;
mutable bool m_cursorPosValid;
mutable boolean_t m_buttons[5]; mutable boolean_t m_buttons[5];
bool m_cursorHidden; bool m_cursorHidden;