smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(mac): preserve mouse event numbers when dragging on macOS 27

Browse source
This commit is contained in:
ZeroSegFault 2026-07-21 11:20:00 +10:00 committed by Nick Bolton
parent 831f9cb044
commit 0d7414d89a
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lib/platform/OSXScreen.mm
View file

@ -61,6 +61,12 @@ enum
static const double kCarbonLoopWaitTimeout = 10.0; static const double kCarbonLoopWaitTimeout = 10.0;
// Synthetic mouse button and drag events require event numbers on macOS 27 and later.
static inline bool needsEventNumber()
{
return NSProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 27;
}
int getSecureInputEventPID(); int getSecureInputEventPID();
std::string getProcessName(int pid); std::string getProcessName(int pid);
@ -463,6 +469,10 @@ void OSXScreen::postMouseEvent(CGPoint &pos) const
CGEventRef event = CGEventCreateMouseEvent(nullptr, type, pos, static_cast<CGMouseButton>(button)); CGEventRef event = CGEventCreateMouseEvent(nullptr, type, pos, static_cast<CGMouseButton>(button));
if (button != -1 && needsEventNumber()) {
CGEventSetIntegerValueField(event, kCGMouseEventNumber, m_mouseEventNumber);
}
// Dragging events also need the click state // Dragging events also need the click state
CGEventSetIntegerValueField(event, kCGMouseEventClickState, m_clickState); CGEventSetIntegerValueField(event, kCGMouseEventClickState, m_clickState);
@ -547,8 +557,7 @@ void OSXScreen::fakeMouseButton(ButtonID id, bool press)
CGEventRef event = CGEventCreateMouseEvent(nullptr, type, pos, static_cast<CGMouseButton>(index)); CGEventRef event = CGEventCreateMouseEvent(nullptr, type, pos, static_cast<CGMouseButton>(index));
if (NSProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 27) { if (needsEventNumber()) {
// Apps that use Carbon APIs on macOS 27 requires an incrementing event number for each synthetic click
if (press) { if (press) {
if (m_mouseEventNumber == 0) { if (m_mouseEventNumber == 0) {
// For some unknown reason, the first click event number must be unique and greater (but in the same ballpark) // For some unknown reason, the first click event number must be unique and greater (but in the same ballpark)