Commit Graph

532 Commits

Author SHA1 Message Date
Xinyu Hou 6756296d85 Made daemon take full responsibility for logging #4128 2014-10-27 14:11:43 +00:00
Xinyu Hou 39b534f3b8 Merge branch 'petroules-mac-fixes' 2014-10-27 13:04:59 +00:00
Xinyu Hou de68346874 Fixed hm config error 2014-10-27 11:58:25 +00:00
Xinyu Hou df29bf8e54 Merge branch 'helkanen-master' 2014-10-24 15:10:44 +01:00
Jake Petroules 5b4e46f8ea Fix Info.plist for Synergy GUI.
This fixes the blurriness on Retina displays.
2014-10-23 08:29:51 -07:00
Xinyu Hou 5c6eba8790 Merged argsParse to master 2014-10-23 13:21:41 +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
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
Xinyu Hou bc772f98a6 Unable to start synergy server with "Cannot create a file when that file already exists" message #3752
Go to next iteration as soon as it fails.
2014-10-22 12:53:14 +01:00
Nick Bolton c2b3f1414b Merge branch 'master' of https://github.com/pdecat/synergy into pdecat-master 2014-10-22 12:49:16 +01:00
Jean-Philippe Andre 9e358233c3 Fix copy&paste for EFL applications
Fixes issue 4021.
2014-10-22 20:32:16 +09:00
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
Xinyu Hou a58ca97941 Merge remote-tracking branch 'origin/master' 2014-10-21 16:00:56 +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
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
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
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
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
jerry 1dfe867c54 issue #4060 - Key stuck down on Windows server
finished solving issue.
2014-05-23 15:01:29 +00:00
jerry f87bd9e860 - checked filename's validation before sending drag info
- refactored duplicated write to drop dir code
- removed legacy member variables
- fixed code style
- fixed typo
2014-05-14 14:45:15 +00:00
jerry 935ca0b2f2 Added support for copying images (BMP) and HTML to/from the OS X clipboard - patch by Ryan Chapman 2014-05-13 12:31:05 +00:00
Nick Bolton d9f90e319e changed synergy-foss.org to synergy-project.org 2014-05-08 07:33:35 +00:00
jerry da3b77447a fixed warning on 10.6 and 10.5 2014-05-06 19:54:02 +00:00
jerry 2797e9a719 fixed compile error and added header for runtime_error 2014-05-06 19:23:40 +00:00
jerry 9621cba99e - redesigned drag information protocol
- used DragInformation to encapsulate information and helper functions.
- renamed parameters in sendDragInfo function.
2014-05-06 18:26:47 +00:00
jerry 2666bf7cf3 copy synmacph only on mavericks. fixed warning on 10.6 2014-05-06 16:12:27 +00:00
jerry 6df7ba2fc4 try to fix gui compile error on mac 10.6 and 10.5 2014-05-06 13:00:08 +00:00
jerry b2f48a0f5b included synmacph only on mavericks or above 2014-05-06 11:57:55 +00:00
jerry cc752484e4 try to fix implicit declaration warnings below mac 10.6 2014-05-01 16:17:09 +00:00
jerry 735fd08400 fixed helper tool:
used xpc communicate between gui and mhp
made helper tool optional
gave more feedback
2014-05-01 15:54:09 +00:00
jerry ff42afc36c made drag info function name more consistent 2014-05-01 13:56:07 +00:00
jerry f773ff3d00 refactored duplicated code in dragInfoReceived
refactored fakeDraggigFiles interface
2014-04-30 18:54:32 +00:00
jerry fd68b70878 patch by Marc:
- fixed switchNeedsAlt not working
- improved logging
2014-04-30 11:17:54 +00:00
jerry 5773ed1ceb made XBase non abstract 2014-04-23 14:15:41 +00:00
jerry b876c0daf3 fixed compile error on 10.6 and 10.5 2014-04-22 16:43:04 +00:00
jerry 22ebb259d0 merged wix from ent to community (no shell extension any more) 2014-04-22 13:17:58 +00:00
jerry 5657348453 removed synwinxt 2014-04-22 11:38:09 +00:00
jerry c5e551ccae fixed name prefix in ServerApp and ClientApp.
removed testing code.
2014-04-22 10:56:30 +00:00
jerry 506cae9a63 made drag window frontmost when drag starts 2014-04-22 10:48:12 +00:00
jerry b85a9b628e used a hidden drop window to get drag filename 2014-04-22 10:33:16 +00:00
jerry 7b8cdb6b38 used really drag file extension 2014-04-17 17:25:41 +00:00
jerry de65f71312 removed left control key hack for faking drag on mac 2014-04-17 17:10:36 +00:00
jerry 8cdeafe995 fixed: compile error on mac 10.8 with makefile 2014-04-17 17:01:58 +00:00
jerry 93ebd6a9cc fixed: const type was used in queue 2014-04-17 16:49:19 +00:00
jerry 8482504b65 fixed: assigned const to non const type 2014-04-17 11:26:21 +00:00
jerry 45c1cde698 fixed: events were added before event queue was ready, caused debug build assert failure.
removed sleep hack in favour of cond var wait.
2014-04-17 10:56:25 +00:00
Nick Bolton c0f47d8eb1 fixed: missing header, fails on qt5 2014-04-09 10:19:13 +00:00
Nick Bolton 8d2de7a9cb fixed: arch headers not included on windows 2014-04-08 16:47:06 +00:00
Nick Bolton d72aa1e975 fixed: pthread linker error 2014-04-08 16:41:48 +00:00
Nick Bolton b081fc0331 fixed: code style in OSXKeyState, released ref var 2014-03-31 16:04:17 +00:00
Nick Bolton 68557afff2 fixed: modifier keys are repeated on windows server. 2014-03-31 15:54:57 +00:00
Nick Bolton 6649887ca6 reverted r2025 2014-03-31 14:57:53 +00:00
Nick Bolton 26d0f59e65 fixed: exception getWhat usage returns garbage. 2014-03-31 13:56:41 +00:00
Nick Bolton 1dc4cec703 updated gui translations master 2014-03-26 11:53:53 +00:00
jerry bc160fab01 fixed broken drag and drop in 1.4.17 2014-03-25 15:08:00 +00:00
Nick Bolton c29d3e2fd3 moved tray hide notification to before starting 2014-03-24 15:13:47 +00:00
jerry a22edc9048 reverted last checkin 2014-03-24 13:11:12 +00:00
jerry da0ea958b6 made synmacph use original code sign 2014-03-24 12:22:19 +00:00
Nick Bolton 3e5194dd4e fixed: ServiceManagement not available in 10.5 2014-03-23 12:16:11 +00:00
Nick Bolton 5ff37a0937 fixed: ServiceManagement not available in 10.5 2014-03-23 10:17:32 +00:00
Nick Bolton 1f9c2ba7e2 made ax helper mavericks only 2014-03-22 09:07:29 +00:00
jerry f59569c4a0 fixed: Bug #3927 - Mavericks accessibility exception not working (when upgrading from 1.4.15 to 1.4.16) 2014-03-21 16:08:33 +00:00
Nick Bolton 4d75150143 fixed: Bug #3968 - GUI auto-hides on initial first install (with no config) 2014-03-21 09:22:18 +00:00
Nick Bolton 0745d5884b Task #3969 - Merge String.cpp and StringUtil.cpp 2014-03-21 08:32:36 +00:00
Nick Bolton 3e84372a14 fixed: missing virtual dtor for XArch* classes 2014-03-20 13:41:23 +00:00
Nick Bolton e34e39a41c fixed XArchEvalUnix using wrong memeber, string_format using c++11 (which we're not ready for yet), code style (indentation and new lines) 2014-03-20 13:34:21 +00:00
Nick Bolton f9fe1130ac Task #3964 - Make premium login error more verbose 2014-03-20 10:33:33 +00:00
Nick Bolton 44a98c6c9d fixed: XArchEval "what" returns garbage (memory deleted). 2014-03-20 10:32:40 +00:00
Nick Bolton 564b5c6e51 annotated hex values in logging 2014-03-17 19:27:29 +00:00
Nick Bolton 0563eeb467 extra logging, polling keys after modifier key fake 2014-03-17 19:02:13 +00:00
Nick Bolton 729bbeab01 cleaned up osx keystate code that handles modifiers (really weird code). 2014-03-17 18:39:27 +00:00
Nick Bolton 826cd7e60b reintroduced AXIsProcessTrusted call, shouldn't break ax stuff 2014-03-17 17:25:18 +00:00
Nick Bolton 41c1319134 removed unused test 2014-03-17 16:37:17 +00:00
Nick Bolton 3ddb7ef9e3 Task #3961 - Remove Windows 95 support 2014-03-17 16:30:27 +00:00
Nick Bolton 1b5cdecc60 Task #3960 - Split CMSWindowsHookLibraryLoader into hook and shellex loaders
- reordered include order for winsock2.h (more robust)
- removed Windows.h include from synwinxt.h (not needed)
2014-03-17 14:34:13 +00:00
Nick Bolton 407378fbc5 Task #3951 - Clear filename stored in synwinxt on mouse up
- renamed some functions for file drag/drop to be more similar to existing
- improved log messages for the library loader
- removed hack that blocked .exe and .lnk files (annoying for developers)
- removed hack that always clears dragging filename (not very robust)
2014-03-17 13:10:29 +00:00
Nick Bolton ae327055c2 Bug #3959 - Premium title doesn't always show on first login 2014-03-17 12:03:43 +00:00
Nick Bolton 498f9b1e69 Task #3952 - Make Premium wizard page cleaner 2014-03-17 11:57:13 +00:00
Nick Bolton f62cac6a0a code style - indentation 2014-03-17 11:16:52 +00:00
Nick Bolton a97fa1428b Task #3954 - Make "lock to screen" log message go to NOTE level instead of DEBUG 2014-03-17 11:14:56 +00:00
Nick Bolton 28a6b16875 fixed: Bug #3933 - Plus signs in the email address cause premium login to fail 2014-03-14 20:34:19 +00:00
Nick Bolton d5b25069be fixed: extending std::runtime_error instead, as std::exception ctor is undefined. also fixed some mac warnings from inheriting runtime_error. 2014-03-14 20:33:18 +00:00
Nick Bolton ab529fae41 combined windows and unix arch internet test, there can be only one! 2014-03-14 18:32:34 +00:00
Nick Bolton bdb2ff5967 fixed: warning, size_t to UInt32 cast. 2014-03-14 18:31:06 +00:00
Nick Bolton abe108195d Task #3953 - Inherit XArch and XBase from std::exception 2014-03-14 18:30:21 +00:00
Nick Bolton 78f30db6e9 fixed: Bug #3886 - Alias is allowed to match screen name 2014-03-14 16:34:23 +00:00
jerry 77eae25279 fixed code style in Log.cpp 2014-03-14 16:04:21 +00:00
jerry 54b14c439d removed unused variables 2014-03-14 16:03:15 +00:00
Nick Bolton 053806ce5b fixed: Bug #2836 - Unable to begin screen name or alias with numbers 2014-03-14 13:52:21 +00:00
Nick Bolton 29b48e98e3 shortened msi explorer restart message, easier to read. 2014-03-12 09:00:04 +00:00
Nick Bolton 3f28be1933 fixed: shellex isn't loaded on install, restart needed. 2014-03-11 19:24:51 +00:00
Nick Bolton a788d4df18 removed redundant explorer restart (doesn't work when restart manager is disabled). 2014-03-11 12:26:02 +00:00
Nick Bolton 158a621218 fixed: msi 32-bit and 64-bit should not be installed side by side, user should use the right arch.
fixed: msi duplicate installs when using different nightly build revs (probably a hacky fix).
2014-03-10 20:21:14 +00:00
Nick Bolton 1774a3a4ee fixed: msi attempts to kill everything using synwinhk.dll (we should let the service handle this problem).
fixed: msi missing dependencies, ms crt (vc redist) and qt libraries.
2014-03-10 19:31:14 +00:00
Nick Bolton f7445a6aea changed installer from nsis to wix - attempting to fix "synwinxt.dll in use" error on upgrade. 2014-03-07 19:41:08 +00:00
Nick Bolton 64248beb4e refactored logging for synwinxt, and added version number. 2014-03-07 19:37:52 +00:00
Nick Bolton ad1cdd150a temporarily diabled pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect - causing sigsegv 2014-02-28 16:30:20 +00:00
Nick Bolton 9b9a489efc fixed: tests not compiling on linux 2014-02-28 15:36:51 +00:00
Nick Bolton f4bb72ce52 fixed:
- (weird) linker error on windows caused by using different include.
- IpcTests using private field which had a public accessor.
- some includes using wrong lib.
2014-02-28 15:04:49 +00:00
Nick Bolton ad8905ccbf fixed: silenced gtest warning on osx106 2014-02-28 13:56:07 +00:00
Nick Bolton 19bcb9dfae fixed: osx compile errors from last commit 2014-02-28 13:06:25 +00:00
Nick Bolton f3d542b2c3 fixed: linux compile errors from last checkin 2014-02-28 12:55:14 +00:00
Nick Bolton 4675f29a4c code style fixes:
- reordered includes to prevent accidental dependencies.
- moved arch specific files into their own folder (easier to include with cmake).
- renamed non-class files to reflect new code style (lower case with underscores).
- using full relative paths for includes (easier for understanding dependencies).
- using #pragma once instead of classic-style header guards.
2014-02-28 12:36:45 +00:00
Nick Bolton 96d97ed467 updated copyright dates. 2014-02-28 07:59:33 +00:00
Nick Bolton 8e74710dad code style: dropped C prefix 2014-02-27 17:45:17 +00:00
Nick Bolton f11c660efb used glob instead of manually specifying files. cmake does not recommend this, but we always re-run cmake anyway after adding files since we use vs. 2014-02-26 17:46:02 +00:00
Nick Bolton 50a4f310c9 moved tools to ext - makes more sense, as it contains external libs, not tools 2014-02-26 16:52:54 +00:00
Nick Bolton 8d6a44d1b7 fixed: osx106 warnings 2014-02-26 15:53:28 +00:00
Nick Bolton 228befdc2c fixed: code was not gnuc 4.2 compatible 2014-02-25 19:10:54 +00:00
Nick Bolton a5d702c8b5 fixed: pragma usage not cross platform 2014-02-25 18:16:03 +00:00
Nick Bolton 78ecdf4c6e fixed: win32 warnings. 2014-02-25 15:50:06 +00:00
Nick Bolton c44971b43d fixed: warnings on mac os x 2014-02-25 15:03:43 +00:00
Nick Bolton bdb4c47898 crypto++, gtest and gmock: ignore external lib warnings, not much we can do about them 2014-02-24 16:32:18 +00:00
Nick Bolton 77676d558e potential fix for unit/integ test false positives 2014-02-24 13:45:43 +00:00
Nick Bolton ad35ccb2dc disabled all COSXKeyStateTests for osx10.6 2014-02-24 13:04:16 +00:00
Nick Bolton 2c2b136a36 disabled fakeAndPoll_shift for osx10.6 2014-02-24 12:13:51 +00:00
Nick Bolton 75d2c5abf1 fixed: nothing happens on osx 10.6 2014-02-17 19:38:26 +00:00
Nick Bolton bf361d153b support for qt 5.2 2014-02-14 16:21:02 +00:00
Nick Bolton cfc1aa2569 fixed: file is dragged twice by accident.
fixed: exe and lnk files dragged by accident.
fixed: "dir" used instead of "filename".
2014-02-07 18:44:45 +00:00
Nick Bolton 98f8a12425 fixed: watchdog keeps showing backoff message even if no command to run. 2014-02-07 18:04:25 +00:00
Nick Bolton af51454e98 fixed: garbage drop target on windows when elevated. 2014-02-07 18:03:56 +00:00
Nick Bolton d03b398bc1 - improved string conversion by using ms comutil.
- removed dead member variable.
- extra logging to help debug file drop on windows.
2014-02-07 17:06:26 +00:00