Commit Graph

1947 Commits

Author SHA1 Message Date
Nick Bolton
4a24a2117a Merge branch 'master' of https://github.com/caramis/synergy into caramis-master 2014-10-22 11:59:14 +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
SeokYeon Hwang
3a663092cf Do not throw exception if ProcessIdToSessionId() is failed.
Many security solutions forbid other program from accessing their own process. So if ProcessIdToSessionId() is failed, simply ignore it.

Signed-off-by: SeokYeon Hwang <caramis@gmail.com>
2014-10-21 19:51:28 +09: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
Patrick Decat
aeab72f724 Apply patch from https://github.com/synergy/synergy/issues/3749 2014-10-15 14:51:44 +02: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
jerry
7e562273d5 [no-issue]
revert to r2421
2014-09-15 15:17:07 +00:00
jerry
1805dd7900 issue #575 - Cannot build x86_64 or ppc64 on Mac OS X
applied patch by Jake Petroules
2014-09-15 13:04:43 +00:00
jerry
32feab2ef1 issue #65 - Auto config feature using Zeroconf/Bonjour
added warning during installation if bonjour not installed on Windows
2014-08-26 17:37:39 +00:00
jerry
cdc740c5d1 issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
added massage box to ask user where to add client
2014-08-26 14:49:27 +00:00
jerry
aa2accf5a6 issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
renamed tryFixNoServer to fixNoServer
2014-08-26 11:27:17 +00:00
jerry
a2d3b5c7e2 issue #65 - Auto config feature using Zeroconf/Bonjour
gave user an option to toggle auto connect
2014-08-26 11:22:09 +00:00
jerry
828f7c02b1 issue #65 - Auto config feature using Zeroconf/Bonjour
matched argument in error handle
2014-08-26 10:25:01 +00:00
jerry
2ec6a49795 issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
reverted position order back
2014-08-26 10:10:25 +00:00
jerry
eb99e843c2 issue #65 - Auto config feature using Zeroconf/Bonjour
fixed start button was broken
2014-08-26 10:09:23 +00:00
jerry
deb45ad393 issue #65 - Auto config feature using Zeroconf/Bonjour
change position order to left first then right
2014-08-26 09:42:24 +00:00
Nick Bolton
fbb97fbdee issue #65 - Auto config feature using Zeroconf/Bonjour
added avahi (zeroconf) dependency
2014-08-22 14:24:41 +00:00
jerry
ff5ca8b8aa issue #65 - Auto config feature using Zeroconf/Bonjour
added needed dll on windows, so no need to dependent on bonjour installation
2014-08-22 13:46:20 +00:00
jerry
8cad7551e6 issue #65 - Auto config feature using Zeroconf/Bonjour
merging zeroconf into trunk
2014-08-21 17:32:40 +00:00
Nick Bolton
1a5ebb7922 version to 1.6.0 [no-issue][no-build] 2014-08-21 17:10:01 +00:00
Nick Bolton
5c9dc20c53 ChangeLog for 1.5.1 [no-issue] 2014-08-21 17:08:10 +00:00
jerry
c4dd6eb61c sticky keys fix doesn't work, may make things worse - backed out [no-issue] 2014-08-01 10:35:16 +00:00
Nick Bolton
3a6d9e82e3 added comment about protocol version [no-issue] [no-build] 2014-07-28 08:19:29 +00:00
jerry
995730a646 issue #18 - Sticky modifier/meta keys
- improved on Mac.
2014-07-02 13:25:49 +00:00
jerry
547d99f7af issue #3404 - Log path needs to be in quotes on windows
fixed compile error
2014-06-18 13:14:12 +00:00
jerry
559237f930 issue #3404 - Log path needs to be in quotes on windows
issue solved.
2014-06-18 12:59:30 +00:00
jerry
507abdcbfb issue #4072 Carbon loop not ready within 5 sec
added lock to all condVar
2014-06-02 16:07:58 +00:00
jerry
9feaa959f1 issue #4072 - Carboon loop not ready within 5 sec
issue solved
2014-06-02 11:04:09 +00:00
jerry
ae4d8cee2a issue #3307 - Configuration file paths containing spaces don't work
issue solved
2014-05-28 12:05:05 +00:00
jerry
23f762a623 issue #3404 - Log path needs to be in quotes on windows
issue solved
2014-05-28 11:59:14 +00:00
jerry
3d6413fada issue #3996 - Installer fails when Windows Firewall is disabled
issue solved
2014-05-28 10:57:28 +00:00
jerry
2d91029de4 [no-issue] [no-build] fixed indentation in gui.pro 2014-05-23 15:58:57 +00:00
Nick Bolton
548dab97c4 test [no-issue] [no-build] 2014-05-23 15:50:40 +00:00