Commit Graph

817 Commits

Author SHA1 Message Date
Jake Petroules fed63422a6 Fix typo causing 64-bit binaries to be excluded on OS X 10.6+. 2014-10-23 08:19:00 -07:00
Xinyu Hou e707b426cf Ignore Qt Creator user's settings file 2014-10-23 13:22:51 +01:00
Xinyu Hou 5c6eba8790 Merged argsParse to master 2014-10-23 13:21:41 +01:00
Xinyu Hou 561d1c6993 Version to 1.6.1 2014-10-23 12:39:28 +01:00
Nick Bolton c364befde2 Merge branch 'petroules-64bit' 2014-10-23 12:36:32 +01:00
Xinyu Hou a32cb41342 Parse arg refactoring #4124
Used argParser in DaemonApp.
2014-10-23 12:09:09 +01:00
Xinyu Hou a71ebc78b3 Parse arg refactoring #4124
Fixed compile error on Linux
2014-10-23 11:37:59 +01:00
Xinyu Hou 943a355359 Parse arg refactoring #4124
Used argParser to parse arguments and removed the old code
2014-10-23 11:30:51 +01:00
Nick Bolton a7a0b0021d Only build 64-bit for OS X 10.6 and above #4126
@jakepetroules: Looks like we use ScreenSaver.framework which is not
available in 64-bit until OS X 10.6
(https://developer.apple.com/library/mac/documentation/UserExperience/Reference/ScreenSaver/ObjC_classic/index.html#//apple_ref/doc/uid/20001822).
I've changed the CMake configuration to only build 64-bit for OS X 10.6
and above. Hopefully everything should work now - try it out!
2014-10-23 10:00:11 +01:00
Jake Petroules 67f17a0fda 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.
2014-10-23 01:13:33 -07:00
Jake Petroules e3d57af4fd 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.
2014-10-23 01:13:33 -07:00
Nick Bolton e786dbd60f fixed code style 2014-10-22 17:04:20 +01:00
Xinyu Hou e26ccfdce6 Parse arg refactoring #4124
Added unit testing
2014-10-22 16:52:08 +01:00
Xinyu Hou f9f2d8e8af Parse arg refactoring #4124
Implemented argParser class.
2014-10-22 16:35:28 +01:00
Xinyu Hou d2814a423c Parse arg refactoring #4124
Extracted platform specific argument parsing code.
2014-10-22 16:27:38 +01:00
Nick Bolton cfa10d68ca Merge branch 'master' of https://github.com/ali1234/synergy into ali1234-master 2014-10-22 15:52:06 +01:00
Nick Bolton c09d2ad91e changed @ to - in package name 2014-10-22 15:06:17 +01:00
Nick Bolton 7abcf13317 fixed "hm dist src" command to support branches
also allowed non-unix platforms to run src
2014-10-22 15:06:17 +01:00
Nick Bolton f3218ff53c added branch name to package names
now that buildbot builds branches, it'll be handy to see that branch
name in the package name.
2014-10-22 15:06:17 +01:00
Nick Bolton 326901ef86 changed @ to - in package name 2014-10-22 14:58:13 +01:00
Nick Bolton 1c1f0e70f2 changed @ to - in package name 2014-10-22 14:56:57 +01:00
Nick Bolton 5a6bdfb5e6 fixed "hm dist src" command to support branches
also allowed non-unix platforms to run src
2014-10-22 14:37:15 +01:00
Nick Bolton fe95ec5bc8 added branch name to package names
now that buildbot builds branches, it'll be handy to see that branch
name in the package name.
2014-10-22 14:37:15 +01:00
Nick Bolton 90aa90f19f created dist src export path 2014-10-22 14:37:15 +01:00
Nick Bolton b85432aeee changed svn export to git export 2014-10-22 14:37:15 +01:00
Nick Bolton 0f926658dc added getGitRevision function to get current git revision. 2014-10-22 14:37:15 +01:00
Nick Bolton 5bd0139734 fixed "hm dist src" command to support branches
also allowed non-unix platforms to run src
2014-10-22 14:06:15 +01:00
Nick Bolton 07d56e8e03 added branch name to package names
now that buildbot builds branches, it'll be handy to see that branch
name in the package name.
2014-10-22 13:55:39 +01:00
Alistair Buxton 2709ae48db Implement DMRM message for relative mouse movement. 2014-10-22 13:53:05 +01:00
Alistair Buxton b52f2e0ca7 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.
2014-10-22 13:31:40 +01:00
Xinyu Hou 4aa43d6995 Merge branch '64bit' of https://github.com/petroules/synergy into petroules-64bit 2014-10-22 11:40:00 +01:00
Nick Bolton 685f53c7fc cleaned up .gitignore (removed old files) 2014-10-21 16:15:57 +01:00
Nick Bolton 972922607b cleaned up .gitignore (removed old files) 2014-10-21 16:14:29 +01:00
Xinyu Hou a58ca97941 Merge remote-tracking branch 'origin/master' 2014-10-21 16:00:56 +01:00
Xinyu Hou e746cc401a Merge branch 'master' of https://github.com/synergy/synergy 2014-10-21 15:49:39 +01:00
Xinyu Hou 504e41966e Carbon loop not ready within 5 sec #4002
Port fix from enterprise.
2014-10-21 15:48:04 +01:00
Nick Bolton 8b4a3a8b92 created dist src export path 2014-10-20 19:26:57 +01:00
Nick Bolton 3b3cec4040 changed svn export to git export 2014-10-20 19:06:25 +01:00
Nick Bolton ec3a9c3f1f added getGitRevision function to get current git revision. 2014-10-20 17:46:11 +01:00
Nick Bolton 91423c9c97 ignored build files. 2014-10-20 17:45:17 +01:00
Nick Bolton 2dd56efa63 Test 3 2014-10-20 16:11:06 +01:00
Jake Petroules b644b1253d 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.
2014-10-15 19:29:49 -07:00
Jake Petroules 7dd2db25ec 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.
2014-10-15 19:29:49 -07:00
Xinyu Hou 38718a362f Enable drag and drop by default #4122
Remove premium login from GUI
2014-10-15 14:57:28 +01:00
Nick Bolton 70c8f98615 Merge pull request #4121 from nbolton/master
test2
2014-10-14 09:10:54 +01:00
Nick Bolton 8daa83dbea test2 2014-10-14 09:09:23 +01:00
Nick Bolton c3aa1963c9 test1 [no-issue][no-build] 2014-10-12 09:16:23 +00:00
jerry a5db4dc8c5 removed test.txt [no-issue][no-build] 2014-09-24 13:21:58 +00:00
jerry 2c16180eba test [no-issue] 2014-09-24 13:21:07 +00:00
jerry 6da369b5f2 created a branch for refactoring args parsing [no-issue][no-build] 2014-09-24 13:08:17 +00:00