From b52f2e0ca7069886bf322b9107279562b3f56551 Mon Sep 17 00:00:00 2001 From: Alistair Buxton Date: Wed, 6 Feb 2013 22:12:42 +0000 Subject: [PATCH 1/8] Bail out of packet eater if less than 4 bytes available. Without this, packlen will be initialized with undefined data. This causes "oversize packet" errors. --- src/micro/uSynergy.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/micro/uSynergy.c b/src/micro/uSynergy.c index a8d01da4..ffdf504c 100644 --- a/src/micro/uSynergy.c +++ b/src/micro/uSynergy.c @@ -514,6 +514,10 @@ static void sUpdateContext(uSynergyContext *context) /* Eat packets */ for (;;) { + /* If less than 4 bytes left in buffer, we can't even get the next packet length yet */ + if(context->m_receiveOfs < 4) + return; + /* Grab packet length and bail out if the packet goes beyond the end of the buffer */ packlen = sNetToNative32(context->m_receiveBuffer); if (packlen+4 > context->m_receiveOfs) From 2709ae48db3b25188dd1ee78b6526ed3234aa1ba Mon Sep 17 00:00:00 2001 From: Alistair Buxton Date: Thu, 7 Feb 2013 00:42:08 +0000 Subject: [PATCH 2/8] Implement DMRM message for relative mouse movement. --- src/micro/uSynergy.c | 22 +++++++++++++++++++++- src/micro/uSynergy.h | 14 ++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/micro/uSynergy.c b/src/micro/uSynergy.c index ffdf504c..dda97bc3 100644 --- a/src/micro/uSynergy.c +++ b/src/micro/uSynergy.c @@ -166,6 +166,21 @@ static void sSendMouseCallback(uSynergyContext *context) +/** +@brief Call mouse relative callback after a mouse event +**/ +static void sSendMouseRelativeCallback(uSynergyContext *context, int16_t x, int16_t y) +{ + // Skip if no callback is installed + if (context->m_mouseRelativeCallback == 0L) + return; + + // Send callback + context->m_mouseRelativeCallback(context->m_cookie, x, y); +} + + + /** @brief Send keyboard callback when a key has been pressed or released **/ @@ -319,6 +334,12 @@ static void sProcessMessage(uSynergyContext *context, const uint8_t *message) context->m_mouseY = sNetToNative16(message+10); sSendMouseCallback(context); } + else if (USYNERGY_IS_PACKET("DMRM")) + { + // Mouse relative. Reply with CNOP + // kMsgDMouseRelMove = "DMRM%2i%2i" + sSendMouseRelativeCallback(context, sNetToNative16(message+8), sNetToNative16(message+10)); + } else if (USYNERGY_IS_PACKET("DMWM")) { // Mouse wheel @@ -437,7 +458,6 @@ static void sProcessMessage(uSynergyContext *context, const uint8_t *message) // kMsgCScreenSaver = "CSEC%1i" // kMsgDKeyRepeat = "DKRP%2i%2i%2i%2i" // kMsgDKeyRepeat1_0 = "DKRP%2i%2i%2i" - // kMsgDMouseRelMove = "DMRM%2i%2i" // kMsgEIncompatible = "EICV%2i%2i" // kMsgEBusy = "EBSY" // kMsgEUnknown = "EUNK" diff --git a/src/micro/uSynergy.h b/src/micro/uSynergy.h index ef1efaa6..2de72bf6 100644 --- a/src/micro/uSynergy.h +++ b/src/micro/uSynergy.h @@ -255,6 +255,19 @@ typedef void (*uSynergyMouseCallback)(uSynergyCookie cookie, uint16_t x, uint16 +/** +@brief Mouse relative callback + +This callback is called when a mouse relative event happens. + +@param cookie Cookie supplied in the Synergy context +@param x Mouse X motion +@param y Mouse Y motion +**/ +typedef void (*uSynergyMouseRelativeCallback)(uSynergyCookie cookie, int16_t x, int16_t y); + + + /** @brief Key event callback @@ -332,6 +345,7 @@ typedef struct uSynergyTraceFunc m_traceFunc; /* Function for tracing status (can be NULL) */ uSynergyScreenActiveCallback m_screenActiveCallback; /* Callback for entering and leaving screen */ uSynergyMouseCallback m_mouseCallback; /* Callback for mouse events */ + uSynergyMouseRelativeCallback m_mouseRelativeCallback; /* Callback for mouse relative events */ uSynergyKeyboardCallback m_keyboardCallback; /* Callback for keyboard events */ uSynergyJoystickCallback m_joystickCallback; /* Callback for joystick events */ uSynergyClipboardCallback m_clipboardCallback; /* Callback for clipboard events */ From 07d56e8e03561714e877ac63ffcda8e7a8b85bee Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Wed, 22 Oct 2014 13:55:39 +0100 Subject: [PATCH 3/8] added branch name to package names now that buildbot builds branches, it'll be handy to see that branch name in the package name. --- ext/toolchain/commands1.py | 40 ++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 0540bcb4..8888b7bb 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -946,17 +946,32 @@ class InternalCommands: def getGitRevision(self): if sys.version_info < (2, 4): raise Exception("Python 2.4 or greater required.") - else: - p = subprocess.Popen( - ["git", "log", "--pretty=format:%h", "-n", "1"], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - - stdout, stderr = p.communicate() - - if p.returncode != 0: - raise Exception('Could not get revision - git info failed with code: ' + str(p.returncode)) - return stdout + p = subprocess.Popen( + ["git", "log", "--pretty=format:%h", "-n", "1"], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + stdout, stderr = p.communicate() + + if p.returncode != 0: + raise Exception('Could not get revision, git error: ' + str(p.returncode)) + + return stdout.strip() + + def getGitBranchName(self): + if sys.version_info < (2, 4): + raise Exception("Python 2.4 or greater required.") + + p = subprocess.Popen( + ["git", "rev-parse", "--abbrev-ref", "HEAD"], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + stdout, stderr = p.communicate() + + if p.returncode != 0: + raise Exception('Could not get branch name, git error: ' + str(p.returncode)) + + return stdout.strip() def find_revision_svn(self): if sys.version_info < (2, 4): @@ -1422,9 +1437,10 @@ class InternalCommands: def dist_name_rev(self, type): # find the version number (we're puting the rev in after this) pattern = '(.*\d+\.\d+\.\d+)(.*)' - replace = '\g<1>-' + self.find_revision() + '\g<2>' + replace = "\g<1>-%s@%s\g<2>" % ( + self.getGitBranchName(), self.getGitRevision()) return re.sub(pattern, replace, self.dist_name(type)) - + def dist_usage(self): print ('Usage: %s package [package-type]\n' '\n' From 5bd0139734e2694d0567d0effd9e284b158681a6 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Wed, 22 Oct 2014 14:06:15 +0100 Subject: [PATCH 4/8] fixed "hm dist src" command to support branches also allowed non-unix platforms to run src --- ext/toolchain/commands1.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 8888b7bb..04ac8c96 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -1019,10 +1019,7 @@ class InternalCommands: moveExt = '' if type == 'src': - if sys.platform in ['linux2', 'darwin']: - self.distSrc() - else: - package_unsupported = True + self.distSrc() elif type == 'rpm': if sys.platform == 'linux2': @@ -1206,11 +1203,15 @@ class InternalCommands: print "Removing existing export..." shutil.rmtree(exportPath) - print 'Exporting repository to: ' + exportPath os.mkdir(exportPath) - err = os.system('git archive master | tar -x -C ' + exportPath) + + cmd = "git archive %s | tar -x -C %s" % ( + self.getGitBranchName(), exportPath) + + print 'Exporting repository to: ' + exportPath + err = os.system(cmd) if err != 0: - raise Exception('Repository export failed: ' + str(err)) + raise Exception('Repository export failed: ' + str(err)) packagePath = '../' + self.getGenerator().binDir + '/' + name + '.tar.gz' From 1c1f0e70f2c34e22deaa178069265261553811f8 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Wed, 22 Oct 2014 14:56:57 +0100 Subject: [PATCH 5/8] changed @ to - in package name --- ext/toolchain/commands1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 04ac8c96..1eee3a41 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -1438,7 +1438,7 @@ class InternalCommands: def dist_name_rev(self, type): # find the version number (we're puting the rev in after this) pattern = '(.*\d+\.\d+\.\d+)(.*)' - replace = "\g<1>-%s@%s\g<2>" % ( + replace = "\g<1>-%s-%s\g<2>" % ( self.getGitBranchName(), self.getGitRevision()) return re.sub(pattern, replace, self.dist_name(type)) From e786dbd60f02ded553181085b497d9ca2619be9d Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Wed, 22 Oct 2014 17:04:20 +0100 Subject: [PATCH 6/8] fixed code style --- src/micro/uSynergy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/micro/uSynergy.c b/src/micro/uSynergy.c index dda97bc3..439b917a 100644 --- a/src/micro/uSynergy.c +++ b/src/micro/uSynergy.c @@ -338,7 +338,8 @@ static void sProcessMessage(uSynergyContext *context, const uint8_t *message) { // Mouse relative. Reply with CNOP // kMsgDMouseRelMove = "DMRM%2i%2i" - sSendMouseRelativeCallback(context, sNetToNative16(message+8), sNetToNative16(message+10)); + sSendMouseRelativeCallback(context, sNetToNative16(message+8), + sNetToNative16(message+10)); } else if (USYNERGY_IS_PACKET("DMWM")) { @@ -535,7 +536,7 @@ static void sUpdateContext(uSynergyContext *context) for (;;) { /* If less than 4 bytes left in buffer, we can't even get the next packet length yet */ - if(context->m_receiveOfs < 4) + if (context->m_receiveOfs < 4) return; /* Grab packet length and bail out if the packet goes beyond the end of the buffer */ From e3d57af4fdc692cd1e5bed194db7676cfea02d01 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 15 Oct 2014 19:00:30 -0700 Subject: [PATCH 7/8] Add support for building with 64-bit architectures on OS X. This patch brings full 64-bit compatibility to Synergy on OS X by replacing all obsolete 32-bit only Carbon functions with modern equivalents. All functions introduced have been available since 10.4 so this won't affect the minimum deployment target. Specifically: Creating an empty CGEvent and getting its location is behaviourally identical to GetGlobalMouse, and yes, both are in flipped coordinates. This was tested with a multi-monitor configuration as well. TrackMouseLocationWithOptions is behaviourally identical to GetGlobalMouse in these cases because the timeout was 0 and none of the other out params were used, except for the MouseTrackingResult in one call was checked against kMouseTrackingTimedOut. Since the timeout was 0 and not kEventDurationForever, that value never could have been returned anyway. Instead of attempting to define SIntXX and UIntXX manually, MacTypes.h is included on OS X. These types were wrong in 64-bit mode because of this, causing type redefinition errors. --- CMakeLists.txt | 11 +++--- src/lib/common/basic_types.h | 4 +++ src/lib/platform/OSXScreen.cpp | 55 ++++++++++++++++------------- src/lib/platform/OSXScreenSaver.cpp | 2 +- src/lib/synergy/DaemonApp.cpp | 4 +-- 5 files changed, 44 insertions(+), 32 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dca34f3..7c0eaaf2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,14 +165,17 @@ if (UNIX) string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) message(STATUS "DARWIN_VERSION=${DARWIN_VERSION}") if (DARWIN_VERSION LESS 9) - # 10.4: universal (32-bit intel and power pc) + # 10.4: Universal (32-bit Intel and PowerPC) set(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "" FORCE) - else() - # 10.5+: 32-bit only -- missing funcs in 64-bit os libs - # such as GetGlobalMouse. + else (DARWIN_VERSION LESS 10) + # 10.5: 32-bit Intel only set(CMAKE_OSX_ARCHITECTURES "i386" CACHE STRING "" FORCE) + else() + # 10.6+: Intel only + set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" + CACHE STRING "" FORCE) endif() set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1") diff --git a/src/lib/common/basic_types.h b/src/lib/common/basic_types.h index 7f20cb5a..b2aa999d 100644 --- a/src/lib/common/basic_types.h +++ b/src/lib/common/basic_types.h @@ -72,6 +72,9 @@ // Added this because it doesn't compile on OS X 10.6 because they are already defined in Carbon #if !defined(__MACTYPES__) +#if defined(__APPLE__) +#include +#else typedef signed TYPE_OF_SIZE_1 SInt8; typedef signed TYPE_OF_SIZE_2 SInt16; typedef signed TYPE_OF_SIZE_4 SInt32; @@ -79,6 +82,7 @@ typedef unsigned TYPE_OF_SIZE_1 UInt8; typedef unsigned TYPE_OF_SIZE_2 UInt16; typedef unsigned TYPE_OF_SIZE_4 UInt32; #endif +#endif // // clean up // diff --git a/src/lib/platform/OSXScreen.cpp b/src/lib/platform/OSXScreen.cpp index 47e5af8e..fd2ceea9 100644 --- a/src/lib/platform/OSXScreen.cpp +++ b/src/lib/platform/OSXScreen.cpp @@ -296,13 +296,14 @@ COSXScreen::getShape(SInt32& x, SInt32& y, SInt32& w, SInt32& h) const void COSXScreen::getCursorPos(SInt32& x, SInt32& y) const { - Point mouse; - GetGlobalMouse(&mouse); - x = mouse.h; - y = mouse.v; + CGEventRef event = CGEventCreate(NULL); + CGPoint mouse = CGEventGetLocation(event); + x = mouse.x; + y = mouse.y; m_cursorPosValid = true; m_xCursor = x; m_yCursor = y; + CFRelease(event); } void @@ -700,15 +701,16 @@ COSXScreen::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const // we can do. // get current position - Point oldPos; - GetGlobalMouse(&oldPos); + CGEventRef event = CGEventCreate(NULL); + CGPoint oldPos = CGEventGetLocation(event); + CFRelease(event); // synthesize event CGPoint pos; - m_xCursor = static_cast(oldPos.h); - m_yCursor = static_cast(oldPos.v); - pos.x = oldPos.h + dx; - pos.y = oldPos.v + dy; + m_xCursor = static_cast(oldPos.x); + m_yCursor = static_cast(oldPos.y); + pos.x = oldPos.x + dx; + pos.y = oldPos.y + dy; postMouseEvent(pos); // we now assume we don't know the current cursor position @@ -1056,7 +1058,7 @@ COSXScreen::handleSystemEvent(const CEvent& event, void*) // get scroll amount r = GetEventParameter(*carbonEvent, kSynergyMouseScrollAxisX, - typeLongInteger, + typeSInt32, NULL, sizeof(xScroll), NULL, @@ -1066,7 +1068,7 @@ COSXScreen::handleSystemEvent(const CEvent& event, void*) } r = GetEventParameter(*carbonEvent, kSynergyMouseScrollAxisY, - typeLongInteger, + typeSInt32, NULL, sizeof(yScroll), NULL, @@ -1094,7 +1096,10 @@ COSXScreen::handleSystemEvent(const CEvent& event, void*) break; case kEventClassWindow: - SendEventToWindow(*carbonEvent, m_userInputWindow); + // 2nd param was formerly GetWindowEventTarget(m_userInputWindow) which is 32-bit only, + // however as m_userInputWindow is never initialized to anything we can take advantage of + // the fact that GetWindowEventTarget(NULL) == NULL + SendEventToEventTarget(*carbonEvent, NULL); switch (GetEventKind(*carbonEvent)) { case kEventWindowActivated: LOG((CLOG_DEBUG1 "window activated")); @@ -1518,15 +1523,16 @@ COSXScreen::getScrollSpeedFactor() const void COSXScreen::enableDragTimer(bool enable) { - UInt32 modifiers; - MouseTrackingResult res; - if (enable && m_dragTimer == NULL) { m_dragTimer = m_events->newTimer(0.01, NULL); m_events->adoptHandler(CEvent::kTimer, m_dragTimer, new TMethodEventJob(this, &COSXScreen::handleDrag)); - TrackMouseLocationWithOptions(NULL, 0, 0, &m_dragLastPoint, &modifiers, &res); + CGEventRef event = CGEventCreate(NULL); + CGPoint mouse = CGEventGetLocation(event); + m_dragLastPoint.h = (short)mouse.x; + m_dragLastPoint.v = (short)mouse.y; + CFRelease(event); } else if (!enable && m_dragTimer != NULL) { m_events->removeHandler(CEvent::kTimer, m_dragTimer); @@ -1538,15 +1544,14 @@ COSXScreen::enableDragTimer(bool enable) void COSXScreen::handleDrag(const CEvent&, void*) { - Point p; - UInt32 modifiers; - MouseTrackingResult res; + CGEventRef event = CGEventCreate(NULL); + CGPoint p = CGEventGetLocation(event); + CFRelease(event); - TrackMouseLocationWithOptions(NULL, 0, 0, &p, &modifiers, &res); - - if (res != kMouseTrackingTimedOut && (p.h != m_dragLastPoint.h || p.v != m_dragLastPoint.v)) { - m_dragLastPoint = p; - onMouseMove((SInt32)p.h, (SInt32)p.v); + if ((short)p.x != m_dragLastPoint.h || (short)p.y != m_dragLastPoint.v) { + m_dragLastPoint.h = (short)p.x; + m_dragLastPoint.v = (short)p.y; + onMouseMove((SInt32)p.x, (SInt32)p.y); } } diff --git a/src/lib/platform/OSXScreenSaver.cpp b/src/lib/platform/OSXScreenSaver.cpp index 8ae9dc5c..c393077f 100644 --- a/src/lib/platform/OSXScreenSaver.cpp +++ b/src/lib/platform/OSXScreenSaver.cpp @@ -142,7 +142,7 @@ COSXScreenSaver::launchTerminationCallback( OSStatus result; ProcessSerialNumber psn; EventParamType actualType; - UInt32 actualSize; + ByteCount actualSize; result = GetEventParameter(theEvent, kEventParamProcessID, typeProcessSerialNumber, &actualType, diff --git a/src/lib/synergy/DaemonApp.cpp b/src/lib/synergy/DaemonApp.cpp index e8e8007b..aa03ee32 100644 --- a/src/lib/synergy/DaemonApp.cpp +++ b/src/lib/synergy/DaemonApp.cpp @@ -302,9 +302,9 @@ CDaemonApp::handleIpcMessage(const CEvent& e, void*) LOG((CLOG_DEBUG "new command, elevate=%d command=%s", cm->elevate(), command.c_str())); CString debugArg("--debug"); - UInt32 debugArgPos = static_cast(command.find(debugArg)); + size_t debugArgPos = command.find(debugArg); if (debugArgPos != CString::npos) { - UInt32 from = debugArgPos + static_cast(debugArg.size()) + 1; + UInt32 from = static_cast(debugArgPos) + static_cast(debugArg.size()) + 1; UInt32 nextSpace = static_cast(command.find(" ", from)); CString logLevel(command.substr(from, nextSpace - from)); From 67f17a0fda6e08554c88a8784d1782fc8040fac1 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Wed, 15 Oct 2014 18:56:37 -0700 Subject: [PATCH 8/8] Fix SDK detection to work with modern versions of Xcode. This finds the the OS X SDK directory by using xcrun and known fallbacks; users shouldn't be symlinking /Developer. --- ext/toolchain/commands1.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 1eee3a41..5374bcd2 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -554,7 +554,24 @@ class InternalCommands: return (major, minor, rev) def getMacSdkDir(self): - return "/Developer/SDKs/MacOSX" + self.macSdk + ".sdk" + sdkName = "macosx" + self.macSdk + + # Ideally we'll use xcrun (which is influenced by $DEVELOPER_DIR), then try a couple + # fallbacks to known paths if xcrun is not available + status, sdkPath = commands.getstatusoutput("xcrun --show-sdk-path --sdk " + sdkName) + if status == 0 and sdkPath: + return sdkPath + + developerDir = os.getenv("DEVELOPER_DIR") + if not developerDir: + developerDir = "/Applications/Xcode.app/Contents/Developer" + + sdkDirName = sdkName.replace("macosx", "MacOSX") + sdkPath = developerDir + "/Platforms/MacOSX.platform/Developer/SDKs/" + sdkDirName + ".sdk" + if os.path.exists(sdkPath): + return sdkPath + + return "/Developer/SDKs/" + sdkDirName + ".sdk" # http://tinyurl.com/cs2rxxb def fixCmakeEclipseBug(self):