From ed1217e9cce3a4bb2f85dad69e13ebfb49f2ac41 Mon Sep 17 00:00:00 2001 From: Chris Rizzitello Date: Tue, 17 Sep 2024 15:00:25 -0400 Subject: [PATCH] Use Deskflow Name (#7519) * Use Deskflow Name * Remove business-oriented options from issue templates * Remove business-oriented workflow * Bump version to 3.0.0 (to avoid confusion with previously used version numbers 1.x & 2.x) * Update readme to reflect new project name and goals * Found some more "synergy" to rename * Rename `synlib` to `app` * Rename `syntool` to `deskflow-legacy` * Rename `synwinhk` to `dfwhook` * Rename dirs from synergy to deskflow * Rename more "Synergy" files * Rename app bundle ID * Fixed copyright typo * Rename only title in serial key dialog (to be moved downstream later) * Preserve original serial key window for moving downstream * Restore dialogs ready for moving downstream * Rename `QDeskflowApplication` to `DeskflowApplication` (the Q is confusing) * Restore Volker's original project name * Fixed mimetype * Fixed weird grammar * Fixed (more) weird grammar * Broken link, restoring (but we should move all links out of source) * Broken link, restoring (but we should move all links out of source) * Add write permission to valgrind-analysis.yml * Restore AUR conflicts * Apply Clang format * Update ChangeLog * Back out version change --------- Co-authored-by: Nick Bolton --- .github/FUNDING.yml | 12 -- .github/ISSUE_TEMPLATE/bug_report.yml | 74 +++------ .github/ISSUE_TEMPLATE/feature_request.yml | 64 ++------ .github/actions/get-version/action.yml | 4 +- .github/workflows/build-containers.yml | 2 +- .github/workflows/ci-linux.json | 26 ++-- .github/workflows/ci.yml | 26 ++-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/issue-check-support.yml | 63 -------- .github/workflows/sonarcloud-analysis.yml | 4 +- .github/workflows/valgrind-analysis.yml | 5 +- .gitignore | 2 +- .vscode/tasks.json | 6 +- BUILD.md | 10 +- CMakeLists.txt | 4 +- CMakePresets.json | 2 +- CONTRIBUTING.md | 8 +- ChangeLog | 4 + Doxyfile | 4 +- README.md | 142 ++++++------------ cmake/Build.cmake | 12 +- cmake/Definitions.cmake | 28 ++-- cmake/Libraries.cmake | 4 +- cmake/Packaging.cmake | 28 ++-- cmake/Version.cmake | 38 ++--- cspell.json | 7 +- ...rgy.conf.example => deskflow.conf.example} | 2 +- ...dvanced => deskflow.conf.example-advanced} | 2 +- ...mple-basic => deskflow.conf.example-basic} | 2 +- meson.build | 2 +- res/config.h.in | 2 +- res/{synergy.ico => deskflow.ico} | Bin res/{synergy.png => deskflow.png} | Bin res/{synergy.svg => deskflow.svg} | 0 res/dist/arch/PKGBUILD.in | 8 +- .../flatpak/{synergy.yml => deskflow.yml} | 10 +- res/dist/flatpak/flatpak-desktop.patch | 12 +- .../{synergy.desktop => deskflow.desktop} | 6 +- .../Contents/Info.plist.in | 16 +- .../bundle/Deskflow.app/Contents/PkgInfo | 1 + .../Contents/Resources/.background.tiff | Bin .../Contents/Resources/Deskflow.icns} | Bin .../Contents/Resources/VolumeIcon.icns | Bin .../macos/bundle/Synergy.app/Contents/PkgInfo | 1 - res/dist/wix/{Synergy.sln => Deskflow.sln} | 2 +- .../wix/{Synergy.wixproj => Deskflow.wixproj} | 16 +- ...rgyBrowseDlg.wxs => DeskflowBrowseDlg.wxs} | 4 +- res/dist/wix/DeskflowDlgSequence.wxs | 72 +++++++++ ...yInstallDlg.wxs => DeskflowInstallDlg.wxs} | 8 +- ...Dlg.wxs => DeskflowMaintenanceTypeDlg.wxs} | 6 +- ...eadyDlg.wxs => DeskflowVerifyReadyDlg.wxs} | 6 +- ...SynergyWelcome.wxs => DeskflowWelcome.wxs} | 12 +- res/dist/wix/Include.wxi.in | 4 +- res/dist/wix/Product.wxs | 48 +++--- res/dist/wix/SynergyDlgSequence.wxs | 72 --------- res/doxygen.cfg.in | 2 +- res/gui/{Synergy.qrc => Deskflow.qrc} | 8 +- .../icons/16x16/{synergy.png => deskflow.png} | Bin .../256x256/{synergy.ico => deskflow.ico} | Bin .../{synergy-dark.png => deskflow-dark.png} | Bin .../{synergy-light.png => deskflow-light.png} | Bin res/gui/mac/{Synergy.icns => Deskflow.icns} | Bin res/gui/mac/Info.plist | 10 +- res/gui/mac/QSynergy.icns | Bin 124558 -> 0 bytes res/gui/win/Deskflow.rc | 1 + res/gui/win/Synergy.rc | 1 - res/openssl/{synergy.conf => deskflow.conf} | 2 +- res/win/version.rc.in | 18 +-- scripts/daemon.py | 10 +- scripts/fancy_copy.py | 2 +- scripts/install_deps.py | 2 +- scripts/lib/certificate.py | 2 +- scripts/lib/cmd_utils.py | 2 +- scripts/lib/colors.py | 2 +- scripts/lib/config.py | 2 +- scripts/lib/env.py | 4 +- scripts/lib/file_utils.py | 2 +- scripts/lib/fs.py | 2 +- scripts/lib/github.py | 2 +- scripts/lib/linux.py | 14 +- scripts/lib/mac.py | 6 +- scripts/lib/meson.py | 2 +- scripts/lib/qt_utils.py | 2 +- scripts/lib/vcpkg.py | 2 +- scripts/lib/windows.py | 6 +- scripts/lint_clang.py | 2 +- scripts/lint_cmake.py | 2 +- scripts/package.py | 8 +- scripts/pyproject.toml | 2 +- scripts/tests.py | 2 +- src/CMakeLists.txt | 2 +- src/cmd/CMakeLists.txt | 12 +- .../CMakeLists.txt | 8 +- .../deskflow-core.cpp} | 14 +- .../deskflow-core.exe.manifest} | 0 .../CMakeLists.txt | 8 +- .../deskflow-legacy.cpp} | 4 +- src/cmd/{synergyc => deskflowc}/.gitignore | 0 .../{synergyc => deskflowc}/CMakeLists.txt | 8 +- .../MSWindowsClientTaskBarReceiver.cpp | 6 +- .../MSWindowsClientTaskBarReceiver.h | 4 +- .../OSXClientTaskBarReceiver.cpp | 2 +- .../OSXClientTaskBarReceiver.h | 4 +- .../XWindowsClientTaskBarReceiver.cpp | 2 +- .../XWindowsClientTaskBarReceiver.h | 4 +- .../deskflow.exe.manifest} | 0 .../synergyc.cpp => deskflowc/deskflowc.cpp} | 4 +- .../synergyc.ico => deskflowc/deskflowc.ico} | Bin .../synergyc.rc => deskflowc/deskflowc.rc} | 8 +- src/cmd/{synergyc => deskflowc}/resource.h | 4 +- src/cmd/{synergyc => deskflowc}/tb_error.ico | Bin src/cmd/{synergyc => deskflowc}/tb_idle.ico | Bin src/cmd/{synergyc => deskflowc}/tb_run.ico | Bin src/cmd/{synergyc => deskflowc}/tb_wait.ico | Bin .../{synergyd => deskflowd}/CMakeLists.txt | 6 +- .../synergyd.cpp => deskflowd/deskflowd.cpp} | 4 +- src/cmd/{synergys => deskflows}/.gitignore | 0 .../{synergys => deskflows}/CMakeLists.txt | 8 +- .../MSWindowsServerTaskBarReceiver.cpp | 8 +- .../MSWindowsServerTaskBarReceiver.h | 4 +- .../OSXServerTaskBarReceiver.cpp | 2 +- .../OSXServerTaskBarReceiver.h | 4 +- .../XWindowsServerTaskBarReceiver.cpp | 2 +- .../XWindowsServerTaskBarReceiver.h | 4 +- .../synergys.cpp => deskflows/deskflows.cpp} | 4 +- .../deskflows.exe.manifest} | 0 .../synergys.ico => deskflows/deskflows.ico} | Bin .../synergys.rc => deskflows/deskflows.rc} | 10 +- src/cmd/{synergys => deskflows}/resource.h | 8 +- src/cmd/{synergys => deskflows}/tb_error.ico | Bin src/cmd/{synergys => deskflows}/tb_idle.ico | Bin src/cmd/{synergys => deskflows}/tb_run.ico | Bin src/cmd/{synergys => deskflows}/tb_wait.ico | Bin src/gui/CMakeLists.txt | 18 +-- src/gui/src/AboutDialog.cpp | 12 +- src/gui/src/AboutDialog.h | 2 +- src/gui/src/AboutDialogBase.ui | 4 +- src/gui/src/Action.cpp | 2 +- src/gui/src/Action.h | 2 +- src/gui/src/ActionDialog.cpp | 2 +- src/gui/src/ActionDialog.h | 2 +- src/gui/src/ActivationDialog.cpp | 12 +- src/gui/src/ActivationDialog.h | 4 +- src/gui/src/AddClientDialog.cpp | 2 +- src/gui/src/AddClientDialog.h | 2 +- src/gui/src/CancelActivationDialog.cpp | 2 +- src/gui/src/CancelActivationDialog.h | 2 +- src/gui/src/DataDownloader.cpp | 2 +- src/gui/src/DataDownloader.h | 2 +- ...pplication.cpp => DeskflowApplication.cpp} | 6 +- ...rgyApplication.h => DeskflowApplication.h} | 8 +- src/gui/src/Hotkey.cpp | 2 +- src/gui/src/Hotkey.h | 2 +- src/gui/src/HotkeyDialog.cpp | 2 +- src/gui/src/HotkeyDialog.h | 2 +- src/gui/src/KeySequence.cpp | 6 +- src/gui/src/KeySequence.h | 2 +- src/gui/src/KeySequenceWidget.cpp | 2 +- src/gui/src/KeySequenceWidget.h | 2 +- src/gui/src/MainWindow.cpp | 40 ++--- src/gui/src/MainWindow.h | 28 ++-- src/gui/src/MainWindowBase.ui | 12 +- src/gui/src/ProcessorArch.h | 2 +- src/gui/src/QUtility.cpp | 2 +- src/gui/src/QUtility.h | 2 +- src/gui/src/ScreenSettingsDialog.cpp | 4 +- src/gui/src/ScreenSettingsDialog.h | 2 +- src/gui/src/ScreenSetupModel.cpp | 4 +- src/gui/src/ScreenSetupModel.h | 2 +- src/gui/src/ScreenSetupView.cpp | 2 +- src/gui/src/ScreenSetupView.h | 2 +- src/gui/src/ServerConfig.cpp | 4 +- src/gui/src/ServerConfig.h | 6 +- src/gui/src/ServerConfigDialog.cpp | 23 ++- src/gui/src/ServerConfigDialog.h | 2 +- src/gui/src/SetupWizard.cpp | 4 +- src/gui/src/SetupWizard.h | 2 +- src/gui/src/SetupWizardBase.ui | 2 +- src/gui/src/TrashScreenWidget.cpp | 2 +- src/gui/src/TrashScreenWidget.h | 2 +- src/gui/src/main.cpp | 31 ++-- src/lib/CMakeLists.txt | 4 +- src/lib/arch/Arch.cpp | 2 +- src/lib/arch/Arch.h | 2 +- src/lib/arch/ArchConsoleStd.cpp | 2 +- src/lib/arch/ArchConsoleStd.h | 2 +- src/lib/arch/ArchDaemonNone.cpp | 2 +- src/lib/arch/ArchDaemonNone.h | 2 +- src/lib/arch/CMakeLists.txt | 2 +- src/lib/arch/IArchConsole.h | 4 +- src/lib/arch/IArchDaemon.h | 4 +- src/lib/arch/IArchFile.h | 6 +- src/lib/arch/IArchLog.h | 4 +- src/lib/arch/IArchMultithread.h | 4 +- src/lib/arch/IArchNetwork.h | 4 +- src/lib/arch/IArchSleep.h | 4 +- src/lib/arch/IArchString.cpp | 2 +- src/lib/arch/IArchString.h | 4 +- src/lib/arch/IArchSystem.h | 10 +- src/lib/arch/IArchTaskBar.h | 4 +- src/lib/arch/IArchTaskBarReceiver.h | 4 +- src/lib/arch/IArchTime.h | 4 +- src/lib/arch/XArch.h | 2 +- src/lib/arch/multibyte.h | 2 +- src/lib/arch/unix/ArchConsoleUnix.cpp | 2 +- src/lib/arch/unix/ArchConsoleUnix.h | 2 +- src/lib/arch/unix/ArchDaemonUnix.cpp | 8 +- src/lib/arch/unix/ArchDaemonUnix.h | 4 +- src/lib/arch/unix/ArchFileUnix.cpp | 8 +- src/lib/arch/unix/ArchFileUnix.h | 2 +- src/lib/arch/unix/ArchLogUnix.cpp | 2 +- src/lib/arch/unix/ArchLogUnix.h | 2 +- src/lib/arch/unix/ArchMultithreadPosix.cpp | 6 +- src/lib/arch/unix/ArchMultithreadPosix.h | 2 +- src/lib/arch/unix/ArchNetworkBSD.cpp | 2 +- src/lib/arch/unix/ArchNetworkBSD.h | 2 +- src/lib/arch/unix/ArchSleepUnix.cpp | 2 +- src/lib/arch/unix/ArchSleepUnix.h | 2 +- src/lib/arch/unix/ArchStringUnix.cpp | 2 +- src/lib/arch/unix/ArchStringUnix.h | 2 +- src/lib/arch/unix/ArchSystemUnix.cpp | 6 +- src/lib/arch/unix/ArchSystemUnix.h | 2 +- src/lib/arch/unix/ArchTaskBarXWindows.cpp | 2 +- src/lib/arch/unix/ArchTaskBarXWindows.h | 2 +- src/lib/arch/unix/ArchTimeUnix.cpp | 2 +- src/lib/arch/unix/ArchTimeUnix.h | 2 +- src/lib/arch/unix/XArchUnix.cpp | 2 +- src/lib/arch/unix/XArchUnix.h | 2 +- src/lib/arch/vsnprintf.h | 2 +- src/lib/arch/win32/ArchConsoleWindows.cpp | 2 +- src/lib/arch/win32/ArchConsoleWindows.h | 2 +- src/lib/arch/win32/ArchDaemonWindows.cpp | 4 +- src/lib/arch/win32/ArchDaemonWindows.h | 12 +- src/lib/arch/win32/ArchFileWindows.cpp | 4 +- src/lib/arch/win32/ArchFileWindows.h | 2 +- src/lib/arch/win32/ArchLogWindows.cpp | 2 +- src/lib/arch/win32/ArchLogWindows.h | 2 +- src/lib/arch/win32/ArchMiscWindows.cpp | 2 +- src/lib/arch/win32/ArchMiscWindows.h | 2 +- src/lib/arch/win32/ArchMultithreadWindows.cpp | 2 +- src/lib/arch/win32/ArchMultithreadWindows.h | 2 +- src/lib/arch/win32/ArchNetworkWinsock.cpp | 2 +- src/lib/arch/win32/ArchNetworkWinsock.h | 2 +- src/lib/arch/win32/ArchSleepWindows.cpp | 2 +- src/lib/arch/win32/ArchSleepWindows.h | 2 +- src/lib/arch/win32/ArchStringWindows.cpp | 2 +- src/lib/arch/win32/ArchStringWindows.h | 2 +- src/lib/arch/win32/ArchSystemWindows.cpp | 5 +- src/lib/arch/win32/ArchSystemWindows.h | 2 +- src/lib/arch/win32/ArchTaskBarWindows.cpp | 10 +- src/lib/arch/win32/ArchTaskBarWindows.h | 2 +- src/lib/arch/win32/ArchTimeWindows.cpp | 2 +- src/lib/arch/win32/ArchTimeWindows.h | 2 +- src/lib/arch/win32/XArchWindows.cpp | 4 +- src/lib/arch/win32/XArchWindows.h | 2 +- src/lib/base/CMakeLists.txt | 2 +- src/lib/base/ELevel.h | 2 +- src/lib/base/Event.cpp | 2 +- src/lib/base/Event.h | 2 +- src/lib/base/EventQueue.cpp | 2 +- src/lib/base/EventQueue.h | 2 +- src/lib/base/EventTypes.cpp | 2 +- src/lib/base/EventTypes.h | 2 +- src/lib/base/FunctionEventJob.cpp | 2 +- src/lib/base/FunctionEventJob.h | 2 +- src/lib/base/FunctionJob.cpp | 2 +- src/lib/base/FunctionJob.h | 2 +- src/lib/base/IEventJob.h | 2 +- src/lib/base/IEventQueue.h | 2 +- src/lib/base/IEventQueueBuffer.h | 2 +- src/lib/base/IJob.h | 2 +- src/lib/base/ILogOutputter.h | 2 +- src/lib/base/Log.cpp | 4 +- src/lib/base/Log.h | 2 +- src/lib/base/Path.cpp | 6 +- src/lib/base/Path.h | 12 +- src/lib/base/PriorityQueue.h | 2 +- src/lib/base/SimpleEventQueueBuffer.cpp | 2 +- src/lib/base/SimpleEventQueueBuffer.h | 2 +- src/lib/base/Stopwatch.cpp | 2 +- src/lib/base/Stopwatch.h | 2 +- src/lib/base/String.cpp | 8 +- src/lib/base/String.h | 6 +- src/lib/base/TMethodEventJob.h | 2 +- src/lib/base/TMethodJob.h | 2 +- src/lib/base/Unicode.cpp | 2 +- src/lib/base/Unicode.h | 2 +- src/lib/base/XBase.cpp | 4 +- src/lib/base/XBase.h | 2 +- src/lib/base/log_outputters.cpp | 6 +- src/lib/base/log_outputters.h | 2 +- src/lib/client/CMakeLists.txt | 4 +- src/lib/client/Client.cpp | 32 ++-- src/lib/client/Client.h | 30 ++-- src/lib/client/ServerProxy.cpp | 22 +-- src/lib/client/ServerProxy.h | 16 +- src/lib/common/IInterface.h | 2 +- src/lib/common/MacOSXPrecomp.h | 2 +- src/lib/common/basic_types.h | 2 +- src/lib/common/common.h | 2 +- src/lib/common/constants.h | 8 +- src/lib/common/copyright.h | 6 +- src/lib/common/ipc.h | 10 +- src/lib/common/stdbitset.h | 2 +- src/lib/common/stddeque.h | 2 +- src/lib/common/stdexcept.h | 2 +- src/lib/common/stdfstream.h | 2 +- src/lib/common/stdistream.h | 2 +- src/lib/common/stdlist.h | 2 +- src/lib/common/stdmap.h | 2 +- src/lib/common/stdostream.h | 2 +- src/lib/common/stdpost.h | 2 +- src/lib/common/stdpre.h | 2 +- src/lib/common/stdset.h | 2 +- src/lib/common/stdsstream.h | 2 +- src/lib/common/stdstring.h | 2 +- src/lib/common/stdvector.h | 2 +- src/lib/common/version.h | 6 +- src/lib/{synergy => deskflow}/App.cpp | 24 +-- src/lib/{synergy => deskflow}/App.h | 18 +-- src/lib/{synergy => deskflow}/AppUtil.cpp | 4 +- src/lib/{synergy => deskflow}/AppUtil.h | 6 +- src/lib/{synergy => deskflow}/ArgParser.cpp | 34 ++--- src/lib/{synergy => deskflow}/ArgParser.h | 22 +-- src/lib/{synergy => deskflow}/ArgsBase.cpp | 6 +- src/lib/{synergy => deskflow}/ArgsBase.h | 8 +- src/lib/{synergy => deskflow}/CMakeLists.txt | 14 +- src/lib/{synergy => deskflow}/Chunk.cpp | 4 +- src/lib/{synergy => deskflow}/Chunk.h | 2 +- src/lib/{synergy => deskflow}/ClientApp.cpp | 46 +++--- src/lib/{synergy => deskflow}/ClientApp.h | 22 +-- .../ClientAppArguments.md | 6 +- src/lib/{synergy => deskflow}/ClientArgs.cpp | 6 +- src/lib/{synergy => deskflow}/ClientArgs.h | 14 +- .../ClientTaskBarReceiver.cpp | 14 +- .../ClientTaskBarReceiver.h | 4 +- src/lib/{synergy => deskflow}/Clipboard.cpp | 4 +- src/lib/{synergy => deskflow}/Clipboard.h | 4 +- .../{synergy => deskflow}/ClipboardChunk.cpp | 14 +- .../{synergy => deskflow}/ClipboardChunk.h | 12 +- src/lib/{synergy => deskflow}/Config.cpp | 6 +- src/lib/{synergy => deskflow}/Config.h | 6 +- src/lib/{synergy => deskflow}/DaemonApp.cpp | 30 ++-- src/lib/{synergy => deskflow}/DaemonApp.h | 2 +- .../DisplayInvalidException.h | 8 +- .../{synergy => deskflow}/DragInformation.cpp | 4 +- .../{synergy => deskflow}/DragInformation.h | 2 +- src/lib/{synergy => deskflow}/DropHelper.cpp | 4 +- src/lib/{synergy => deskflow}/DropHelper.h | 4 +- src/lib/{synergy => deskflow}/FileChunk.cpp | 14 +- src/lib/{synergy => deskflow}/FileChunk.h | 10 +- src/lib/{synergy => deskflow}/IApp.h | 10 +- src/lib/{synergy => deskflow}/IAppUtil.h | 4 +- src/lib/{synergy => deskflow}/IClient.h | 12 +- src/lib/{synergy => deskflow}/IClipboard.cpp | 4 +- src/lib/{synergy => deskflow}/IClipboard.h | 2 +- src/lib/{synergy => deskflow}/IKeyState.cpp | 4 +- src/lib/{synergy => deskflow}/IKeyState.h | 4 +- src/lib/{synergy => deskflow}/INode.h | 2 +- .../{synergy => deskflow}/IPlatformScreen.cpp | 4 +- .../{synergy => deskflow}/IPlatformScreen.h | 16 +- .../{synergy => deskflow}/IPrimaryScreen.cpp | 4 +- .../{synergy => deskflow}/IPrimaryScreen.h | 6 +- src/lib/{synergy => deskflow}/IScreen.h | 4 +- src/lib/{synergy => deskflow}/IScreenSaver.h | 2 +- .../{synergy => deskflow}/ISecondaryScreen.h | 4 +- src/lib/{synergy => deskflow}/KeyMap.cpp | 16 +- src/lib/{synergy => deskflow}/KeyMap.h | 14 +- src/lib/{synergy => deskflow}/KeyState.cpp | 32 ++-- src/lib/{synergy => deskflow}/KeyState.h | 30 ++-- .../PacketStreamFilter.cpp | 6 +- .../PacketStreamFilter.h | 4 +- .../{synergy => deskflow}/PlatformScreen.cpp | 10 +- .../{synergy => deskflow}/PlatformScreen.h | 16 +- .../{synergy => deskflow}/ProtocolUtil.cpp | 29 ++-- src/lib/{synergy => deskflow}/ProtocolUtil.h | 32 ++-- src/lib/{synergy => deskflow}/Screen.cpp | 12 +- src/lib/{synergy => deskflow}/Screen.h | 18 +-- src/lib/{synergy => deskflow}/ServerApp.cpp | 78 +++++----- src/lib/{synergy => deskflow}/ServerApp.h | 35 ++--- .../ServerAppArguments.md | 8 +- src/lib/{synergy => deskflow}/ServerArgs.cpp | 6 +- src/lib/{synergy => deskflow}/ServerArgs.h | 10 +- .../ServerTaskBarReceiver.cpp | 12 +- .../ServerTaskBarReceiver.h | 6 +- .../{synergy => deskflow}/StreamChunker.cpp | 14 +- src/lib/{synergy => deskflow}/StreamChunker.h | 4 +- src/lib/{synergy => deskflow}/ToolApp.cpp | 10 +- src/lib/{synergy => deskflow}/ToolApp.h | 6 +- src/lib/{synergy => deskflow}/ToolArgs.cpp | 4 +- src/lib/{synergy => deskflow}/ToolArgs.h | 2 +- .../XSynergy.cpp => deskflow/XDeskflow.cpp} | 10 +- .../XSynergy.h => deskflow/XDeskflow.h} | 18 +-- src/lib/{synergy => deskflow}/XScreen.cpp | 4 +- src/lib/{synergy => deskflow}/XScreen.h | 2 +- .../{synergy => deskflow}/clipboard_types.h | 2 +- src/lib/{synergy => deskflow}/key_types.cpp | 4 +- src/lib/{synergy => deskflow}/key_types.h | 2 +- .../languages/LanguageManager.cpp | 6 +- .../languages/LanguageManager.h | 14 +- src/lib/{synergy => deskflow}/mouse_types.h | 2 +- src/lib/{synergy => deskflow}/option_types.h | 2 +- .../{synergy => deskflow}/protocol_types.cpp | 8 +- .../{synergy => deskflow}/protocol_types.h | 4 +- .../unix/AppUtilUnix.cpp | 14 +- .../{synergy => deskflow}/unix/AppUtilUnix.h | 4 +- .../unix/DeskflowXkbKeyboard.cpp} | 16 +- .../unix/DeskflowXkbKeyboard.h} | 16 +- .../{synergy => deskflow}/unix/ISO639Table.h | 2 +- .../unix/X11LayoutsParser.cpp | 6 +- .../unix/X11LayoutsParser.h | 2 +- .../win32/AppUtilWindows.cpp | 16 +- .../win32/AppUtilWindows.h | 4 +- src/lib/gui/CMakeLists.txt | 4 +- src/lib/gui/Logger.cpp | 12 +- src/lib/gui/Logger.h | 6 +- src/lib/gui/OSXHelpers.h | 2 +- src/lib/gui/OSXHelpers.mm | 6 +- src/lib/gui/TrayIcon.cpp | 6 +- src/lib/gui/TrayIcon.h | 6 +- src/lib/gui/VersionChecker.cpp | 14 +- src/lib/gui/VersionChecker.h | 2 +- src/lib/gui/byte_utils.h | 6 +- src/lib/gui/config/AppConfig.cpp | 18 +-- src/lib/gui/config/AppConfig.h | 28 ++-- src/lib/gui/config/ConfigScopes.cpp | 6 +- src/lib/gui/config/ConfigScopes.h | 8 +- src/lib/gui/config/ElevateMode.h | 10 +- src/lib/gui/config/IAppConfig.h | 8 +- src/lib/gui/config/IConfigScopes.h | 8 +- src/lib/gui/config/IServerConfig.h | 6 +- src/lib/gui/config/Screen.cpp | 4 +- src/lib/gui/config/Screen.h | 4 +- src/lib/gui/config/ScreenConfig.cpp | 2 +- src/lib/gui/config/ScreenConfig.h | 4 +- src/lib/gui/config/ScreenList.cpp | 2 +- src/lib/gui/config/ScreenList.h | 2 +- src/lib/gui/config/ServerConfigDialogState.h | 6 +- src/lib/gui/constants.h | 10 +- src/lib/gui/core/ClientConnection.cpp | 6 +- src/lib/gui/core/ClientConnection.h | 6 +- src/lib/gui/core/CommandProcess.cpp | 2 +- src/lib/gui/core/CommandProcess.h | 2 +- src/lib/gui/core/CoreProcess.cpp | 20 +-- src/lib/gui/core/CoreProcess.h | 14 +- src/lib/gui/core/CoreTool.cpp | 8 +- src/lib/gui/core/CoreTool.h | 2 +- src/lib/gui/core/ServerConnection.cpp | 6 +- src/lib/gui/core/ServerConnection.h | 8 +- src/lib/gui/core/ServerMessage.cpp | 6 +- src/lib/gui/core/ServerMessage.h | 6 +- src/lib/gui/core/WaylandWarnings.cpp | 8 +- src/lib/gui/core/WaylandWarnings.h | 6 +- src/lib/gui/diagnostic.cpp | 6 +- src/lib/gui/diagnostic.h | 4 +- src/lib/gui/dialogs/SettingsDialog.cpp | 10 +- src/lib/gui/dialogs/SettingsDialog.h | 12 +- src/lib/gui/dialogs/SettingsDialogBase.ui | 2 +- src/lib/gui/dialogs/UpgradeDialog.cpp | 4 +- src/lib/gui/dialogs/UpgradeDialog.h | 2 +- src/lib/gui/dotenv.cpp | 6 +- src/lib/gui/dotenv.h | 6 +- src/lib/gui/ipc/IQIpcClient.cpp | 2 +- src/lib/gui/ipc/IQIpcClient.h | 6 +- src/lib/gui/ipc/IpcReader.cpp | 4 +- src/lib/gui/ipc/IpcReader.h | 2 +- src/lib/gui/ipc/QDataStreamProxy.h | 4 +- src/lib/gui/ipc/QIpcClient.cpp | 4 +- src/lib/gui/ipc/QIpcClient.h | 4 +- src/lib/gui/license/LicenseHandler.cpp | 10 +- src/lib/gui/license/LicenseHandler.h | 10 +- src/lib/gui/license/license_notices.cpp | 10 +- src/lib/gui/license/license_notices.h | 10 +- src/lib/gui/license/license_utils.cpp | 24 +-- src/lib/gui/license/license_utils.h | 10 +- src/lib/gui/messages.cpp | 28 ++-- src/lib/gui/messages.h | 6 +- src/lib/gui/paths.h | 8 +- src/lib/gui/proxy/QProcessProxy.cpp | 6 +- src/lib/gui/proxy/QProcessProxy.h | 6 +- src/lib/gui/proxy/QSettingsProxy.cpp | 10 +- src/lib/gui/proxy/QSettingsProxy.h | 6 +- src/lib/gui/string_utils.h | 2 +- src/lib/gui/style_utils.h | 6 +- src/lib/gui/styles.h | 6 +- src/lib/gui/tls/TlsCertificate.cpp | 14 +- src/lib/gui/tls/TlsCertificate.h | 2 +- src/lib/gui/tls/TlsFingerprint.cpp | 2 +- src/lib/gui/tls/TlsFingerprint.h | 2 +- src/lib/gui/tls/TlsUtility.cpp | 10 +- src/lib/gui/tls/TlsUtility.h | 8 +- src/lib/gui/validators/AliasValidator.cpp | 2 +- src/lib/gui/validators/AliasValidator.h | 2 +- .../gui/validators/ComputerNameValidator.cpp | 2 +- .../gui/validators/ComputerNameValidator.h | 2 +- .../gui/validators/EmptyStringValidator.cpp | 2 +- src/lib/gui/validators/EmptyStringValidator.h | 2 +- src/lib/gui/validators/IStringValidator.cpp | 2 +- src/lib/gui/validators/IStringValidator.h | 2 +- src/lib/gui/validators/LineEditValidator.cpp | 4 +- src/lib/gui/validators/LineEditValidator.h | 2 +- .../ScreenDuplicationsValidator.cpp | 2 +- .../validators/ScreenDuplicationsValidator.h | 2 +- .../gui/validators/ScreenNameValidator.cpp | 2 +- src/lib/gui/validators/ScreenNameValidator.h | 2 +- src/lib/gui/validators/SpacesValidator.cpp | 2 +- src/lib/gui/validators/SpacesValidator.h | 2 +- src/lib/gui/validators/ValidationError.cpp | 4 +- src/lib/gui/validators/ValidationError.h | 2 +- src/lib/gui/widgets/ClientStateLabel.cpp | 6 +- src/lib/gui/widgets/ClientStateLabel.h | 6 +- src/lib/gui/widgets/ServerStateLabel.cpp | 8 +- src/lib/gui/widgets/ServerStateLabel.h | 6 +- src/lib/io/CMakeLists.txt | 2 +- src/lib/io/IStream.h | 6 +- src/lib/io/StreamBuffer.cpp | 2 +- src/lib/io/StreamBuffer.h | 2 +- src/lib/io/StreamFilter.cpp | 6 +- src/lib/io/StreamFilter.h | 10 +- src/lib/io/XIO.cpp | 2 +- src/lib/io/XIO.h | 2 +- src/lib/ipc/CMakeLists.txt | 4 +- src/lib/ipc/IpcClient.cpp | 2 +- src/lib/ipc/IpcClient.h | 2 +- src/lib/ipc/IpcClientProxy.cpp | 6 +- src/lib/ipc/IpcClientProxy.h | 8 +- src/lib/ipc/IpcLogOutputter.cpp | 2 +- src/lib/ipc/IpcLogOutputter.h | 2 +- src/lib/ipc/IpcMessage.cpp | 2 +- src/lib/ipc/IpcMessage.h | 2 +- src/lib/ipc/IpcServer.cpp | 4 +- src/lib/ipc/IpcServer.h | 2 +- src/lib/ipc/IpcServerProxy.cpp | 6 +- src/lib/ipc/IpcServerProxy.h | 8 +- src/lib/ipc/IpcSettingMessage.cpp | 2 +- src/lib/ipc/IpcSettingMessage.h | 2 +- src/lib/license/CMakeLists.txt | 2 +- src/lib/license/ILicense.h | 6 +- src/lib/license/License.cpp | 6 +- src/lib/license/License.h | 6 +- src/lib/license/Product.cpp | 4 +- src/lib/license/Product.h | 2 +- src/lib/license/ProductEdition.h | 2 +- src/lib/license/SerialKey.h | 6 +- src/lib/license/SerialKeyType.cpp | 4 +- src/lib/license/SerialKeyType.h | 2 +- src/lib/license/parse_serial_key.cpp | 6 +- src/lib/license/parse_serial_key.h | 6 +- src/lib/mt/CMakeLists.txt | 2 +- src/lib/mt/CondVar.cpp | 2 +- src/lib/mt/CondVar.h | 2 +- src/lib/mt/Lock.cpp | 2 +- src/lib/mt/Lock.h | 2 +- src/lib/mt/Mutex.cpp | 2 +- src/lib/mt/Mutex.h | 2 +- src/lib/mt/Thread.cpp | 4 +- src/lib/mt/Thread.h | 2 +- src/lib/mt/XMT.cpp | 2 +- src/lib/mt/XMT.h | 2 +- src/lib/mt/XThread.h | 2 +- src/lib/net/CMakeLists.txt | 2 +- src/lib/net/IDataSocket.cpp | 2 +- src/lib/net/IDataSocket.h | 4 +- src/lib/net/IListenSocket.h | 2 +- src/lib/net/ISocket.h | 2 +- src/lib/net/ISocketFactory.h | 2 +- src/lib/net/ISocketMultiplexerJob.h | 2 +- src/lib/net/InverseSockets/AutoArchSocket.cpp | 2 +- src/lib/net/InverseSockets/AutoArchSocket.h | 2 +- .../InverseSockets/InverseClientSocket.cpp | 2 +- .../net/InverseSockets/InverseClientSocket.h | 2 +- .../InverseSockets/InverseServerSocket.cpp | 2 +- .../net/InverseSockets/InverseServerSocket.h | 2 +- .../InverseSockets/InverseSocketFactory.cpp | 2 +- .../net/InverseSockets/InverseSocketFactory.h | 2 +- .../net/InverseSockets/SecureClientSocket.cpp | 2 +- .../net/InverseSockets/SecureClientSocket.h | 4 +- .../net/InverseSockets/SecureServerSocket.cpp | 10 +- .../net/InverseSockets/SecureServerSocket.h | 2 +- src/lib/net/InverseSockets/SslApi.cpp | 14 +- src/lib/net/InverseSockets/SslApi.h | 6 +- src/lib/net/InverseSockets/SslLogger.cpp | 2 +- src/lib/net/InverseSockets/SslLogger.h | 2 +- src/lib/net/NetworkAddress.cpp | 2 +- src/lib/net/NetworkAddress.h | 2 +- src/lib/net/SecureListenSocket.cpp | 10 +- src/lib/net/SecureListenSocket.h | 2 +- src/lib/net/SecureSocket.cpp | 12 +- src/lib/net/SecureSocket.h | 2 +- src/lib/net/SocketMultiplexer.cpp | 2 +- src/lib/net/SocketMultiplexer.h | 2 +- src/lib/net/TCPListenSocket.cpp | 2 +- src/lib/net/TCPListenSocket.h | 2 +- src/lib/net/TCPSocket.cpp | 10 +- src/lib/net/TCPSocket.h | 2 +- src/lib/net/TCPSocketFactory.cpp | 2 +- src/lib/net/TCPSocketFactory.h | 2 +- src/lib/net/TSocketMultiplexerMethodJob.h | 2 +- src/lib/net/XSocket.cpp | 4 +- src/lib/net/XSocket.h | 2 +- src/lib/platform/CMakeLists.txt | 4 +- src/lib/platform/EiEventQueueBuffer.cpp | 6 +- src/lib/platform/EiEventQueueBuffer.h | 8 +- src/lib/platform/EiKeyState.cpp | 16 +- src/lib/platform/EiKeyState.h | 8 +- src/lib/platform/EiScreen.cpp | 22 +-- src/lib/platform/EiScreen.h | 10 +- src/lib/platform/IMSWindowsClipboardFacade.h | 2 +- src/lib/platform/IOSXKeyResource.cpp | 2 +- src/lib/platform/IOSXKeyResource.h | 4 +- src/lib/platform/MSWindowsClipboard.cpp | 10 +- src/lib/platform/MSWindowsClipboard.h | 16 +- .../MSWindowsClipboardAnyTextConverter.cpp | 2 +- .../MSWindowsClipboardAnyTextConverter.h | 2 +- .../MSWindowsClipboardBitmapConverter.cpp | 2 +- .../MSWindowsClipboardBitmapConverter.h | 2 +- src/lib/platform/MSWindowsClipboardFacade.cpp | 2 +- src/lib/platform/MSWindowsClipboardFacade.h | 4 +- .../MSWindowsClipboardHTMLConverter.cpp | 8 +- .../MSWindowsClipboardHTMLConverter.h | 2 +- .../MSWindowsClipboardTextConverter.cpp | 2 +- .../MSWindowsClipboardTextConverter.h | 2 +- .../MSWindowsClipboardUTF16Converter.cpp | 2 +- .../MSWindowsClipboardUTF16Converter.h | 2 +- src/lib/platform/MSWindowsDebugOutputter.cpp | 2 +- src/lib/platform/MSWindowsDebugOutputter.h | 2 +- src/lib/platform/MSWindowsDesks.cpp | 104 ++++++------- src/lib/platform/MSWindowsDesks.h | 14 +- src/lib/platform/MSWindowsDropTarget.cpp | 2 +- src/lib/platform/MSWindowsDropTarget.h | 2 +- .../platform/MSWindowsEventQueueBuffer.cpp | 4 +- src/lib/platform/MSWindowsEventQueueBuffer.h | 2 +- src/lib/platform/MSWindowsHook.cpp | 44 +++--- src/lib/platform/MSWindowsHook.h | 4 +- src/lib/platform/MSWindowsKeyState.cpp | 18 +-- src/lib/platform/MSWindowsKeyState.h | 12 +- src/lib/platform/MSWindowsPowerManager.cpp | 2 +- src/lib/platform/MSWindowsPowerManager.h | 2 +- src/lib/platform/MSWindowsScreen.cpp | 71 ++++----- src/lib/platform/MSWindowsScreen.h | 14 +- src/lib/platform/MSWindowsScreenSaver.cpp | 2 +- src/lib/platform/MSWindowsScreenSaver.h | 4 +- src/lib/platform/MSWindowsSession.cpp | 4 +- src/lib/platform/MSWindowsSession.h | 2 +- src/lib/platform/MSWindowsUtil.cpp | 6 +- src/lib/platform/MSWindowsUtil.h | 2 +- src/lib/platform/MSWindowsWatchdog.cpp | 37 ++--- src/lib/platform/MSWindowsWatchdog.h | 8 +- src/lib/platform/OSXAutoTypes.h | 2 +- src/lib/platform/OSXClipboard.cpp | 4 +- src/lib/platform/OSXClipboard.h | 8 +- .../OSXClipboardAnyBitmapConverter.cpp | 2 +- .../platform/OSXClipboardAnyBitmapConverter.h | 2 +- .../platform/OSXClipboardAnyTextConverter.cpp | 2 +- .../platform/OSXClipboardAnyTextConverter.h | 2 +- src/lib/platform/OSXClipboardBMPConverter.cpp | 2 +- src/lib/platform/OSXClipboardBMPConverter.h | 2 +- .../platform/OSXClipboardHTMLConverter.cpp | 2 +- src/lib/platform/OSXClipboardHTMLConverter.h | 2 +- .../platform/OSXClipboardTextConverter.cpp | 2 +- src/lib/platform/OSXClipboardTextConverter.h | 2 +- .../platform/OSXClipboardUTF16Converter.cpp | 2 +- src/lib/platform/OSXClipboardUTF16Converter.h | 2 +- src/lib/platform/OSXClipboardUTF8Converter.h | 2 +- src/lib/platform/OSXDragSimulator.h | 2 +- src/lib/platform/OSXDragSimulator.m | 2 +- src/lib/platform/OSXDragView.h | 2 +- src/lib/platform/OSXDragView.m | 2 +- src/lib/platform/OSXEventQueueBuffer.cpp | 2 +- src/lib/platform/OSXEventQueueBuffer.h | 2 +- src/lib/platform/OSXKeyState.cpp | 22 +-- src/lib/platform/OSXKeyState.h | 24 +-- src/lib/platform/OSXMediaKeySupport.h | 4 +- src/lib/platform/OSXMediaKeySupport.m | 2 +- src/lib/platform/OSXPasteboardPeeker.h | 2 +- src/lib/platform/OSXPasteboardPeeker.m | 2 +- src/lib/platform/OSXPowerManager.cpp | 4 +- src/lib/platform/OSXPowerManager.h | 2 +- src/lib/platform/OSXScreen.h | 26 ++-- src/lib/platform/OSXScreen.mm | 58 +++---- src/lib/platform/OSXScreenSaver.cpp | 4 +- src/lib/platform/OSXScreenSaver.h | 4 +- src/lib/platform/OSXScreenSaverControl.h | 2 +- src/lib/platform/OSXScreenSaverUtil.h | 2 +- src/lib/platform/OSXScreenSaverUtil.m | 2 +- src/lib/platform/OSXUchrKeyResource.cpp | 4 +- src/lib/platform/OSXUchrKeyResource.h | 4 +- src/lib/platform/PortalInputCapture.cpp | 6 +- src/lib/platform/PortalInputCapture.h | 6 +- src/lib/platform/PortalRemoteDesktop.cpp | 6 +- src/lib/platform/PortalRemoteDesktop.h | 6 +- src/lib/platform/XWindowsClipboard.cpp | 2 +- src/lib/platform/XWindowsClipboard.h | 8 +- .../XWindowsClipboardAnyBitmapConverter.cpp | 2 +- .../XWindowsClipboardAnyBitmapConverter.h | 2 +- .../XWindowsClipboardBMPConverter.cpp | 2 +- .../platform/XWindowsClipboardBMPConverter.h | 2 +- .../XWindowsClipboardHTMLConverter.cpp | 2 +- .../platform/XWindowsClipboardHTMLConverter.h | 2 +- .../XWindowsClipboardTextConverter.cpp | 2 +- .../platform/XWindowsClipboardTextConverter.h | 2 +- .../XWindowsClipboardUCS2Converter.cpp | 2 +- .../platform/XWindowsClipboardUCS2Converter.h | 2 +- .../XWindowsClipboardUTF8Converter.cpp | 2 +- .../platform/XWindowsClipboardUTF8Converter.h | 2 +- src/lib/platform/XWindowsEventQueueBuffer.cpp | 4 +- src/lib/platform/XWindowsEventQueueBuffer.h | 4 +- src/lib/platform/XWindowsKeyState.cpp | 31 ++-- src/lib/platform/XWindowsKeyState.h | 34 ++--- src/lib/platform/XWindowsPowerManager.cpp | 2 +- src/lib/platform/XWindowsPowerManager.h | 2 +- src/lib/platform/XWindowsScreen.cpp | 32 ++-- src/lib/platform/XWindowsScreen.h | 16 +- src/lib/platform/XWindowsScreenSaver.cpp | 6 +- src/lib/platform/XWindowsScreenSaver.h | 6 +- src/lib/platform/XWindowsUtil.cpp | 12 +- src/lib/platform/XWindowsUtil.h | 4 +- src/lib/platform/{synwinhk.h => dfwhook.h} | 36 ++--- src/lib/platform/wayland.h | 6 +- src/lib/server/BaseClientProxy.cpp | 2 +- src/lib/server/BaseClientProxy.h | 8 +- src/lib/server/CMakeLists.txt | 4 +- src/lib/server/ClientListener.cpp | 6 +- src/lib/server/ClientListener.h | 2 +- src/lib/server/ClientProxy.cpp | 8 +- src/lib/server/ClientProxy.h | 10 +- src/lib/server/ClientProxy1_0.cpp | 8 +- src/lib/server/ClientProxy1_0.h | 9 +- src/lib/server/ClientProxy1_1.cpp | 8 +- src/lib/server/ClientProxy1_1.h | 5 +- src/lib/server/ClientProxy1_2.cpp | 6 +- src/lib/server/ClientProxy1_2.h | 5 +- src/lib/server/ClientProxy1_3.cpp | 6 +- src/lib/server/ClientProxy1_3.h | 5 +- src/lib/server/ClientProxy1_4.cpp | 6 +- src/lib/server/ClientProxy1_4.h | 4 +- src/lib/server/ClientProxy1_5.cpp | 10 +- src/lib/server/ClientProxy1_5.h | 4 +- src/lib/server/ClientProxy1_6.cpp | 10 +- src/lib/server/ClientProxy1_6.h | 4 +- src/lib/server/ClientProxy1_7.cpp | 8 +- src/lib/server/ClientProxy1_7.h | 4 +- src/lib/server/ClientProxy1_8.cpp | 10 +- src/lib/server/ClientProxy1_8.h | 4 +- src/lib/server/ClientProxyUnknown.cpp | 12 +- src/lib/server/ClientProxyUnknown.h | 10 +- src/lib/server/Config.cpp | 50 +++--- src/lib/server/Config.h | 30 ++-- src/lib/server/InputFilter.cpp | 43 +++--- src/lib/server/InputFilter.h | 10 +- src/lib/server/PrimaryClient.cpp | 10 +- src/lib/server/PrimaryClient.h | 12 +- src/lib/server/Server.cpp | 33 ++-- src/lib/server/Server.h | 32 ++-- src/lib/utils/string_utils.h | 6 +- src/test/CMakeLists.txt | 4 +- src/test/integtests/CMakeLists.txt | 2 +- .../{synergy => deskflow}/ConfigTests.cpp | 6 +- src/test/integtests/gui/MainWindowTests.cpp | 2 +- .../gui/core/CommandProcessTests.cpp | 2 +- .../integtests/gui/core/CoreToolTests.cpp | 2 +- src/test/integtests/gui/dotenv_tests.cpp | 6 +- src/test/integtests/ipc/IpcTests.cpp | 2 +- src/test/integtests/main.cpp | 4 +- src/test/integtests/net/NetworkTests.cpp | 38 ++--- .../platform/MSWindowsClipboardTests.cpp | 22 +-- .../platform/MSWindowsKeyStateTests.cpp | 8 +- .../integtests/platform/OSXClipboardTests.cpp | 16 +- .../integtests/platform/OSXKeyStateTests.cpp | 12 +- .../integtests/platform/OSXScreenTests.cpp | 2 +- .../platform/XWindowsClipboardTests.cpp | 16 +- .../platform/XWindowsKeyStateTests.cpp | 10 +- .../platform/XWindowsScreenSaverTests.cpp | 4 +- .../platform/XWindowsScreenTests.cpp | 4 +- src/test/mock/{synergy => deskflow}/MockApp.h | 6 +- .../{synergy => deskflow}/MockArgParser.h | 4 +- .../{synergy => deskflow}/MockEventQueue.h | 2 +- .../mock/{synergy => deskflow}/MockKeyMap.h | 6 +- .../mock/{synergy => deskflow}/MockKeyState.h | 12 +- .../mock/{synergy => deskflow}/MockScreen.h | 8 +- src/test/mock/io/MockStream.h | 4 +- src/test/mock/ipc/MockIpcServer.h | 2 +- src/test/mock/server/MockConfig.h | 2 +- src/test/mock/server/MockInputFilter.h | 2 +- src/test/mock/server/MockPrimaryClient.h | 2 +- src/test/mock/server/MockServer.h | 2 +- src/test/shared/ExitTimeout.cpp | 6 +- src/test/shared/ExitTimeout.h | 6 +- src/test/shared/TestEventQueue.cpp | 2 +- src/test/shared/TestEventQueue.h | 2 +- src/test/shared/gui/TestQtCoreApp.h | 2 +- src/test/shared/gui/TestQtFullApp.h | 2 +- src/test/shared/gui/mocks/AppConfigMock.h | 8 +- src/test/shared/gui/mocks/ServerConfigMock.h | 4 +- src/test/shared/undef_x11_macros.h | 2 +- src/test/unittests/CMakeLists.txt | 2 +- src/test/unittests/arch/IArchStringTests.cpp | 2 +- .../arch/unix/ArchNetworkBSDTests.cpp | 2 +- src/test/unittests/base/PathTests.cpp | 4 +- src/test/unittests/base/StringTests.cpp | 4 +- src/test/unittests/base/UnicodeTests.cpp | 2 +- .../{synergy => deskflow}/ArgParserTests.cpp | 26 ++-- .../ClientArgsParsingTests.cpp | 26 ++-- .../ClipboardChunkTests.cpp | 6 +- .../{synergy => deskflow}/ClipboardTests.cpp | 46 +++--- .../DeprecatedArgsParsingTests.cpp | 6 +- .../GenericArgsParsingTests.cpp | 14 +- .../{synergy => deskflow}/IKeyStateTests.cpp | 2 +- .../{synergy => deskflow}/KeyMapTests.cpp | 8 +- .../{synergy => deskflow}/KeyStateTests.cpp | 38 ++--- .../ProtocolUtilTests.cpp | 4 +- .../{synergy => deskflow}/ServerAppTests.cpp | 10 +- .../ServerArgsParsingTests.cpp | 24 +-- .../X11LayoutParserTests.cpp | 4 +- .../languages/LanguageManagerTests.cpp | 14 +- src/test/unittests/gui/LoggerTests.cpp | 12 +- .../unittests/gui/VersionCheckerTests.cpp | 2 +- src/test/unittests/gui/byte_utils_tests.cpp | 4 +- .../unittests/gui/config/AppConfigTests.cpp | 8 +- .../gui/config/ConfigScopesTests.cpp | 6 +- src/test/unittests/gui/config/ScreenTests.cpp | 4 +- .../gui/core/ClientConnectionTests.cpp | 4 +- .../unittests/gui/core/CoreProcessTests.cpp | 6 +- .../gui/core/ServerConnectionTests.cpp | 4 +- .../gui/core/WaylandWarningsTests.cpp | 6 +- .../gui/dialogs/SettingsDialogTests.cpp | 6 +- .../unittests/gui/ipc/QIpcClientTests.cpp | 2 +- .../gui/license/LicenseHandlerTests.cpp | 4 +- .../gui/license/license_notices_tests.cpp | 6 +- .../unittests/ipc/IpcLogOutputterTests.cpp | 4 +- .../unittests/ipc/IpcSettingMessageTests.cpp | 2 +- src/test/unittests/main.cpp | 4 +- .../OSXClipboardUTF8ConverterTest.cpp | 2 +- .../unittests/platform/OSXKeyStateTests.cpp | 10 +- .../platform/XWindowsClipboardTests.cpp | 2 +- src/test/unittests/server/ConfigTests.cpp | 10 +- src/test/unittests/shared/LicenseTests.cpp | 4 +- src/test/unittests/shared/ProductTests.cpp | 8 +- .../unittests/shared/SerialKeyTypeTests.cpp | 2 +- 839 files changed, 2872 insertions(+), 3051 deletions(-) delete mode 100644 .github/FUNDING.yml delete mode 100644 .github/workflows/issue-check-support.yml rename doc/{synergy.conf.example => deskflow.conf.example} (95%) rename doc/{synergy.conf.example-advanced => deskflow.conf.example-advanced} (97%) rename doc/{synergy.conf.example-basic => deskflow.conf.example-basic} (96%) rename res/{synergy.ico => deskflow.ico} (100%) rename res/{synergy.png => deskflow.png} (100%) rename res/{synergy.svg => deskflow.svg} (100%) rename res/dist/flatpak/{synergy.yml => deskflow.yml} (88%) rename res/dist/linux/{synergy.desktop => deskflow.desktop} (78%) rename res/dist/macos/bundle/{Synergy.app => Deskflow.app}/Contents/Info.plist.in (71%) create mode 100644 res/dist/macos/bundle/Deskflow.app/Contents/PkgInfo rename res/dist/macos/bundle/{Synergy.app => Deskflow.app}/Contents/Resources/.background.tiff (100%) rename res/dist/macos/bundle/{Synergy.app/Contents/Resources/Synergy.icns => Deskflow.app/Contents/Resources/Deskflow.icns} (100%) rename res/dist/macos/bundle/{Synergy.app => Deskflow.app}/Contents/Resources/VolumeIcon.icns (100%) delete mode 100644 res/dist/macos/bundle/Synergy.app/Contents/PkgInfo rename res/dist/wix/{Synergy.sln => Deskflow.sln} (89%) rename res/dist/wix/{Synergy.wixproj => Deskflow.wixproj} (76%) rename res/dist/wix/{SynergyBrowseDlg.wxs => DeskflowBrowseDlg.wxs} (96%) create mode 100644 res/dist/wix/DeskflowDlgSequence.wxs rename res/dist/wix/{SynergyInstallDlg.wxs => DeskflowInstallDlg.wxs} (85%) rename res/dist/wix/{SynergyMaintenanceTypeDlg.wxs => DeskflowMaintenanceTypeDlg.wxs} (95%) rename res/dist/wix/{SynergyVerifyReadyDlg.wxs => DeskflowVerifyReadyDlg.wxs} (98%) rename res/dist/wix/{SynergyWelcome.wxs => DeskflowWelcome.wxs} (76%) delete mode 100644 res/dist/wix/SynergyDlgSequence.wxs rename res/gui/{Synergy.qrc => Deskflow.qrc} (69%) rename res/gui/icons/16x16/{synergy.png => deskflow.png} (100%) rename res/gui/icons/256x256/{synergy.ico => deskflow.ico} (100%) rename res/gui/icons/64x64/{synergy-dark.png => deskflow-dark.png} (100%) rename res/gui/icons/64x64/{synergy-light.png => deskflow-light.png} (100%) rename res/gui/mac/{Synergy.icns => Deskflow.icns} (100%) delete mode 100644 res/gui/mac/QSynergy.icns create mode 100644 res/gui/win/Deskflow.rc delete mode 100644 res/gui/win/Synergy.rc rename res/openssl/{synergy.conf => deskflow.conf} (97%) rename src/cmd/{synergy-core => deskflow-core}/CMakeLists.txt (87%) rename src/cmd/{synergy-core/synergy-core.cpp => deskflow-core/deskflow-core.cpp} (79%) rename src/cmd/{synergy-core/synergy-core.exe.manifest => deskflow-core/deskflow-core.exe.manifest} (100%) rename src/cmd/{syntool => deskflow-legacy}/CMakeLists.txt (87%) rename src/cmd/{syntool/syntool.cpp => deskflow-legacy/deskflow-legacy.cpp} (92%) rename src/cmd/{synergyc => deskflowc}/.gitignore (100%) rename src/cmd/{synergyc => deskflowc}/CMakeLists.txt (91%) rename src/cmd/{synergyc => deskflowc}/MSWindowsClientTaskBarReceiver.cpp (99%) rename src/cmd/{synergyc => deskflowc}/MSWindowsClientTaskBarReceiver.h (95%) rename src/cmd/{synergyc => deskflowc}/OSXClientTaskBarReceiver.cpp (96%) rename src/cmd/{synergyc => deskflowc}/OSXClientTaskBarReceiver.h (92%) rename src/cmd/{synergyc => deskflowc}/XWindowsClientTaskBarReceiver.cpp (96%) rename src/cmd/{synergyc => deskflowc}/XWindowsClientTaskBarReceiver.h (94%) rename src/cmd/{synergyc/synergyc.exe.manifest => deskflowc/deskflow.exe.manifest} (100%) rename src/cmd/{synergyc/synergyc.cpp => deskflowc/deskflowc.cpp} (94%) rename src/cmd/{synergyc/synergyc.ico => deskflowc/deskflowc.ico} (100%) rename src/cmd/{synergyc/synergyc.rc => deskflowc/deskflowc.rc} (92%) rename src/cmd/{synergyc => deskflowc}/resource.h (95%) rename src/cmd/{synergyc => deskflowc}/tb_error.ico (100%) rename src/cmd/{synergyc => deskflowc}/tb_idle.ico (100%) rename src/cmd/{synergyc => deskflowc}/tb_run.ico (100%) rename src/cmd/{synergyc => deskflowc}/tb_wait.ico (100%) rename src/cmd/{synergyd => deskflowd}/CMakeLists.txt (92%) rename src/cmd/{synergyd/synergyd.cpp => deskflowd/deskflowd.cpp} (92%) rename src/cmd/{synergys => deskflows}/.gitignore (100%) rename src/cmd/{synergys => deskflows}/CMakeLists.txt (91%) rename src/cmd/{synergys => deskflows}/MSWindowsServerTaskBarReceiver.cpp (98%) rename src/cmd/{synergys => deskflows}/MSWindowsServerTaskBarReceiver.h (95%) rename src/cmd/{synergys => deskflows}/OSXServerTaskBarReceiver.cpp (96%) rename src/cmd/{synergys => deskflows}/OSXServerTaskBarReceiver.h (92%) rename src/cmd/{synergys => deskflows}/XWindowsServerTaskBarReceiver.cpp (96%) rename src/cmd/{synergys => deskflows}/XWindowsServerTaskBarReceiver.h (94%) rename src/cmd/{synergys/synergys.cpp => deskflows/deskflows.cpp} (94%) rename src/cmd/{synergys/synergys.exe.manifest => deskflows/deskflows.exe.manifest} (100%) rename src/cmd/{synergys/synergys.ico => deskflows/deskflows.ico} (100%) rename src/cmd/{synergys/synergys.rc => deskflows/deskflows.rc} (88%) rename src/cmd/{synergys => deskflows}/resource.h (90%) rename src/cmd/{synergys => deskflows}/tb_error.ico (100%) rename src/cmd/{synergys => deskflows}/tb_idle.ico (100%) rename src/cmd/{synergys => deskflows}/tb_run.ico (100%) rename src/cmd/{synergys => deskflows}/tb_wait.ico (100%) rename src/gui/src/{QSynergyApplication.cpp => DeskflowApplication.cpp} (85%) rename src/gui/src/{QSynergyApplication.h => DeskflowApplication.h} (79%) rename src/lib/{synergy => deskflow}/App.cpp (94%) rename src/lib/{synergy => deskflow}/App.h (95%) rename src/lib/{synergy => deskflow}/AppUtil.cpp (93%) rename src/lib/{synergy => deskflow}/AppUtil.h (90%) rename src/lib/{synergy => deskflow}/ArgParser.cpp (93%) rename src/lib/{synergy => deskflow}/ArgParser.h (76%) rename src/lib/{synergy => deskflow}/ArgsBase.cpp (88%) rename src/lib/{synergy => deskflow}/ArgsBase.h (96%) rename src/lib/{synergy => deskflow}/CMakeLists.txt (81%) rename src/lib/{synergy => deskflow}/Chunk.cpp (91%) rename src/lib/{synergy => deskflow}/Chunk.h (95%) rename src/lib/{synergy => deskflow}/ClientApp.cpp (94%) rename src/lib/{synergy => deskflow}/ClientApp.h (86%) rename src/lib/{synergy => deskflow}/ClientAppArguments.md (96%) rename src/lib/{synergy => deskflow}/ClientArgs.cpp (88%) rename src/lib/{synergy => deskflow}/ClientArgs.h (84%) rename src/lib/{synergy => deskflow}/ClientTaskBarReceiver.cpp (89%) rename src/lib/{synergy => deskflow}/ClientTaskBarReceiver.h (95%) rename src/lib/{synergy => deskflow}/Clipboard.cpp (95%) rename src/lib/{synergy => deskflow}/Clipboard.h (95%) rename src/lib/{synergy => deskflow}/ClipboardChunk.cpp (91%) rename src/lib/{synergy => deskflow}/ClipboardChunk.h (82%) rename src/lib/{synergy => deskflow}/Config.cpp (96%) rename src/lib/{synergy => deskflow}/Config.h (94%) rename src/lib/{synergy => deskflow}/DaemonApp.cpp (93%) rename src/lib/{synergy => deskflow}/DaemonApp.h (96%) rename src/lib/{synergy => deskflow}/DisplayInvalidException.h (83%) rename src/lib/{synergy => deskflow}/DragInformation.cpp (97%) rename src/lib/{synergy => deskflow}/DragInformation.h (97%) rename src/lib/{synergy => deskflow}/DropHelper.cpp (95%) rename src/lib/{synergy => deskflow}/DropHelper.h (90%) rename src/lib/{synergy => deskflow}/FileChunk.cpp (91%) rename src/lib/{synergy => deskflow}/FileChunk.h (79%) rename src/lib/{synergy => deskflow}/IApp.h (88%) rename src/lib/{synergy => deskflow}/IAppUtil.h (93%) rename src/lib/{synergy => deskflow}/IClient.h (96%) rename src/lib/{synergy => deskflow}/IClipboard.cpp (98%) rename src/lib/{synergy => deskflow}/IClipboard.h (99%) rename src/lib/{synergy => deskflow}/IKeyState.cpp (97%) rename src/lib/{synergy => deskflow}/IKeyState.h (98%) rename src/lib/{synergy => deskflow}/INode.h (93%) rename src/lib/{synergy => deskflow}/IPlatformScreen.cpp (88%) rename src/lib/{synergy => deskflow}/IPlatformScreen.h (96%) rename src/lib/{synergy => deskflow}/IPrimaryScreen.cpp (96%) rename src/lib/{synergy => deskflow}/IPrimaryScreen.h (97%) rename src/lib/{synergy => deskflow}/IScreen.h (95%) rename src/lib/{synergy => deskflow}/IScreenSaver.h (97%) rename src/lib/{synergy => deskflow}/ISecondaryScreen.h (95%) rename src/lib/{synergy => deskflow}/KeyMap.cpp (99%) rename src/lib/{synergy => deskflow}/KeyMap.h (98%) rename src/lib/{synergy => deskflow}/KeyState.cpp (97%) rename src/lib/{synergy => deskflow}/KeyState.h (89%) rename src/lib/{synergy => deskflow}/PacketStreamFilter.cpp (96%) rename src/lib/{synergy => deskflow}/PacketStreamFilter.h (92%) rename src/lib/{synergy => deskflow}/PlatformScreen.cpp (92%) rename src/lib/{synergy => deskflow}/PlatformScreen.h (89%) rename src/lib/{synergy => deskflow}/ProtocolUtil.cpp (93%) rename src/lib/{synergy => deskflow}/ProtocolUtil.h (75%) rename src/lib/{synergy => deskflow}/Screen.cpp (98%) rename src/lib/{synergy => deskflow}/Screen.h (96%) rename src/lib/{synergy => deskflow}/ServerApp.cpp (92%) rename src/lib/{synergy => deskflow}/ServerApp.h (83%) rename src/lib/{synergy => deskflow}/ServerAppArguments.md (95%) rename src/lib/{synergy => deskflow}/ServerArgs.cpp (88%) rename src/lib/{synergy => deskflow}/ServerArgs.h (86%) rename src/lib/{synergy => deskflow}/ServerTaskBarReceiver.cpp (88%) rename src/lib/{synergy => deskflow}/ServerTaskBarReceiver.h (94%) rename src/lib/{synergy => deskflow}/StreamChunker.cpp (93%) rename src/lib/{synergy => deskflow}/StreamChunker.h (92%) rename src/lib/{synergy => deskflow}/ToolApp.cpp (90%) rename src/lib/{synergy => deskflow}/ToolApp.h (88%) rename src/lib/{synergy => deskflow}/ToolArgs.cpp (90%) rename src/lib/{synergy => deskflow}/ToolArgs.h (94%) rename src/lib/{synergy/XSynergy.cpp => deskflow/XDeskflow.cpp} (89%) rename src/lib/{synergy/XSynergy.h => deskflow/XDeskflow.h} (87%) rename src/lib/{synergy => deskflow}/XScreen.cpp (94%) rename src/lib/{synergy => deskflow}/XScreen.h (97%) rename src/lib/{synergy => deskflow}/clipboard_types.h (96%) rename src/lib/{synergy => deskflow}/key_types.cpp (98%) rename src/lib/{synergy => deskflow}/key_types.h (99%) rename src/lib/{synergy => deskflow}/languages/LanguageManager.cpp (96%) rename src/lib/{synergy => deskflow}/languages/LanguageManager.h (89%) rename src/lib/{synergy => deskflow}/mouse_types.h (96%) rename src/lib/{synergy => deskflow}/option_types.h (98%) rename src/lib/{synergy => deskflow}/protocol_types.cpp (92%) rename src/lib/{synergy => deskflow}/protocol_types.h (98%) rename src/lib/{synergy => deskflow}/unix/AppUtilUnix.cpp (94%) rename src/lib/{synergy => deskflow}/unix/AppUtilUnix.h (93%) rename src/lib/{synergy/unix/SynergyXkbKeyboard.cpp => deskflow/unix/DeskflowXkbKeyboard.cpp} (81%) rename src/lib/{synergy/unix/SynergyXkbKeyboard.h => deskflow/unix/DeskflowXkbKeyboard.h} (77%) rename src/lib/{synergy => deskflow}/unix/ISO639Table.h (99%) rename src/lib/{synergy => deskflow}/unix/X11LayoutsParser.cpp (98%) rename src/lib/{synergy => deskflow}/unix/X11LayoutsParser.h (97%) rename src/lib/{synergy => deskflow}/win32/AppUtilWindows.cpp (95%) rename src/lib/{synergy => deskflow}/win32/AppUtilWindows.h (95%) rename src/lib/platform/{synwinhk.h => dfwhook.h} (55%) rename src/test/integtests/{synergy => deskflow}/ConfigTests.cpp (96%) rename src/test/mock/{synergy => deskflow}/MockApp.h (91%) rename src/test/mock/{synergy => deskflow}/MockArgParser.h (91%) rename src/test/mock/{synergy => deskflow}/MockEventQueue.h (98%) rename src/test/mock/{synergy => deskflow}/MockKeyMap.h (91%) rename src/test/mock/{synergy => deskflow}/MockKeyState.h (81%) rename src/test/mock/{synergy => deskflow}/MockScreen.h (87%) rename src/test/unittests/{synergy => deskflow}/ArgParserTests.cpp (93%) rename src/test/unittests/{synergy => deskflow}/ClientArgsParsingTests.cpp (89%) rename src/test/unittests/{synergy => deskflow}/ClipboardChunkTests.cpp (94%) rename src/test/unittests/{synergy => deskflow}/ClipboardTests.cpp (88%) rename src/test/unittests/{synergy => deskflow}/DeprecatedArgsParsingTests.cpp (92%) rename src/test/unittests/{synergy => deskflow}/GenericArgsParsingTests.cpp (95%) rename src/test/unittests/{synergy => deskflow}/IKeyStateTests.cpp (85%) rename src/test/unittests/{synergy => deskflow}/KeyMapTests.cpp (98%) rename src/test/unittests/{synergy => deskflow}/KeyStateTests.cpp (93%) rename src/test/unittests/{synergy => deskflow}/ProtocolUtilTests.cpp (99%) rename src/test/unittests/{synergy => deskflow}/ServerAppTests.cpp (90%) rename src/test/unittests/{synergy => deskflow}/ServerArgsParsingTests.cpp (85%) rename src/test/unittests/{synergy => deskflow}/X11LayoutParserTests.cpp (98%) rename src/test/unittests/{synergy => deskflow}/languages/LanguageManagerTests.cpp (81%) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 90b00ec04..000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,12 +0,0 @@ -# These are supported funding model platforms - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -custom: https://symless.com/synergy diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 2a354d3c4..b60ad2b87 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,59 +1,23 @@ name: Bug report -description: If you find a bug in Synergy, please let us know so we can fix it. +description: If you find a bug in Deskflow, please let us know so we can fix it. labels: ["bug", "triage", "unanswered"] body: - type: markdown attributes: - value: Thanks for taking the time to help us improve Synergy. + value: Thanks for taking the time to help us improve Deskflow. - type: dropdown - id: user-type + id: project attributes: - label: What type of Synergy user are you? - description: This will help us understand the context of your issue. + label: Project + description: Are you using Deskflow or a fork/derivative? options: # Empty option to force selection - - - Customer - - Code contributor - - Community user - default: 0 - validations: - required: true - - - type: input - id: ticket-number - attributes: - label: Support ticket number (for customers) - description: | - If you have a support ticket number, please enter it here. - Customers are advised to open a support ticket first: https://symless.com/synergy/contact - This is for customers only (non-customers please ignore this field). - Leave this blank if you do not have a support ticket or if you're not a customer. - validations: - required: false - - - type: checkboxes - id: discussion - attributes: - label: Discussion - description: | - Have you considered starting a discussion instead of reporting a bug? - options: - - label: I want to report a bug (I don't want to start a discussion) - required: true - - - type: dropdown - id: product - attributes: - label: Product name - description: Which Synergy product are you using? - options: - # Empty option to force selection - - - - Synergy 1 - - Synergy 2 - - Synergy 3 + - Deskflow + - Barrier + - Input Leap + - Synergy default: 0 validations: required: true @@ -61,8 +25,8 @@ body: - type: input id: version attributes: - label: Synergy version number - description: You can find the Synergy version number on the about screen. + label: Deskflow version number + description: You can find the Deskflow version number on the about screen. placeholder: 1.2.3 validations: required: true @@ -75,7 +39,8 @@ body: options: - label: Windows - label: macOS - - label: Linux or Unix + - label: Linux + - label: BSD-derived - label: Other validations: required: true @@ -83,7 +48,7 @@ body: - type: textarea id: os-version attributes: - label: OS versions or Linux distros + label: OS versions/distros description: | Please provide the version number of your operating system (OS). If you're using Linux, please provide the name of the distribution. @@ -91,17 +56,18 @@ body: - Windows 11 - macOS 15 - Ubuntu 24.04 + - FreeBSD 14.0 validations: required: true - type: textarea id: config attributes: - label: Synergy configuration + label: Deskflow configuration description: | Please provide a very brief description of your configuration. Let us know the OS of the server/host/primary and the OS of the client/guest/secondary. - This will help us understand how you're using Synergy. + This will help us understand how you're using Deskflow. placeholder: | - Windows 11 server, macOS 15 client - Each computer has a single monitor @@ -118,7 +84,7 @@ body: If you're not sure, please provide as much detail as possible. This will help us understand the problem. placeholder: | - 1. Start Synergy + 1. Start Deskflow 2. Click 'Configure Server' 3. Click 'Apply' validations: @@ -143,6 +109,6 @@ body: - Any ideas about what maybe causing the problem? - Any workarounds that you've discovered? - What other apps are you running? - - Does the issue stop you using Synergy entirely? - - Did restarting Synergy or the computer help? + - Does the issue stop you using Deskflow entirely? + - Did restarting Deskflow or the computer help? - Anything else you can think of? diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 92cfba3d5..e5b17c8fb 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,59 +1,23 @@ name: Feature request -description: Had an idea how to improve Synergy? Share it with us. +description: Had an idea how to improve Deskflow? Share it with us. labels: ["enhancement", "triage", "unanswered"] body: - type: markdown attributes: - value: Thanks for taking the time to help us improve Synergy. + value: Thanks for taking the time to help us improve Deskflow. - type: dropdown - id: user-type + id: project attributes: - label: What type of Synergy user are you? - description: This will help us understand the context of your issue. + label: Project + description: Are you using Deskflow or a fork/derivative? options: # Empty option to force selection - - - Customer - - Code contributor - - Community user - default: 0 - validations: - required: true - - - type: input - id: ticket-number - attributes: - label: Support ticket number (for customers) - description: | - If you have a support ticket number, please enter it here. - Customers are advised to open a support ticket first: https://symless.com/synergy/contact - This is for customers only (non-customers please ignore this field). - Leave this blank if you do not have a support ticket or if you're not a customer. - validations: - required: false - - - type: checkboxes - id: discussion - attributes: - label: Discussion - description: | - Have you considered starting a discussion instead of requesting a feature? - options: - - label: I want to request a feature (I don't want to start a discussion) - required: true - - - type: dropdown - id: product - attributes: - label: Product name - description: Which Synergy product are you using? - options: - # Empty option to force selection - - - - Synergy 1 - - Synergy 2 - - Synergy 3 + - Deskflow + - Barrier + - Input Leap + - Synergy default: 0 validations: required: true @@ -66,7 +30,8 @@ body: options: - label: Windows - label: macOS - - label: Linux or Unix + - label: Linux + - label: BSD-derived - label: Other validations: required: true @@ -74,7 +39,7 @@ body: - type: textarea id: os-version attributes: - label: OS versions or Linux distros + label: OS versions/distros description: | Please provide the version number of your operating system (OS). If you're using Linux, please provide the name of the distribution. @@ -82,17 +47,18 @@ body: - Windows 11 - macOS 15 - Ubuntu 24.04 + - FreeBSD 14.0 validations: required: true - type: textarea id: config attributes: - label: Synergy configuration + label: Deskflow configuration description: | Please provide a very brief description of your configuration. Let us know the OS of the server/host/primary and the OS of the client/guest/secondary. - This will help us understand how you're using Synergy. + This will help us understand how you're using Deskflow. placeholder: | - Windows 11 server, macOS 15 client - Each computer has a single monitor diff --git a/.github/actions/get-version/action.yml b/.github/actions/get-version/action.yml index 95f7c05bf..51acb7dae 100644 --- a/.github/actions/get-version/action.yml +++ b/.github/actions/get-version/action.yml @@ -7,9 +7,9 @@ runs: steps: - run: | if [[ "${{ github.ref }}" == refs/tags/* ]]; then - echo "SYNERGY_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV + echo "DESKFLOW_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV fi if [[ "${{ github.event.inputs.version }}" != "" ]]; then - echo "SYNERGY_VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV + echo "DESKFLOW_VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV fi shell: bash diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 6968bd36f..712669a80 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -123,6 +123,6 @@ jobs: push: true context: . file: ./.github/docker/${{ matrix.os.config-dir }}/Dockerfile - tags: symless/synergy-core:${{ matrix.os.name }} + tags: deskflow/deskflow:${{ matrix.os.name }} build-args: BASE_IMAGE=${{ matrix.os.base-image }} platforms: linux/${{ matrix.os.platform }} diff --git a/.github/workflows/ci-linux.json b/.github/workflows/ci-linux.json index a7b366b55..3e7db5243 100644 --- a/.github/workflows/ci-linux.json +++ b/.github/workflows/ci-linux.json @@ -2,73 +2,73 @@ "distro": [ { "name": "debian-13-amd64", - "container": "symless/synergy-core:debian-13-amd64", + "container": "deskflow/deskflow:debian-13-amd64", "runs-on": "ubuntu-latest", "extra-packages": true }, { "name": "debian-12-arm64", - "container": "symless/synergy-core:debian-12-arm64", + "container": "deskflow/deskflow:debian-12-arm64", "runs-on": "ubuntu-24.04-8-core-arm64", "extra-packages": true }, { "name": "debian-12-amd64", - "container": "symless/synergy-core:debian-12-amd64", + "container": "deskflow/deskflow:debian-12-amd64", "runs-on": "ubuntu-latest", "extra-packages": true }, { "name": "ubuntu-24.04-amd64", - "container": "symless/synergy-core:ubuntu-24.04-amd64", + "container": "deskflow/deskflow:ubuntu-24.04-amd64", "runs-on": "ubuntu-latest", "extra-dep-args": "--meson-no-system libportal --meson-static libportal --subprojects", "extra-cmake-args": "-DSYSTEM_LIBPORTAL=OFF -DSTATIC_LIBPORTAL=ON" }, { "name": "ubuntu-22.04-amd64", - "container": "symless/synergy-core:ubuntu-22.04-amd64", + "container": "deskflow/deskflow:ubuntu-22.04-amd64", "runs-on": "ubuntu-latest" }, { "name": "fedora-40-arm64", - "container": "symless/synergy-core:fedora-40-arm64", + "container": "deskflow/deskflow:fedora-40-arm64", "runs-on": "ubuntu-24.04-8-core-arm64" }, { "name": "fedora-40-amd64", - "container": "symless/synergy-core:fedora-40-amd64", + "container": "deskflow/deskflow:fedora-40-amd64", "runs-on": "ubuntu-latest" }, { "name": "fedora-39-amd64", - "container": "symless/synergy-core:fedora-39-amd64", + "container": "deskflow/deskflow:fedora-39-amd64", "runs-on": "ubuntu-latest" }, { "name": "opensuse-amd64", - "container": "symless/synergy-core:opensuse-amd64", + "container": "deskflow/deskflow:opensuse-amd64", "runs-on": "ubuntu-latest" }, { "name": "rockylinux-9-amd64", - "container": "symless/synergy-core:rockylinux-9-amd64", + "container": "deskflow/deskflow:rockylinux-9-amd64", "runs-on": "ubuntu-latest" }, { "name": "almalinux-9-amd64", - "container": "symless/synergy-core:almalinux-9-amd64", + "container": "deskflow/deskflow:almalinux-9-amd64", "runs-on": "ubuntu-latest" }, { "name": "archlinux-amd64", - "container": "symless/synergy-core:archlinux-amd64", + "container": "deskflow/deskflow:archlinux-amd64", "runs-on": "ubuntu-latest", "package-user": "build" }, { "name": "manjaro-amd64", - "container": "symless/synergy-core:manjaro-amd64", + "container": "deskflow/deskflow:manjaro-amd64", "runs-on": "ubuntu-latest", "package-user": "build" } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ec2bf1e9..e86007821 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: inputs: version: - description: Synergy version number + description: Deskflow version number pull_request: types: - opened @@ -20,10 +20,10 @@ on: env: GIT_SHA: ${{ github.sha }} - SYNERGY_PRODUCT_NAME: ${{ vars.SYNERGY_PRODUCT_NAME }} - SYNERGY_PACKAGE_PREFIX: ${{ vars.SYNERGY_PACKAGE_PREFIX }} - SYNERGY_LICENSED_PRODUCT: ${{ vars.SYNERGY_LICENSED_PRODUCT }} - SYNERGY_ENABLE_ACTIVATION: ${{ vars.SYNERGY_ENABLE_ACTIVATION }} + DESKFLOW_PRODUCT_NAME: ${{ vars.DESKFLOW_PRODUCT_NAME }} + DESKFLOW_PACKAGE_PREFIX: ${{ vars.DESKFLOW_PACKAGE_PREFIX }} + DESKFLOW_LICENSED_PRODUCT: ${{ vars.DESKFLOW_LICENSED_PRODUCT }} + DESKFLOW_ENABLE_ACTIVATION: ${{ vars.DESKFLOW_ENABLE_ACTIVATION }} PACKAGE_BUILD: ${{ !github.event.pull_request.draft }} PACKAGE_UPLOAD: ${{ !github.event.pull_request.draft && github.ref_name != 'master' }} UPLOAD_TO_GITHUB: ${{ github.event_name == 'pull_request' && !github.event.pull_request.draft }} @@ -126,11 +126,11 @@ jobs: with: use_github: ${{ env.UPLOAD_TO_GITHUB }} use_gdrive: ${{ env.UPLOAD_TO_GDRIVE }} - github-target-filename: "${{ env.SYNERGY_PACKAGE_PREFIX }}-${{ matrix.target.name }}" + github-target-filename: "${{ env.DESKFLOW_PACKAGE_PREFIX }}-${{ matrix.target.name }}" gdrive-target-base-dir: ${{ vars.GDRIVE_TARGET_BASE_DIR }} gdrive-secret-key: ${{ secrets.GOOGLE_DRIVE_KEY }} gdrive-parent-folder-id: ${{ secrets.GOOGLE_DRIVE_TECH_DRIVE }} - package-version: ${{ env.SYNERGY_VERSION }} + package-version: ${{ env.DESKFLOW_VERSION }} macos: needs: setup @@ -213,11 +213,11 @@ jobs: with: use_github: ${{ env.UPLOAD_TO_GITHUB }} use_gdrive: ${{ env.UPLOAD_TO_GDRIVE }} - github-target-filename: "${{ env.SYNERGY_PACKAGE_PREFIX }}-${{ matrix.target.name }}" + github-target-filename: "${{ env.DESKFLOW_PACKAGE_PREFIX }}-${{ matrix.target.name }}" gdrive-target-base-dir: ${{ vars.GDRIVE_TARGET_BASE_DIR }} gdrive-secret-key: ${{ secrets.GOOGLE_DRIVE_KEY }} gdrive-parent-folder-id: ${{ secrets.GOOGLE_DRIVE_TECH_DRIVE }} - package-version: ${{ env.SYNERGY_VERSION }} + package-version: ${{ env.DESKFLOW_VERSION }} linux-matrix: runs-on: ubuntu-latest @@ -298,11 +298,11 @@ jobs: with: use_github: ${{ env.UPLOAD_TO_GITHUB }} use_gdrive: ${{ env.UPLOAD_TO_GDRIVE }} - github-target-filename: "${{ env.SYNERGY_PACKAGE_PREFIX }}-${{ matrix.distro.name }}" + github-target-filename: "${{ env.DESKFLOW_PACKAGE_PREFIX }}-${{ matrix.distro.name }}" gdrive-target-base-dir: ${{ vars.GDRIVE_TARGET_BASE_DIR }} gdrive-secret-key: ${{ secrets.GOOGLE_DRIVE_KEY }} gdrive-parent-folder-id: ${{ secrets.GOOGLE_DRIVE_TECH_DRIVE }} - package-version: ${{ env.SYNERGY_VERSION }} + package-version: ${{ env.DESKFLOW_VERSION }} # Technically, "unix" is a misnomer, but we use it here to mean "Unix-like BSD-derived". unix: @@ -312,7 +312,7 @@ jobs: timeout-minutes: 20 env: - SYNERGY_BUILD_CMD: | + DESKFLOW_BUILD_CMD: | ./scripts/install_deps.sh; cmake -B build; cmake --build build -j16; @@ -336,4 +336,4 @@ jobs: uses: vmactions/freebsd-vm@v1 with: usesh: true - run: ${{ env.SYNERGY_BUILD_CMD }} + run: ${{ env.DESKFLOW_BUILD_CMD }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 67f22f9de..58b788004 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,7 +17,7 @@ jobs: name: Analyze runs-on: ${{ vars.CODEQL_RUNNER || 'ubuntu-24.04' }} - container: symless/synergy-core:ubuntu-24.04-amd64 + container: deskflow/deskflow:ubuntu-24.04-amd64 timeout-minutes: 20 strategy: diff --git a/.github/workflows/issue-check-support.yml b/.github/workflows/issue-check-support.yml deleted file mode 100644 index af196b52b..000000000 --- a/.github/workflows/issue-check-support.yml +++ /dev/null @@ -1,63 +0,0 @@ -name: Check if tech support issue -on: - issues: - types: [opened] - workflow_dispatch: - inputs: - issue_number: - description: "Issue number" - required: true - issue_body: - description: "Issue body" - required: true - -jobs: - issue-check-support: - runs-on: ubuntu-latest - env: - ISSUE_BODY: ${{ github.event.issue.body || github.event.inputs.issue_body }} - ISSUE_NUMBER: ${{ github.event.issue.number || github.event.inputs.issue_number }} - - steps: - - name: Add comment for customer - env: - CUSTOMER_PATTERN: What type of Synergy user are you\?\s*Customer - NO_TICKET_PATTERN: Support ticket number \(for customers\)\s*_No response_ - COMMENT_BODY: | - Hello! :wave: As a customer, you're entitled to tech support which is included in your - license at no extra cost. - Please [raise a support ticket](https://symless.com/synergy/contact) if you'd like to - take advantage of that. - If that works for you, then please let us know your ticket number so we can continue - the discussion there. Thanks! - uses: actions/github-script@v6 - with: - script: | - const issueNumber = process.env.ISSUE_NUMBER; - const issueBody = process.env.ISSUE_BODY; - const customerPattern = new RegExp(process.env.CUSTOMER_PATTERN); - const noTicketPattern = new RegExp(process.env.NO_TICKET_PATTERN); - - const isCustomer = customerPattern.test(issueBody); - const noTicket = noTicketPattern.test(issueBody); - - if (!isCustomer) { - console.log('Not a customer'); - return; - } - - if (!noTicket) { - console.log('Already has a ticket'); - return; - } - - // Strip newlines, since GitHub comments are not markdown. - const commentBody = process.env.COMMENT_BODY.replace(/\n/g, ' '); - - console.log('Adding comment to issue:', issueNumber); - github.rest.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: issueNumber, - body: commentBody - }); diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index c36a16335..bc5889b9e 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -16,7 +16,7 @@ jobs: if: ${{ vars.SONAR_SCANNER_ENABLED }} runs-on: ${{ vars.SONAR_SCANNER_RUNNER || 'ubuntu-24.04' }} - container: symless/synergy-core:ubuntu-22.04-amd64 + container: deskflow/deskflow:ubuntu-22.04-amd64 timeout-minutes: 20 env: @@ -101,7 +101,7 @@ jobs: export PATH=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64/bin:$PATH sonar-scanner \ -Dsonar.organization=symless \ - -Dsonar.projectKey=symless_synergy-core \ + -Dsonar.projectKey=deskflow_deskflow \ -Dsonar.sources=scripts,src/cmd,src/gui,src/lib \ -Dsonar.tests=src/test \ -Dsonar.exclusions=subprojects/**,build/** \ diff --git a/.github/workflows/valgrind-analysis.yml b/.github/workflows/valgrind-analysis.yml index 8de54c4be..b3a9d2d68 100644 --- a/.github/workflows/valgrind-analysis.yml +++ b/.github/workflows/valgrind-analysis.yml @@ -12,9 +12,12 @@ on: jobs: valgrind-analysis: runs-on: ubuntu-latest - container: symless/synergy-core:ubuntu-22.04-amd64 + container: deskflow/deskflow:ubuntu-22.04-amd64 timeout-minutes: 10 + permissions: + pull-requests: write + steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.gitignore b/.gitignore index 2f6577df0..1723cb2a9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ aqtinstall.log Brewfile.lock.json # typical developer-created files -synergy-config.toml +deskflow-config.toml .vscode .DS_Store *.code-workspace diff --git a/.vscode/tasks.json b/.vscode/tasks.json index fe5319f30..495ee0cb6 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -50,13 +50,13 @@ "label": "clean-config", "type": "shell", "linux": { - "command": "rm -r ~/.config/Synergy/Synergy.conf" + "command": "rm -r ~/.config/Deskflow/Deskflow.conf" }, "windows": { - "command": "remove-item -recurse $env:APPDATA\\Synergy\\Synergy" + "command": "remove-item -recurse $env:APPDATA\\Deskflow\\Deskflow" }, "osx": { - "command": "rm -r ~/Library/Application\\ Support/Synergy/Synergy" + "command": "rm -r ~/Library/Application\\ Support/Deskflow/Deskflow" } }, { diff --git a/BUILD.md b/BUILD.md index 5acf5ead1..f9f923e11 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,12 +1,12 @@ -# Build Synergy +# Build Deskflow ## Developer Quick Start -Synergy 1 Community Edition is free and open source software, and anyone is welcome to build it, +Deskflow is free and open source software, and anyone is welcome to build it, run it, tinker with it, redistribute it as part of their own app, etc. -These instructions will build Synergy 1 Community Edition, which doesn't require a license -or serial key. Check the [Build Guide](https://github.com/symless/synergy/wiki/Build-Guide) +These instructions will build Deskflow, which doesn't require a license +or serial key. Check the [Build Guide](https://github.com/deskflow/deskflow/wiki/Build-Guide) wiki page if you have problems. **1. Dependencies:** @@ -46,5 +46,5 @@ cmake --build build -j8 **5. Run** ``` -./build/bin/synergy +./build/bin/deskflow ``` diff --git a/CMakeLists.txt b/CMakeLists.txt index addefb618..2cde0fab5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -15,7 +15,7 @@ # along with this program. If not, see . cmake_minimum_required(VERSION 3.5) -project(synergy C CXX) +project(deskflow C CXX) include(cmake/Version.cmake) include(cmake/Definitions.cmake) diff --git a/CMakePresets.json b/CMakePresets.json index 208c07694..6367aafd1 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -13,7 +13,7 @@ "name": "minimal", "hidden": true, "environment": { - "SYNERGY_BUILD_MINIMAL": "ON" + "DESKFLOW_BUILD_MINIMAL": "ON" } }, { diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 81520cfc1..bcb65e04d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,12 @@ -# Contributing to Synergy +# Contributing to Deskflow Hello future community member! -Synergy 1 Community Edition is free and open source software, and anyone is welcome to build it, +Deskflow is free and open source software, and anyone is welcome to build it, run it, tinker with it, redistribute it as part of their own app, etc. -See our wiki page on [contributing](https://github.com/symless/synergy/wiki/Contributing) for more +See our wiki page on [contributing](https://github.com/deskflow/deskflow/wiki/Contributing) for more information. We look forward to reviewing your PR! Thanks, -The Synergy community +The Deskflow community diff --git a/ChangeLog b/ChangeLog index 4dbe621e6..ffed92740 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +# v? + +- #7519 Rename project to Deskflow (was Synergy Community Edition) + # 1.16.1 Enhancements: diff --git a/Doxyfile b/Doxyfile index 249659e1b..e319e8c57 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = Synergy +PROJECT_NAME = Deskflow # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version @@ -51,7 +51,7 @@ PROJECT_BRIEF = # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = res/synergy.svg +PROJECT_LOGO = res/deskflow.svg # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is diff --git a/README.md b/README.md index 7a1066af1..f7e8153eb 100644 --- a/README.md +++ b/README.md @@ -9,49 +9,45 @@ > 🚀 Deskflow is now the upstream project for Synergy. > > The project has been renamed to draw a line between the community-run project (now Deskflow), -> and the commercially licensed product, Synergy (a mix of open source and proprietary). +> and the commercially licensed product, Synergy. > -> We are currently in the process of renaming the project to Deskflow and moving all licensing code downstream. +> We are currently in the process of renaming the project to Deskflow and moving all licensing code +> downstream. +> > Hold on to your butts, this is going to be a hell of a ride. > -> [Join the discussion](https://github.com/deskflow/deskflow/discussions/7476) +> [Join the discussion](https://github.com/deskflow/deskflow/discussions/7517) [![GitHub Release](https://img.shields.io/github/v/release/deskflow/deskflow?display_name=release&label=latest%20version)](https://github.com/deskflow/deskflow/releases) [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/deskflow/deskflow)](https://github.com/deskflow/deskflow/commits/master/) [![GitHub License](https://img.shields.io/github/license/deskflow/deskflow)](LICENSE) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=symless_synergy-core&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=symless_synergy-core) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=deskflow_deskflow&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=deskflow_deskflow) [![CI](https://github.com/deskflow/deskflow/actions/workflows/ci.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/ci.yml) [![CodeQL Analysis](https://github.com/deskflow/deskflow/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/codeql-analysis.yml) [![SonarCloud Analysis](https://github.com/deskflow/deskflow/actions/workflows/sonarcloud-analysis.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/sonarcloud-analysis.yml) [![Build containers](https://github.com/deskflow/deskflow/actions/workflows/build-containers.yml/badge.svg)](https://github.com/deskflow/deskflow/actions/workflows/build-containers.yml) -[Synergy](https://symless.com/synergy) is a keyboard and mouse sharing app. -Use the keyboard, mouse, or trackpad of one computer to control nearby computers, +**Deskflow** is a free and open source keyboard and mouse sharing app. +Use the keyboard, mouse, or trackpad of one computer to control nearby computers, and work seamlessly between them. -This project contains the source code for _Synergy 1 Community Edition_ which is actively -maintained. -Synergy 1 Community Edition is free and open source software, and anyone is welcome to build it, -run it, tinker with it, redistribute it as part of their own app, etc. - **Wayland support:** Experimental support in -[Synergy v1.16](https://github.com/deskflow/deskflow/releases/tag/1.16.0-beta%2Br2) +[Deskflow v1.16](https://github.com/deskflow/deskflow/releases/tag/1.16.0-beta%2Br2) (required >= GNOME 46 or KDE Plasma 6.1). -![Synergy 1 Community Edition](https://github.com/user-attachments/assets/faf5bd69-336c-4bd0-ace3-e911f199d961) +![Deskflow](https://github.com/user-attachments/assets/faf5bd69-336c-4bd0-ace3-e911f199d961) -To use the community edition, we encourage you to build it yourself using the [Build Quick Start](#build-quick-start) -instructions below or you can install the `synergy` package with your [favorite package manager](#how-to-install-packages) -(please note that some package managers have older versions and need to be updated). +To use Deskflow you can follow the [Build Quick Start](#build-quick-start), +use one of our packages, or if it's available by your favorite package repository, +install `deskflow` (see: [installing packages](#how-to-install-packages)). -## Goals and Philosophy +## Project values -Version 1.15 brings a [new philosophy](https://github.com/deskflow/deskflow/discussions/7476) -of being more approachable to the open source community instead of wholly focusing on commercial interests. -We still have customers to finance the development of the code, but we are committed to -maintaining and improving Synergy 1 Community Edition for years to come and we're excited to work -with our community of open source users to improve the code for the benefit of everyone. +- Motivated by the community interests (not business-driven) +- Privacy by default (no update check or phone home on by default) +- Nothing customer-related (this is all moved downstream to Synergy) +- Have fun; we don't need to worry about impressing anyone ## Ways to get involved @@ -62,16 +58,14 @@ Here are a few ways to join in with the project and get involved: ## Build Quick Start -Synergy 1 Community Edition is free and open source software, and anyone is welcome to build it, -run it, tinker with it, redistribute it as part of their own app, etc. - > [!TIP] -> These instructions will build Synergy 1 Community Edition, which doesn't require a license -> or serial key. Check the [Build Guide](https://github.com/deskflow/deskflow/wiki/Build-Guide) +> Check the [Build Guide](https://github.com/deskflow/deskflow/wiki/Build-Guide) > wiki page if you have problems. **1. Dependencies:** +You can either copy/paste the command from [config.yaml] or use the script. + *Linux, macOS, or BSD-derived:* ``` ./scripts/install_deps.sh @@ -107,50 +101,42 @@ cmake --build build -j8 **5. Run** ``` -./build/bin/synergy +./build/bin/deskflow ``` ## How to install (packages) -Synergy 1 Community Edition is packaged by the community (status shown below). - -Synergy 2 is no longer in development and we recommend that package maintainers do not provide it. - -Synergy 3 and Synergy 1 (licensed) are available to download from the -[official packages](https://symless.com/synergy/download). - -**Community edition:** - *macOS:* +*(coming soon)* ``` -brew install synergy +brew install deskflow ``` *Fedora, Red Hat, etc:* +*(coming soon)* ``` -sudo dnf install synergy +sudo dnf install deskflow ``` *Debian, Ubuntu, etc:* -*(temporarily broken)* +*(coming soon)* ``` -sudo apt install synergy +sudo apt install deskflow ``` *Arch, Manjaro, etc:* -*(temporarily broken)* +*(coming soon)* ``` -sudo pacman -S synergy +sudo pacman -S deskflow ``` *Windows:* -*(very outdated)* +*(coming soon)* ``` -choco install synergy +choco install deskflow ``` -**Note:** Some packages are temporarily broken. We have reached out to the package maintainers to -resolve this. If you're a package maintainer and have a question, please let us know. +**Note:** We are working with package maintainers to have our new package name adopted. ## Operating Systems @@ -161,67 +147,26 @@ Debian, Ubuntu, Linux Mint, Fedora, RHEL, AlmaLinux, Rocky Linux, Arch Linux, op We officially support FreeBSD, and would also like to support: OpenBSD, NetBSD, DragonFly, Solaris. -## Package Maintainers - -Synergy is already available through most package managers as `synergy`, and we would love to see -the latest version of Synergy 1 Community Edition on every package manager for every OS we support -(Windows, macOS, Linux, Unix-like BSD-derived, etc). - -Package maintainers can use `scripts/package.py` to see how we build packages. -Feel free to contact us if you have any questions about packaging Synergy. - -Current packages: -- [Fedora](https://packages.fedoraproject.org/pkgs/synergy/synergy/) -- [Arch Linux](https://aur.archlinux.org/packages/synergy) -- [FreeBSD](https://www.freshports.org/sysutils/synergy) -- [Homebrew](https://formulae.brew.sh/formula/synergy-core#default) -- [Gentoo](https://packages.gentoo.org/packages/x11-misc/synergy) - -Very outdated packages: -- [Chocolatey](https://community.chocolatey.org/packages/synergy) -- [openSUSE](https://build.opensuse.org/package/show/openSUSE:Factory/synergy) - -Broken packages: -- [Ubuntu](https://launchpad.net/ubuntu/+source/synergy) -- [Debian](https://tracker.debian.org/pkg/synergy) - -It appears that the `synergy` package has been removed or discontinued from some package repositories. -That's a bit sad. If you're a package maintainer, please let us know if you have any questions. - ## Similar Projects * [Lan Mouse](https://github.com/feschber/lan-mouse) - A Rust implementation with the goal of - having native front-ends and interoperability with Synergy. -* [Input Leap](https://github.com/input-leap/input-leap) - A Synergy-derivative with the goal - of continuing what Barrier started (a now dead Synergy fork). + having native front-ends and interoperability with Deskflow. +* [Input Leap](https://github.com/input-leap/input-leap) - A Deskflow-derivative with the goal + of continuing what Barrier started (a now dead Deskflow fork). ## FAQ -### Is Synergy compatible with Lan Mouse or Input Leap? +### Is Deskflow compatible with Lan Mouse or Input Leap? We would love to see compatibility between our fellow open source projects, Lan Mouse and Input Leap. This idea is discussed from time in the communities for all of our projects, so it may happen in the not-too-distant future. -### Has Synergy moved beyond its goals from the 1.x era? - -Our goal for Synergy 1 (including the community edition) has always been and will always be to -make a simple, reliable, and feature-rich mouse and keyboard-sharing tool. We do maintain another -product called Synergy 3, but as this uses Synergy 1 Core (the server and client part of Synergy), -we depend on Synergy 1 to remain stable and modern which is why we continue to develop and improve -the product. - -### If I want to solve issues in Synergy do I need to contribute to a fork? +### If I want to solve issues in Deskflow do I need to contribute to a fork? We welcome PRs (pull requests) from the community. If you'd like to make a change, please feel free to [start a discussion](https://github.com/deskflow/deskflow/discussions) or [open a PR](https://github.com/deskflow/deskflow/wiki/Contributing). -It's great that people spin up re-branded forks of Synergy, power to them. However, it's not -necessary if you want to make changes. -If you're thinking of starting your own re-branded fork of Synergy, it might be because we're -doing something wrong so please -[let us know](https://github.com/deskflow/deskflow/wiki/Contact-the-team) what we can do to let -you feel welcome in our community. ### Is clipboard sharing supported? @@ -234,15 +179,14 @@ Yes! Wayland (the Linux display server protocol aimed to become the successor of System) is an important platform for us. The [`libei`](https://gitlab.freedesktop.org/libinput/libei) and [`libportal`](https://github.com/flatpak/libportal) libraries enable -Wayland support for Synergy. We would like to give special thanks to Peter Hutterer (@whot), +Wayland support for Deskflow. We would like to give special thanks to Peter Hutterer, who is the author of `libei`, a major contributor to `libportal`, and the author of the Wayland -implementation in Synergy. Others such as Olivier Fourdan helped with the Wayland implementation, -and we rely on the work of our community of developers to continue the development of Wayland -support. +implementation in Deskflow. Others such as Olivier Fourdan and Povilas Kanapickas helped with the +Wayland implementation. ### Where did it all start? -Synergy was first created in 2001 by Chris Schoeneman. +Deskflow was first created as Synergy in 2001 by Chris Schoeneman. Read about the [history of the project](https://github.com/deskflow/deskflow/wiki/History) on our wiki. @@ -251,7 +195,7 @@ wiki. Repology monitors a huge number of package repositories and other sources comparing package versions across them and gathering other information. -[![Repology](https://repology.org/badge/vertical-allrepos/synergy.svg?exclude_unsupported=1)](https://repology.org/project/synergy/versions) +[![Repology](https://repology.org/badge/vertical-allrepos/deskflow.svg?exclude_unsupported=1)](https://repology.org/project/deskflow/versions) ## License diff --git a/cmake/Build.cmake b/cmake/Build.cmake index 81d2fab7a..c6d3f729e 100644 --- a/cmake/Build.cmake +++ b/cmake/Build.cmake @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ macro(post_config) # Build to a temp bin dir on Windows and then copy to the final bin dir # (ignore copy fail). It is neccesary to do this. Since the binary may already # be running and you can't write to a running binary (on Windows). It's common - # to use Synergy to develop Synergy (i.e. eating your own dog food immediately + # to use Deskflow to develop Deskflow (i.e. eating your own dog food immediately # making it). if(WIN32) @@ -60,10 +60,10 @@ macro(post_config_all) add_dependencies( run_post_build - synergy - synergyc - synergys - synergyd) + deskflow + deskflowc + deskflows + deskflowd) endif() endmacro() diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index 8c0a601a4..eaa237b64 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -36,7 +36,7 @@ macro(configure_definitions) if("${VERSION_URL}" STREQUAL "") set(VERSION_URL "https://api.symless.com/version?version=v1") endif() - add_definitions(-DSYNERGY_VERSION_URL="${VERSION_URL}") + add_definitions(-DDESKFLOW_VERSION_URL="${VERSION_URL}") if(NOT "$ENV{GIT_SHA}" STREQUAL "") # Shorten the Git SHA to 8 chars for readability @@ -45,25 +45,25 @@ macro(configure_definitions) add_definitions(-DGIT_SHA_SHORT="${GIT_SHA_SHORT}") endif() - if(NOT "$ENV{SYNERGY_PRODUCT_NAME}" STREQUAL "") - set(PRODUCT_NAME $ENV{SYNERGY_PRODUCT_NAME}) + if(NOT "$ENV{DESKFLOW_PRODUCT_NAME}" STREQUAL "") + set(PRODUCT_NAME $ENV{DESKFLOW_PRODUCT_NAME}) endif() if(LICENSED_PRODUCT) message(STATUS "Licensed product") - add_definitions(-DSYNERGY_LICENSED_PRODUCT=1) + add_definitions(-DDESKFLOW_LICENSED_PRODUCT=1) if(ENABLE_ACTIVATION) message(STATUS "Activation enabled") - add_definitions(-DSYNERGY_ENABLE_ACTIVATION=1) + add_definitions(-DDESKFLOW_ENABLE_ACTIVATION=1) endif() else() - set(PRODUCT_NAME "Synergy 1 Community Edition") + set(PRODUCT_NAME "Deskflow") endif() if(PRODUCT_NAME) message(STATUS "Product name: ${PRODUCT_NAME}") - add_definitions(-DSYNERGY_PRODUCT_NAME="${PRODUCT_NAME}") + add_definitions(-DDESKFLOW_PRODUCT_NAME="${PRODUCT_NAME}") endif() if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") @@ -120,28 +120,28 @@ macro(configure_options) # by default, show the dev thanks message, guides contributions, etc. set(DEFAULT_SHOW_DEV_THANKS ON) - if("$ENV{SYNERGY_BUILD_MINIMAL}" STREQUAL "true") + if("$ENV{DESKFLOW_BUILD_MINIMAL}" STREQUAL "true") set(DEFAULT_BUILD_GUI OFF) set(DEFAULT_BUILD_INSTALLER OFF) endif() - if("$ENV{SYNERGY_BUILD_TESTS}" STREQUAL "false") + if("$ENV{DESKFLOW_BUILD_TESTS}" STREQUAL "false") set(DEFAULT_BUILD_TESTS OFF) endif() - if("$ENV{SYNERGY_BUILD_UNIFIED}" STREQUAL "true") + if("$ENV{DESKFLOW_BUILD_UNIFIED}" STREQUAL "true") set(DEFAULT_BUILD_UNIFIED ON) endif() - if("$ENV{SYNERGY_ENABLE_ACTIVATION}" STREQUAL "true") + if("$ENV{DESKFLOW_ENABLE_ACTIVATION}" STREQUAL "true") set(DEFAULT_ENABLE_ACTIVATION ON) endif() - if("$ENV{SYNERGY_LICENSED_PRODUCT}" STREQUAL "true") + if("$ENV{DESKFLOW_LICENSED_PRODUCT}" STREQUAL "true") set(DEFAULT_LICENSED_PRODUCT ON) endif() - if("$ENV{SYNERGY_ENABLE_COVERAGE}" STREQUAL "true") + if("$ENV{DESKFLOW_ENABLE_COVERAGE}" STREQUAL "true") set(DEFAULT_ENABLE_COVERAGE ON) endif() diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index a89c7dcea..336e37a9f 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -463,7 +463,7 @@ macro(configure_windows_libs) /DWIN32 /D_WINDOWS /D_CRT_SECURE_NO_WARNINGS - /DSYNERGY_VERSION=\"${SYNERGY_VERSION}\" + /DDESKFLOW_VERSION=\"${DESKFLOW_VERSION}\" /D_XKEYCHECK_H) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/res/win/version.rc.in @@ -527,7 +527,7 @@ macro(configure_gtest) # Arch Linux package maintainers: # We do care about not bundling libs and didn't mean to cause upset. We made some mistakes # and we're trying to put that right. - # The comment "They BUNDLE a fucking zip for cryptopp" in synergy.git/PKGBUILD is only + # The comment "They BUNDLE a fucking zip for cryptopp" in deskflow.git/PKGBUILD is only # relevant to a very version of old the code, so the comment should probably be removed. # If there are any problems like this in future, please do feel free send us a patch! :) option(SYSTEM_GTEST "Use system GoogleTest" ${DEFAULT_SYSTEM_GTEST}) diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index cb47e15c6..e5d19af86 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -20,8 +20,8 @@ macro(configure_packaging) if(${BUILD_INSTALLER}) - set(CPACK_PACKAGE_NAME "synergy") - set(CPACK_PACKAGE_CONTACT "Synergy ") + set(CPACK_PACKAGE_NAME "deskflow") + set(CPACK_PACKAGE_CONTACT "Deskflow ") set(CPACK_PACKAGE_DESCRIPTION "Mouse and keyboard sharing utility") set(CPACK_PACKAGE_VENDOR "Symless") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") @@ -50,7 +50,7 @@ macro(configure_windows_packaging) message(STATUS "Configuring Windows installer") - set(CPACK_PACKAGE_VERSION ${SYNERGY_VERSION_MS}) + set(CPACK_PACKAGE_VERSION ${DESKFLOW_VERSION_MS}) set(QT_PATH $ENV{CMAKE_PREFIX_PATH}) configure_files(${CMAKE_CURRENT_SOURCE_DIR}/res/dist/wix @@ -65,17 +65,17 @@ macro(configure_macos_packaging) message(STATUS "Configuring macOS app bundle") - set(CPACK_PACKAGE_VERSION ${SYNERGY_VERSION}) + set(CPACK_PACKAGE_VERSION ${DESKFLOW_VERSION}) set(CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks") - set(SYNERGY_BUNDLE_SOURCE_DIR + set(DESKFLOW_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/res/dist/macos/bundle) - set(SYNERGY_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle) - set(SYNERGY_BUNDLE_APP_DIR ${SYNERGY_BUNDLE_DIR}/Synergy.app) - set(SYNERGY_BUNDLE_BINARY_DIR ${SYNERGY_BUNDLE_APP_DIR}/Contents/MacOS) + set(DESKFLOW_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle) + set(DESKFLOW_BUNDLE_APP_DIR ${DESKFLOW_BUNDLE_DIR}/Deskflow.app) + set(DESKFLOW_BUNDLE_BINARY_DIR ${DESKFLOW_BUNDLE_APP_DIR}/Contents/MacOS) - configure_files(${SYNERGY_BUNDLE_SOURCE_DIR} ${SYNERGY_BUNDLE_DIR}) + configure_files(${DESKFLOW_BUNDLE_SOURCE_DIR} ${DESKFLOW_BUNDLE_DIR}) endmacro() @@ -86,10 +86,10 @@ macro(configure_linux_packaging) message(STATUS "Configuring Linux packaging") - set(CPACK_PACKAGE_VERSION ${SYNERGY_VERSION_LINUX}) + set(CPACK_PACKAGE_VERSION ${DESKFLOW_VERSION_LINUX}) set(CPACK_GENERATOR "DEB;RPM;TGZ") - set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Synergy ") + set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Deskflow ") set(CPACK_DEBIAN_PACKAGE_SECTION "utils") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) @@ -108,8 +108,8 @@ macro(configure_linux_packaging) # apps install to. set(CMAKE_INSTALL_PREFIX /usr) - install(FILES res/dist/linux/synergy.desktop DESTINATION share/applications) - install(FILES res/synergy.png DESTINATION share/pixmaps) + install(FILES res/dist/linux/deskflow.desktop DESTINATION share/applications) + install(FILES res/deskflow.png DESTINATION share/pixmaps) # Prepare PKGBUILD for Arch Linux configure_file(res/dist/arch/PKGBUILD.in ${CMAKE_BINARY_DIR}/PKGBUILD @ONLY) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index cbf8c9da6..bd5f678be 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -18,20 +18,20 @@ # On Windows, we also set a special 4-digit MSI version number. macro(set_version) - set(SYNERGY_VERSION $ENV{SYNERGY_VERSION}) - string(STRIP "${SYNERGY_VERSION}" SYNERGY_VERSION) + set(DESKFLOW_VERSION $ENV{DESKFLOW_VERSION}) + string(STRIP "${DESKFLOW_VERSION}" DESKFLOW_VERSION) - if(NOT SYNERGY_VERSION) - file(READ "${CMAKE_SOURCE_DIR}/VERSION" SYNERGY_VERSION) - string(STRIP "${SYNERGY_VERSION}" SYNERGY_VERSION) + if(NOT DESKFLOW_VERSION) + file(READ "${CMAKE_SOURCE_DIR}/VERSION" DESKFLOW_VERSION) + string(STRIP "${DESKFLOW_VERSION}" DESKFLOW_VERSION) endif() - message(STATUS "Version number (semver): " ${SYNERGY_VERSION}) - add_definitions(-DSYNERGY_VERSION="${SYNERGY_VERSION}") + message(STATUS "Version number (semver): " ${DESKFLOW_VERSION}) + add_definitions(-DDESKFLOW_VERSION="${DESKFLOW_VERSION}") # Useful for copyright (e.g. in macOS bundle .plist.in and Windows version .rc # file) - string(TIMESTAMP SYNERGY_BUILD_YEAR "%Y") + string(TIMESTAMP DESKFLOW_BUILD_YEAR "%Y") if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") set_windows_version() @@ -43,19 +43,19 @@ endmacro() macro(set_four_part_version) - string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" _ "${SYNERGY_VERSION}") + string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" _ "${DESKFLOW_VERSION}") set(VERSION_MAJOR "${CMAKE_MATCH_1}") set(VERSION_MINOR "${CMAKE_MATCH_2}") set(VERSION_PATCH "${CMAKE_MATCH_3}") # Find the revision number, which is the number after the 'r'. - string(REGEX MATCH "r([0-9]+)$" _ "${SYNERGY_VERSION}") + string(REGEX MATCH "r([0-9]+)$" _ "${DESKFLOW_VERSION}") set(VERSION_REVISION "${CMAKE_MATCH_1}") if(NOT VERSION_REVISION) set(VERSION_REVISION "0") endif() - set(SYNERGY_VERSION_FOUR_PART + set(DESKFLOW_VERSION_FOUR_PART "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_REVISION}") endmacro() @@ -66,15 +66,15 @@ macro(set_windows_version) set_four_part_version() # Dot-separated version number for MSI and Windows version .rc file. - set(SYNERGY_VERSION_MS ${SYNERGY_VERSION_FOUR_PART}) + set(DESKFLOW_VERSION_MS ${DESKFLOW_VERSION_FOUR_PART}) message(STATUS "Version number for (Microsoft 4-part): " - ${SYNERGY_VERSION_MS}) + ${DESKFLOW_VERSION_MS}) # CSV version number for Windows version .rc file. - set(SYNERGY_VERSION_MS_CSV + set(DESKFLOW_VERSION_MS_CSV "${VERSION_MAJOR},${VERSION_MINOR},${VERSION_PATCH},${VERSION_REVISION}") message(STATUS "Version number for (Microsoft CSV): " - ${SYNERGY_VERSION_MS_CSV}) + ${DESKFLOW_VERSION_MS_CSV}) endmacro() macro(set_linux_version) @@ -83,12 +83,12 @@ macro(set_linux_version) # char is reserved for use at at the end of the version string to indicate a # package revision. Debian has always used this convention, but support for # this was also introduced in RPM 4.10.0. - string(REGEX REPLACE "-" "~" SYNERGY_VERSION_LINUX "${SYNERGY_VERSION}") - message(STATUS "Version number (DEB/RPM): ${SYNERGY_VERSION_LINUX}") + string(REGEX REPLACE "-" "~" DESKFLOW_VERSION_LINUX "${DESKFLOW_VERSION}") + message(STATUS "Version number (DEB/RPM): ${DESKFLOW_VERSION_LINUX}") # Arch does not support SemVer or DEB/RPM version format, so use the four-part # version format which funnily enough is what Microsoft requires for MSI. set_four_part_version() - message(STATUS "Version number (4-part): ${SYNERGY_VERSION_FOUR_PART}") + message(STATUS "Version number (4-part): ${DESKFLOW_VERSION_FOUR_PART}") endmacro() diff --git a/cspell.json b/cspell.json index 3ad8b7efd..71e72cf7e 100644 --- a/cspell.json +++ b/cspell.json @@ -13,6 +13,7 @@ "Compat", "contribs", "Daun", + "Deskflow", "distros", "dmgbuild", "dotenv", @@ -27,11 +28,13 @@ "ifdef", "INPUTCAPTURE", "integtests", + "Kanapickas", "keychain", "Keychains", "Kutytska", "Lanz", "libei", + "Libera", "libportal", "LLDB", "Lysytsia", @@ -47,6 +50,7 @@ "Petroules", "Pixmap", "Poschta", + "Povilas", "Priddy", "pyproject", "qputenv", @@ -59,9 +63,6 @@ "Sorin", "subproject", "subprojects", - "synergyc", - "synergyd", - "synergys", "trackpad", "Trixie", "unittests", diff --git a/doc/synergy.conf.example b/doc/deskflow.conf.example similarity index 95% rename from doc/synergy.conf.example rename to doc/deskflow.conf.example index 2586dfafa..3a0ff5ed1 100644 --- a/doc/synergy.conf.example +++ b/doc/deskflow.conf.example @@ -1,4 +1,4 @@ -# sample synergy configuration file +# sample deskflow configuration file # # comments begin with the # character and continue to the end of # line. comments may appear anywhere the syntax permits. diff --git a/doc/synergy.conf.example-advanced b/doc/deskflow.conf.example-advanced similarity index 97% rename from doc/synergy.conf.example-advanced rename to doc/deskflow.conf.example-advanced index 771cf5347..f6176bcec 100644 --- a/doc/synergy.conf.example-advanced +++ b/doc/deskflow.conf.example-advanced @@ -1,4 +1,4 @@ -# sample synergy configuration file +# sample deskflow configuration file # # comments begin with the # character and continue to the end of # line. comments may appear anywhere the syntax permits. diff --git a/doc/synergy.conf.example-basic b/doc/deskflow.conf.example-basic similarity index 96% rename from doc/synergy.conf.example-basic rename to doc/deskflow.conf.example-basic index 6f3c20d90..5a5c7b0db 100644 --- a/doc/synergy.conf.example-basic +++ b/doc/deskflow.conf.example-basic @@ -1,4 +1,4 @@ -# sample synergy configuration file +# sample deskflow configuration file # # comments begin with the # character and continue to the end of # line. comments may appear anywhere the syntax permits. diff --git a/meson.build b/meson.build index b3b2e12c4..6bf74374e 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ # Where available, we use system packages, otherwise we use subprojects. # Subprojects are also used to get the latest version during development. -project('synergy', 'cpp') +project('deskflow', 'cpp') subproject('tomlplusplus') subproject('cli11') diff --git a/res/config.h.in b/res/config.h.in index 463d644f2..9e5420a8f 100644 --- a/res/config.h.in +++ b/res/config.h.in @@ -1,5 +1,5 @@ /* Define version here for Unix, but using /D for Windows. */ -#cmakedefine SYNERGY_VERSION "${SYNERGY_VERSION}" +#cmakedefine DESKFLOW_VERSION "${DESKFLOW_VERSION}" /* Define to the base type of arg 3 for `accept`. */ #cmakedefine ACCEPT_TYPE_ARG3 ${ACCEPT_TYPE_ARG3} diff --git a/res/synergy.ico b/res/deskflow.ico similarity index 100% rename from res/synergy.ico rename to res/deskflow.ico diff --git a/res/synergy.png b/res/deskflow.png similarity index 100% rename from res/synergy.png rename to res/deskflow.png diff --git a/res/synergy.svg b/res/deskflow.svg similarity index 100% rename from res/synergy.svg rename to res/deskflow.svg diff --git a/res/dist/arch/PKGBUILD.in b/res/dist/arch/PKGBUILD.in index 85e27d5be..770738c5f 100644 --- a/res/dist/arch/PKGBUILD.in +++ b/res/dist/arch/PKGBUILD.in @@ -1,10 +1,10 @@ -# Maintainer: Synergy team +# Maintainer: Deskflow team -pkgname=synergy -pkgver=@SYNERGY_VERSION_FOUR_PART@ +pkgname=deskflow +pkgver=@DESKFLOW_VERSION_FOUR_PART@ pkgrel=1 pkgdesc="Mouse and keyboard sharing utility" -url='https://symless.com/synergy/' +url='https://symless.com/deskflow/' arch=('x86_64') license=('GPL-2.0-only') depends=( diff --git a/res/dist/flatpak/synergy.yml b/res/dist/flatpak/deskflow.yml similarity index 88% rename from res/dist/flatpak/synergy.yml rename to res/dist/flatpak/deskflow.yml index 5c6b95a56..0f5271ca9 100644 --- a/res/dist/flatpak/synergy.yml +++ b/res/dist/flatpak/deskflow.yml @@ -1,9 +1,9 @@ -app-id: com.symless.Synergy +app-id: com.symless.Deskflow runtime: org.kde.Platform runtime-version: "5.15-21.08" sdk: org.kde.Sdk -rename-icon: synergy -rename-desktop-file: synergy.desktop +rename-icon: deskflow +rename-desktop-file: deskflow.desktop modules: - name: openssl buildsystem: simple @@ -23,7 +23,7 @@ modules: sources: - type: git url: https://gitlab.gnome.org/GNOME/libnotify.git - - name: synergy + - name: deskflow buildsystem: cmake-ninja config-opts: - "-DCMAKE_BUILD_TYPE=Release" @@ -32,7 +32,7 @@ modules: path: ../ - type: patch path: flatpak-desktop.patch -command: synergy +command: deskflow finish-args: - "--share=ipc" - "--socket=x11" diff --git a/res/dist/flatpak/flatpak-desktop.patch b/res/dist/flatpak/flatpak-desktop.patch index 1fca84738..5d72dcfe4 100644 --- a/res/dist/flatpak/flatpak-desktop.patch +++ b/res/dist/flatpak/flatpak-desktop.patch @@ -1,14 +1,14 @@ -diff --git a/res/synergy.desktop b/res/synergy.desktop +diff --git a/res/deskflow.desktop b/res/deskflow.desktop index fa987bdf..9513dbf3 100644 ---- a/res/synergy.desktop -+++ b/res/synergy.desktop +--- a/res/deskflow.desktop ++++ b/res/deskflow.desktop @@ -3,8 +3,7 @@ Type=Application Version=1.0 - Name=Synergy + Name=Deskflow Comment=Keyboard and mouse sharing solution -Path=/usr/bin --Exec=/usr/bin/synergy +-Exec=/usr/bin/deskflow +Exec= - Icon=synergy + Icon=deskflow Terminal=false Categories=Utility; diff --git a/res/dist/linux/synergy.desktop b/res/dist/linux/deskflow.desktop similarity index 78% rename from res/dist/linux/synergy.desktop rename to res/dist/linux/deskflow.desktop index 6a62168d6..3142bc974 100644 --- a/res/dist/linux/synergy.desktop +++ b/res/dist/linux/deskflow.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Synergy +Name=Deskflow Comment=Mouse and keyboard sharing utility Path=/usr/bin -Exec=/usr/bin/synergy -Icon=synergy +Exec=/usr/bin/deskflow +Icon=deskflow Terminal=false Categories=Utility; Keywords=keyboard;mouse;sharing;network;share; diff --git a/res/dist/macos/bundle/Synergy.app/Contents/Info.plist.in b/res/dist/macos/bundle/Deskflow.app/Contents/Info.plist.in similarity index 71% rename from res/dist/macos/bundle/Synergy.app/Contents/Info.plist.in rename to res/dist/macos/bundle/Deskflow.app/Contents/Info.plist.in index 555c18d04..7f7298a59 100644 --- a/res/dist/macos/bundle/Synergy.app/Contents/Info.plist.in +++ b/res/dist/macos/bundle/Deskflow.app/Contents/Info.plist.in @@ -4,27 +4,27 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - Synergy + Deskflow CFBundleExecutable - synergy + deskflow CFBundleIconFile - Synergy.icns + Deskflow.icns CFBundleIdentifier - synergy + deskflow CFBundleInfoDictionaryVersion 6.0 CFBundleName - Synergy + Deskflow CFBundlePackageType APPL CFBundleSignature SYN1 CFBundleShortVersionString - @SYNERGY_VERSION@ + @DESKFLOW_VERSION@ CFBundleVersion - @SYNERGY_VERSION@ + @DESKFLOW_VERSION@ NSHumanReadableCopyright - © 2012-@SYNERGY_BUILD_YEAR@ Symless Ltd + © 2012-@DESKFLOW_BUILD_YEAR@ Symless Ltd LSMinimumSystemVersion 10.9.0 diff --git a/res/dist/macos/bundle/Deskflow.app/Contents/PkgInfo b/res/dist/macos/bundle/Deskflow.app/Contents/PkgInfo new file mode 100644 index 000000000..8a95e2b34 --- /dev/null +++ b/res/dist/macos/bundle/Deskflow.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPLDFLW \ No newline at end of file diff --git a/res/dist/macos/bundle/Synergy.app/Contents/Resources/.background.tiff b/res/dist/macos/bundle/Deskflow.app/Contents/Resources/.background.tiff similarity index 100% rename from res/dist/macos/bundle/Synergy.app/Contents/Resources/.background.tiff rename to res/dist/macos/bundle/Deskflow.app/Contents/Resources/.background.tiff diff --git a/res/dist/macos/bundle/Synergy.app/Contents/Resources/Synergy.icns b/res/dist/macos/bundle/Deskflow.app/Contents/Resources/Deskflow.icns similarity index 100% rename from res/dist/macos/bundle/Synergy.app/Contents/Resources/Synergy.icns rename to res/dist/macos/bundle/Deskflow.app/Contents/Resources/Deskflow.icns diff --git a/res/dist/macos/bundle/Synergy.app/Contents/Resources/VolumeIcon.icns b/res/dist/macos/bundle/Deskflow.app/Contents/Resources/VolumeIcon.icns similarity index 100% rename from res/dist/macos/bundle/Synergy.app/Contents/Resources/VolumeIcon.icns rename to res/dist/macos/bundle/Deskflow.app/Contents/Resources/VolumeIcon.icns diff --git a/res/dist/macos/bundle/Synergy.app/Contents/PkgInfo b/res/dist/macos/bundle/Synergy.app/Contents/PkgInfo deleted file mode 100644 index 583e36af4..000000000 --- a/res/dist/macos/bundle/Synergy.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPLSYN1 \ No newline at end of file diff --git a/res/dist/wix/Synergy.sln b/res/dist/wix/Deskflow.sln similarity index 89% rename from res/dist/wix/Synergy.sln rename to res/dist/wix/Deskflow.sln index 5451972ba..3149f2081 100644 --- a/res/dist/wix/Synergy.sln +++ b/res/dist/wix/Deskflow.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29411.108 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Synergy", "Synergy.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Deskflow", "Deskflow.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/res/dist/wix/Synergy.wixproj b/res/dist/wix/Deskflow.wixproj similarity index 76% rename from res/dist/wix/Synergy.wixproj rename to res/dist/wix/Deskflow.wixproj index c3420922b..fc3b058d2 100644 --- a/res/dist/wix/Synergy.wixproj +++ b/res/dist/wix/Deskflow.wixproj @@ -4,18 +4,18 @@ 3.11 {d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17} 2.0 - Synergy + Deskflow Package bin\$(Configuration)\ wix\obj\$(Configuration)\ - - - - - - + + + + + + @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/res/dist/wix/SynergyBrowseDlg.wxs b/res/dist/wix/DeskflowBrowseDlg.wxs similarity index 96% rename from res/dist/wix/SynergyBrowseDlg.wxs rename to res/dist/wix/DeskflowBrowseDlg.wxs index 4751af4f9..1b3664b7d 100644 --- a/res/dist/wix/SynergyBrowseDlg.wxs +++ b/res/dist/wix/DeskflowBrowseDlg.wxs @@ -2,7 +2,7 @@ - + 1 @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/res/dist/wix/DeskflowDlgSequence.wxs b/res/dist/wix/DeskflowDlgSequence.wxs new file mode 100644 index 000000000..7ec9e57a7 --- /dev/null +++ b/res/dist/wix/DeskflowDlgSequence.wxs @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 1 + "1"]]> + + 1 + NOT Installed + + 1 + Installed AND PATCH + + 1 + NOT WIXUI_DONTVALIDATEPATH + "1"]]> + WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" + 1 + 1 + 1 + + NOT Installed + Installed AND NOT PATCH + Installed AND PATCH + + 1 + + 1 + 1 + 1 + + + + + + + diff --git a/res/dist/wix/SynergyInstallDlg.wxs b/res/dist/wix/DeskflowInstallDlg.wxs similarity index 85% rename from res/dist/wix/SynergyInstallDlg.wxs rename to res/dist/wix/DeskflowInstallDlg.wxs index 358205ba2..e39f557ba 100644 --- a/res/dist/wix/SynergyInstallDlg.wxs +++ b/res/dist/wix/DeskflowInstallDlg.wxs @@ -2,8 +2,8 @@ - - + + @@ -12,7 +12,7 @@ - + @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/res/dist/wix/SynergyMaintenanceTypeDlg.wxs b/res/dist/wix/DeskflowMaintenanceTypeDlg.wxs similarity index 95% rename from res/dist/wix/SynergyMaintenanceTypeDlg.wxs rename to res/dist/wix/DeskflowMaintenanceTypeDlg.wxs index 6e451a54c..5fb21c172 100644 --- a/res/dist/wix/SynergyMaintenanceTypeDlg.wxs +++ b/res/dist/wix/DeskflowMaintenanceTypeDlg.wxs @@ -13,8 +13,8 @@ - - + + 1 ARPNOMODIFY @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/res/dist/wix/SynergyVerifyReadyDlg.wxs b/res/dist/wix/DeskflowVerifyReadyDlg.wxs similarity index 98% rename from res/dist/wix/SynergyVerifyReadyDlg.wxs rename to res/dist/wix/DeskflowVerifyReadyDlg.wxs index 4226df711..699716bc4 100644 --- a/res/dist/wix/SynergyVerifyReadyDlg.wxs +++ b/res/dist/wix/DeskflowVerifyReadyDlg.wxs @@ -3,7 +3,7 @@ - + - \ No newline at end of file + diff --git a/res/dist/wix/SynergyWelcome.wxs b/res/dist/wix/DeskflowWelcome.wxs similarity index 76% rename from res/dist/wix/SynergyWelcome.wxs rename to res/dist/wix/DeskflowWelcome.wxs index f2b716320..4e6711046 100644 --- a/res/dist/wix/SynergyWelcome.wxs +++ b/res/dist/wix/DeskflowWelcome.wxs @@ -5,25 +5,25 @@ - - welcome_background + + welcome_background - + Installed AND PATCH 1 - + - NOT Installed OR PATCH + NOT Installed OR PATCH - \ No newline at end of file + diff --git a/res/dist/wix/Include.wxi.in b/res/dist/wix/Include.wxi.in index 90eaef6b6..1787e346a 100644 --- a/res/dist/wix/Include.wxi.in +++ b/res/dist/wix/Include.wxi.in @@ -1,7 +1,7 @@ - - + + diff --git a/res/dist/wix/Product.wxs b/res/dist/wix/Product.wxs index 871b8643e..7e567c2a5 100644 --- a/res/dist/wix/Product.wxs +++ b/res/dist/wix/Product.wxs @@ -19,20 +19,20 @@ - - + + - - + - - + = 602)]]> @@ -43,15 +43,15 @@ - common_background + common_background - + - + - + @@ -59,7 +59,7 @@ - + @@ -77,18 +77,18 @@ - - + + - - - + + + - - + + - + @@ -98,9 +98,9 @@ - - - + + + @@ -147,8 +147,8 @@ - + - \ No newline at end of file + diff --git a/res/dist/wix/SynergyDlgSequence.wxs b/res/dist/wix/SynergyDlgSequence.wxs deleted file mode 100644 index 2b736202c..000000000 --- a/res/dist/wix/SynergyDlgSequence.wxs +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 1 - "1"]]> - - 1 - NOT Installed - - 1 - Installed AND PATCH - - 1 - NOT WIXUI_DONTVALIDATEPATH - "1"]]> - WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" - 1 - 1 - 1 - - NOT Installed - Installed AND NOT PATCH - Installed AND PATCH - - 1 - - 1 - 1 - 1 - - - - - - - diff --git a/res/doxygen.cfg.in b/res/doxygen.cfg.in index ad7d18783..9f807e1fc 100644 --- a/res/doxygen.cfg.in +++ b/res/doxygen.cfg.in @@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "Synergy" +PROJECT_NAME = "Deskflow" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/res/gui/Synergy.qrc b/res/gui/Deskflow.qrc similarity index 69% rename from res/gui/Synergy.qrc rename to res/gui/Deskflow.qrc index d4c70383e..69531fe3d 100644 --- a/res/gui/Synergy.qrc +++ b/res/gui/Deskflow.qrc @@ -1,15 +1,15 @@ - icons/16x16/synergy.png + icons/16x16/deskflow.png icons/64x64/video-display.png icons/64x64/user-trash.png icons/16x16/warning.png - icons/256x256/synergy.ico + icons/256x256/deskflow.ico image/about-light.png image/about-dark.png icons/16x16/padlock.png - icons/64x64/synergy-dark.png - icons/64x64/synergy-light.png + icons/64x64/deskflow-dark.png + icons/64x64/deskflow-light.png image/welcome.png icons/64x64/folder.png image/setup-blocker.png diff --git a/res/gui/icons/16x16/synergy.png b/res/gui/icons/16x16/deskflow.png similarity index 100% rename from res/gui/icons/16x16/synergy.png rename to res/gui/icons/16x16/deskflow.png diff --git a/res/gui/icons/256x256/synergy.ico b/res/gui/icons/256x256/deskflow.ico similarity index 100% rename from res/gui/icons/256x256/synergy.ico rename to res/gui/icons/256x256/deskflow.ico diff --git a/res/gui/icons/64x64/synergy-dark.png b/res/gui/icons/64x64/deskflow-dark.png similarity index 100% rename from res/gui/icons/64x64/synergy-dark.png rename to res/gui/icons/64x64/deskflow-dark.png diff --git a/res/gui/icons/64x64/synergy-light.png b/res/gui/icons/64x64/deskflow-light.png similarity index 100% rename from res/gui/icons/64x64/synergy-light.png rename to res/gui/icons/64x64/deskflow-light.png diff --git a/res/gui/mac/Synergy.icns b/res/gui/mac/Deskflow.icns similarity index 100% rename from res/gui/mac/Synergy.icns rename to res/gui/mac/Deskflow.icns diff --git a/res/gui/mac/Info.plist b/res/gui/mac/Info.plist index 8d19d8c98..4dd49d0fc 100644 --- a/res/gui/mac/Info.plist +++ b/res/gui/mac/Info.plist @@ -4,18 +4,18 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - Synergy + Deskflow CFBundleExecutable - Synergy + Deskflow CFBundleIconFile - Synergy.icns + Deskflow.icns CFBundleIdentifier - synergy + deskflow CFBundleInfoDictionaryVersion 6.0 CFBundleName - Synergy + Deskflow CFBundlePackageType APPL CFBundleShortVersionString diff --git a/res/gui/mac/QSynergy.icns b/res/gui/mac/QSynergy.icns deleted file mode 100644 index 0d87c5a551aa3e814751d3f6cd8d2702eca558e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124558 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 #include -#define VER_FILEVERSION @SYNERGY_VERSION_MS_CSV@ -#define VER_FILEVERSION_STR "@SYNERGY_VERSION_MS@\0" +#define VER_FILEVERSION @DESKFLOW_VERSION_MS_CSV@ +#define VER_FILEVERSION_STR "@DESKFLOW_VERSION_MS@\0" -#define VER_PRODUCTVERSION @SYNERGY_VERSION_MS_CSV@ -#define VER_PRODUCTVERSION_STR "@SYNERGY_VERSION_MS@\0" +#define VER_PRODUCTVERSION @DESKFLOW_VERSION_MS_CSV@ +#define VER_PRODUCTVERSION_STR "@DESKFLOW_VERSION_MS@\0" #define VER_COMPANYNAME_STR "Symless\0" -#define VER_FILEDESCRIPTION_STR "Synergy\0" -#define VER_INTERNALNAME_STR "Synergy\0" -#define VER_LEGALCOPYRIGHT_STR "Copyright (C) Symless Ltd. @SYNERGY_BUILD_YEAR@\0" +#define VER_FILEDESCRIPTION_STR "Deskflow\0" +#define VER_INTERNALNAME_STR "Deskflow\0" +#define VER_LEGALCOPYRIGHT_STR "Copyright (C) Symless Ltd. @DESKFLOW_BUILD_YEAR@\0" #define VER_LEGALTRADEMARKS1_STR "All Rights Reserved\0" #define VER_LEGALTRADEMARKS2_STR "\0" #define VER_ORIGINALFILENAME_STR "\0" -#define VER_PRODUCTNAME_STR "Synergy\0" +#define VER_PRODUCTNAME_STR "Deskflow\0" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION @@ -51,4 +51,4 @@ BEGIN BEGIN VALUE "Translation", 0x409, 1252 END -END \ No newline at end of file +END diff --git a/scripts/daemon.py b/scripts/daemon.py index e0c2e8989..17873a9fa 100644 --- a/scripts/daemon.py +++ b/scripts/daemon.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -25,12 +25,12 @@ import psutil # type: ignore import lib.colors as colors import lib.file_utils as file_utils -DEFAULT_BIN_NAME = "synergyd" +DEFAULT_BIN_NAME = "deskflowd" DEFAULT_SOURCE_DIR = os.path.join("build", "temp", "bin") DEFAULT_TARGET_DIR = os.path.join("build", "bin") SERVICE_NOT_RUNNING_ERROR = 2 ERROR_ACCESS_VIOLATION = 0xC0000005 -IGNORE_PROCESSES = ["synergy.exe"] +IGNORE_PROCESSES = ["deskflow.exe"] class Context: @@ -140,7 +140,7 @@ def stop(context, target_dir): ensure_admin() print("Stopping daemon service") try: - subprocess.run(["net", "stop", "synergy"], shell=True, check=True) + subprocess.run(["net", "stop", "deskflow"], shell=True, check=True) except subprocess.CalledProcessError as e: if e.returncode == SERVICE_NOT_RUNNING_ERROR: print_verbose(context, "Daemon service not running") @@ -154,7 +154,7 @@ def stop(context, target_dir): def start(): ensure_admin() print("Starting daemon service") - subprocess.run(["net", "start", "synergy"], shell=True, check=True) + subprocess.run(["net", "start", "deskflow"], shell=True, check=True) def wait_for_stop(context, target_dir): diff --git a/scripts/fancy_copy.py b/scripts/fancy_copy.py index 6ac500dbb..84d01cf71 100644 --- a/scripts/fancy_copy.py +++ b/scripts/fancy_copy.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/install_deps.py b/scripts/install_deps.py index 96611e079..7f13740f3 100755 --- a/scripts/install_deps.py +++ b/scripts/install_deps.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/certificate.py b/scripts/lib/certificate.py index 8abcc578c..927cbacb2 100644 --- a/scripts/lib/certificate.py +++ b/scripts/lib/certificate.py @@ -1,6 +1,6 @@ import os, base64 -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/cmd_utils.py b/scripts/lib/cmd_utils.py index 13c5365a1..26fbaa958 100644 --- a/scripts/lib/cmd_utils.py +++ b/scripts/lib/cmd_utils.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/colors.py b/scripts/lib/colors.py index 78237e96a..ff020aa44 100644 --- a/scripts/lib/colors.py +++ b/scripts/lib/colors.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/config.py b/scripts/lib/config.py index d106113f7..27d579043 100644 --- a/scripts/lib/config.py +++ b/scripts/lib/config.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/env.py b/scripts/lib/env.py index 6dba75040..46d90b908 100644 --- a/scripts/lib/env.py +++ b/scripts/lib/env.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -240,7 +240,7 @@ def get_app_version(): """ Returns the version either from the env var, or from the version file. """ - version = get_env("SYNERGY_VERSION", required=False) + version = get_env("DESKFLOW_VERSION", required=False) if version: return version diff --git a/scripts/lib/file_utils.py b/scripts/lib/file_utils.py index 4cb756c40..e6ba02e15 100644 --- a/scripts/lib/file_utils.py +++ b/scripts/lib/file_utils.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/fs.py b/scripts/lib/fs.py index 5aac7c9f6..0fde6e1f5 100644 --- a/scripts/lib/fs.py +++ b/scripts/lib/fs.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/github.py b/scripts/lib/github.py index abc6bda8e..b54015010 100644 --- a/scripts/lib/github.py +++ b/scripts/lib/github.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/linux.py b/scripts/lib/linux.py index 8ffb7e3d0..50c20ab4d 100644 --- a/scripts/lib/linux.py +++ b/scripts/lib/linux.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -26,8 +26,8 @@ class PackageType(Enum): dist_dir = "dist" build_dir = "build" -package_name = "synergy" -test_cmd = "synergys --version" +package_name = "deskflow" +test_cmd = "deskflows --version" def run_command(command, check=True): @@ -140,19 +140,19 @@ def test_install(package_file, remove_test=True): if "debian" in distro_like: install_base = ["apt", "install", "-f", "-y"] remove_base = ["apt", "remove", "-y"] - list_cmd = ["dpkg", "-L", "synergy"] + list_cmd = ["dpkg", "-L", "deskflow"] elif "fedora" in distro_like: install_base = ["dnf", "install", "-y"] remove_base = ["dnf", "remove", "-y"] - list_cmd = ["rpm", "-ql", "synergy"] + list_cmd = ["rpm", "-ql", "deskflow"] elif "opensuse" in distro_like: install_base = ["zypper", "--no-gpg-checks", "install", "-y"] remove_base = ["zypper", "remove", "-y"] - list_cmd = ["rpm", "-ql", "synergy"] + list_cmd = ["rpm", "-ql", "deskflow"] elif "arch" in distro_like: install_base = ["pacman", "-U", "--noconfirm"] remove_base = ["pacman", "-R", "--noconfirm"] - list_cmd = ["pacman", "-Ql", "synergy"] + list_cmd = ["pacman", "-Ql", "deskflow"] else: raise RuntimeError(f"Linux distro not yet supported: {distro}") diff --git a/scripts/lib/mac.py b/scripts/lib/mac.py index e788121f6..ac6cd8624 100644 --- a/scripts/lib/mac.py +++ b/scripts/lib/mac.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -24,9 +24,9 @@ notary_user_env = "APPLE_NOTARY_USER" codesign_env = "APPLE_CODESIGN_ID" shell_rc = "~/.zshrc" dist_dir = "dist" -product_name = "Synergy 1" +product_name = "Deskflow" settings_file = "res/dist/macos/dmgbuild/settings.py" -app_path = "build/bundle/Synergy.app" +app_path = "build/bundle/Deskflow.app" security_path = "/usr/bin/security" sudo_path = "/usr/bin/sudo" notarytool_path = "/usr/bin/notarytool" diff --git a/scripts/lib/meson.py b/scripts/lib/meson.py index 77f660d02..9b3fb7ef6 100644 --- a/scripts/lib/meson.py +++ b/scripts/lib/meson.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/qt_utils.py b/scripts/lib/qt_utils.py index 97ca4ba5c..ca830f638 100644 --- a/scripts/lib/qt_utils.py +++ b/scripts/lib/qt_utils.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/vcpkg.py b/scripts/lib/vcpkg.py index ed30fc27b..9b735c20a 100644 --- a/scripts/lib/vcpkg.py +++ b/scripts/lib/vcpkg.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lib/windows.py b/scripts/lib/windows.py index ffd1cff35..163f9af48 100644 --- a/scripts/lib/windows.py +++ b/scripts/lib/windows.py @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -26,8 +26,8 @@ CERTUTIL_CMD = "certutil" RUNNER_TEMP_ENV = "RUNNER_TEMP" DIST_DIR = "dist" BUILD_DIR = "build" -WIX_FILE = f"{BUILD_DIR}/installer/Synergy.sln" -MSI_FILE = f"{BUILD_DIR}/installer/bin/Release/Synergy.msi" +WIX_FILE = f"{BUILD_DIR}/installer/Deskflow.sln" +MSI_FILE = f"{BUILD_DIR}/installer/bin/Release/Deskflow.msi" def run_elevated(script, args=None, use_sys_argv=True, wait_for_exit=False): diff --git a/scripts/lint_clang.py b/scripts/lint_clang.py index 2b5ad77d7..b374b5cd9 100755 --- a/scripts/lint_clang.py +++ b/scripts/lint_clang.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/lint_cmake.py b/scripts/lint_cmake.py index 86aedbc40..cdba81eef 100755 --- a/scripts/lint_cmake.py +++ b/scripts/lint_cmake.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/scripts/package.py b/scripts/package.py index 6a073a3f7..303fc2a29 100755 --- a/scripts/package.py +++ b/scripts/package.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ from lib.linux import PackageType from dotenv import load_dotenv # type: ignore env_file = ".env" -default_package_prefix = "synergy" +default_package_prefix = "deskflow" def main(): @@ -56,7 +56,9 @@ def main(): def get_filename_base(version, use_linux_distro=True): os = env.get_os() machine = platform.machine().lower() - package_base = env.get_env("SYNERGY_PACKAGE_PREFIX", default=default_package_prefix) + package_base = env.get_env( + "DESKFLOW_PACKAGE_PREFIX", default=default_package_prefix + ) os_part = os if os == "linux" and use_linux_distro: diff --git a/scripts/pyproject.toml b/scripts/pyproject.toml index 197d5baa1..4fb0d669a 100644 --- a/scripts/pyproject.toml +++ b/scripts/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "scripts" version = "0.0.1" -description = "Scripts to assist with development of Synergy" +description = "Scripts to assist with development of Deskflow" requires-python = ">=3.9" dependencies = [ "cmake_format", diff --git a/scripts/tests.py b/scripts/tests.py index 801b0cee0..411db37b8 100755 --- a/scripts/tests.py +++ b/scripts/tests.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 08919fd96..338b10908 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 69026a477..8b1ea36f1 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -14,13 +14,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -add_subdirectory(synergyd) +add_subdirectory(deskflowd) if(BUILD_UNIFIED) - add_subdirectory(synergy-core) + add_subdirectory(deskflow-core) else() - add_subdirectory(synergyc) - add_subdirectory(synergys) + add_subdirectory(deskflowc) + add_subdirectory(deskflows) endif(BUILD_UNIFIED) -add_subdirectory(syntool) +add_subdirectory(deskflow-legacy) diff --git a/src/cmd/synergy-core/CMakeLists.txt b/src/cmd/deskflow-core/CMakeLists.txt similarity index 87% rename from src/cmd/synergy-core/CMakeLists.txt rename to src/cmd/deskflow-core/CMakeLists.txt index caf53c8ea..09ba27ef6 100644 --- a/src/cmd/synergy-core/CMakeLists.txt +++ b/src/cmd/deskflow-core/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -set(target synergy-core) +set(target deskflow-core) set(sources ${target}.cpp) @@ -34,11 +34,11 @@ target_link_libraries( ipc platform server - synlib + app ${libs}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install(TARGETS ${target} DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) + install(TARGETS ${target} DESTINATION ${DESKFLOW_BUNDLE_BINARY_DIR}) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") install(TARGETS ${target} DESTINATION bin) endif() diff --git a/src/cmd/synergy-core/synergy-core.cpp b/src/cmd/deskflow-core/deskflow-core.cpp similarity index 79% rename from src/cmd/synergy-core/synergy-core.cpp rename to src/cmd/deskflow-core/deskflow-core.cpp index 0bda69b67..e5e434108 100644 --- a/src/cmd/synergy-core/synergy-core.cpp +++ b/src/cmd/deskflow-core/deskflow-core.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2022 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,8 +18,8 @@ #include "arch/Arch.h" #include "base/EventQueue.h" #include "base/Log.h" -#include "synergy/ClientApp.h" -#include "synergy/ServerApp.h" +#include "deskflow/ClientApp.h" +#include "deskflow/ServerApp.h" #include #if SYSAPI_WIN32 @@ -27,11 +27,11 @@ #endif void showHelp() { - std::cout << "Usage: synergy-core [...options]" + std::cout << "Usage: deskflow-core [...options]" << std::endl; - std::cout << "server - start as a server (synergys)" << std::endl; - std::cout << "client - start as a client (synergyc)" << std::endl; - std::cout << "use synergy-core --help for more information." + std::cout << "server - start as a server (deskflows)" << std::endl; + std::cout << "client - start as a client (deskflowc)" << std::endl; + std::cout << "use deskflow-core --help for more information." << std::endl; } diff --git a/src/cmd/synergy-core/synergy-core.exe.manifest b/src/cmd/deskflow-core/deskflow-core.exe.manifest similarity index 100% rename from src/cmd/synergy-core/synergy-core.exe.manifest rename to src/cmd/deskflow-core/deskflow-core.exe.manifest diff --git a/src/cmd/syntool/CMakeLists.txt b/src/cmd/deskflow-legacy/CMakeLists.txt similarity index 87% rename from src/cmd/syntool/CMakeLists.txt rename to src/cmd/deskflow-legacy/CMakeLists.txt index 701db0c62..e3051748e 100644 --- a/src/cmd/syntool/CMakeLists.txt +++ b/src/cmd/deskflow-legacy/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -set(target syntool) +set(target deskflow-legacy) file(GLOB headers "*.h") file(GLOB sources "*.cpp") @@ -26,7 +26,7 @@ endif() add_executable(${target} ${sources}) target_link_libraries( ${target} - synlib + app arch base client @@ -39,7 +39,7 @@ target_link_libraries( ${libs}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install(TARGETS ${target} DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) + install(TARGETS ${target} DESTINATION ${DESKFLOW_BUNDLE_BINARY_DIR}) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") install(TARGETS ${target} DESTINATION bin) endif() diff --git a/src/cmd/syntool/syntool.cpp b/src/cmd/deskflow-legacy/deskflow-legacy.cpp similarity index 92% rename from src/cmd/syntool/syntool.cpp rename to src/cmd/deskflow-legacy/deskflow-legacy.cpp index d813c7ba2..70e68a178 100644 --- a/src/cmd/syntool/syntool.cpp +++ b/src/cmd/deskflow-legacy/deskflow-legacy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -16,7 +16,7 @@ */ #include "arch/Arch.h" -#include "synergy/ToolApp.h" +#include "deskflow/ToolApp.h" #if SYSAPI_WIN32 #include "arch/win32/ArchMiscWindows.h" diff --git a/src/cmd/synergyc/.gitignore b/src/cmd/deskflowc/.gitignore similarity index 100% rename from src/cmd/synergyc/.gitignore rename to src/cmd/deskflowc/.gitignore diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/deskflowc/CMakeLists.txt similarity index 91% rename from src/cmd/synergyc/CMakeLists.txt rename to src/cmd/deskflowc/CMakeLists.txt index f728adcc1..0480223cd 100644 --- a/src/cmd/synergyc/CMakeLists.txt +++ b/src/cmd/deskflowc/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -set(target synergyc) +set(target deskflowc) set(sources ${target}.cpp) @@ -60,11 +60,11 @@ target_link_libraries( ipc platform server - synlib + app ${libs}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install(TARGETS ${target} DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) + install(TARGETS ${target} DESTINATION ${DESKFLOW_BUNDLE_BINARY_DIR}) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") install(TARGETS ${target} DESTINATION bin) endif() diff --git a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp similarity index 99% rename from src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp rename to src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp index 6b87c4b86..2f0a3b10b 100644 --- a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp +++ b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -315,10 +315,10 @@ IArchTaskBarReceiver *createTaskBarReceiver( const BufferedLogOutputter *logBuffer, IEventQueue *events) { ArchMiscWindows::setIcons( (HICON)LoadImage( - ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_SYNERGY), + ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_DESKFLOW), IMAGE_ICON, 32, 32, LR_SHARED), (HICON)LoadImage( - ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_SYNERGY), + ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_DESKFLOW), IMAGE_ICON, 16, 16, LR_SHARED)); return new MSWindowsClientTaskBarReceiver( diff --git a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h similarity index 95% rename from src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h rename to src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h index e952685eb..090a0cced 100644 --- a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h +++ b/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ClientTaskBarReceiver.h" +#include "deskflow/ClientTaskBarReceiver.h" #define WIN32_LEAN_AND_MEAN #include diff --git a/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp b/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp similarity index 96% rename from src/cmd/synergyc/OSXClientTaskBarReceiver.cpp rename to src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp index 424a27564..bbd8e12e5 100644 --- a/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp +++ b/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/cmd/synergyc/OSXClientTaskBarReceiver.h b/src/cmd/deskflowc/OSXClientTaskBarReceiver.h similarity index 92% rename from src/cmd/synergyc/OSXClientTaskBarReceiver.h rename to src/cmd/deskflowc/OSXClientTaskBarReceiver.h index 49d1c169d..31e3d971f 100644 --- a/src/cmd/synergyc/OSXClientTaskBarReceiver.h +++ b/src/cmd/deskflowc/OSXClientTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ClientTaskBarReceiver.h" +#include "deskflow/ClientTaskBarReceiver.h" class BufferedLogOutputter; class IEventQueue; diff --git a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp similarity index 96% rename from src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp rename to src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp index 0c124e536..0f45b919d 100644 --- a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp +++ b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h similarity index 94% rename from src/cmd/synergyc/XWindowsClientTaskBarReceiver.h rename to src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h index f38ee596e..91fa3d189 100644 --- a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h +++ b/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ClientTaskBarReceiver.h" +#include "deskflow/ClientTaskBarReceiver.h" class BufferedLogOutputter; class IEventQueue; diff --git a/src/cmd/synergyc/synergyc.exe.manifest b/src/cmd/deskflowc/deskflow.exe.manifest similarity index 100% rename from src/cmd/synergyc/synergyc.exe.manifest rename to src/cmd/deskflowc/deskflow.exe.manifest diff --git a/src/cmd/synergyc/synergyc.cpp b/src/cmd/deskflowc/deskflowc.cpp similarity index 94% rename from src/cmd/synergyc/synergyc.cpp rename to src/cmd/deskflowc/deskflowc.cpp index 137b07e2a..f0d162125 100644 --- a/src/cmd/synergyc/synergyc.cpp +++ b/src/cmd/deskflowc/deskflowc.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,7 +19,7 @@ #include "arch/Arch.h" #include "base/EventQueue.h" #include "base/Log.h" -#include "synergy/ClientApp.h" +#include "deskflow/ClientApp.h" #if SYSAPI_WIN32 #include "arch/win32/ArchMiscWindows.h" diff --git a/src/cmd/synergyc/synergyc.ico b/src/cmd/deskflowc/deskflowc.ico similarity index 100% rename from src/cmd/synergyc/synergyc.ico rename to src/cmd/deskflowc/deskflowc.ico diff --git a/src/cmd/synergyc/synergyc.rc b/src/cmd/deskflowc/deskflowc.rc similarity index 92% rename from src/cmd/synergyc/synergyc.rc rename to src/cmd/deskflowc/deskflowc.rc index 7f2a5dc1c..109c0336a 100644 --- a/src/cmd/synergyc/synergyc.rc +++ b/src/cmd/deskflowc/deskflowc.rc @@ -57,7 +57,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_SYNERGY ICON DISCARDABLE "synergyc.ico" +IDI_DESKFLOW ICON DISCARDABLE "deskflowc.ico" IDI_TASKBAR_NOT_RUNNING ICON DISCARDABLE "tb_idle.ico" IDI_TASKBAR_NOT_WORKING ICON DISCARDABLE "tb_error.ico" IDI_TASKBAR_NOT_CONNECTED ICON DISCARDABLE "tb_wait.ico" @@ -84,7 +84,7 @@ END IDR_TASKBAR MENU DISCARDABLE BEGIN - POPUP "Synergy" + POPUP "Deskflow" BEGIN MENUITEM "Show Status", IDC_TASKBAR_STATUS MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG @@ -119,8 +119,8 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_FAILED "Synergy is about to quit with errors or warnings. Please check the log then click OK." - IDS_INIT_FAILED "Synergy failed to initialize: %{1}" + IDS_FAILED "Deskflow is about to quit with errors or warnings. Please check the log then click OK." + IDS_INIT_FAILED "Deskflow failed to initialize: %{1}" IDS_UNCAUGHT_EXCEPTION "Uncaught exception: %{1}" END diff --git a/src/cmd/synergyc/resource.h b/src/cmd/deskflowc/resource.h similarity index 95% rename from src/cmd/synergyc/resource.h rename to src/cmd/deskflowc/resource.h index a21e9c048..645de76a7 100644 --- a/src/cmd/synergyc/resource.h +++ b/src/cmd/deskflowc/resource.h @@ -1,11 +1,11 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by synergyc.rc +// Used by deskflowc.rc // #define IDS_FAILED 1 #define IDS_INIT_FAILED 2 #define IDS_UNCAUGHT_EXCEPTION 3 -#define IDI_SYNERGY 101 +#define IDI_DESKFLOW 101 #define IDI_TASKBAR_NOT_RUNNING 102 #define IDI_TASKBAR_NOT_WORKING 103 #define IDI_TASKBAR_NOT_CONNECTED 104 diff --git a/src/cmd/synergyc/tb_error.ico b/src/cmd/deskflowc/tb_error.ico similarity index 100% rename from src/cmd/synergyc/tb_error.ico rename to src/cmd/deskflowc/tb_error.ico diff --git a/src/cmd/synergyc/tb_idle.ico b/src/cmd/deskflowc/tb_idle.ico similarity index 100% rename from src/cmd/synergyc/tb_idle.ico rename to src/cmd/deskflowc/tb_idle.ico diff --git a/src/cmd/synergyc/tb_run.ico b/src/cmd/deskflowc/tb_run.ico similarity index 100% rename from src/cmd/synergyc/tb_run.ico rename to src/cmd/deskflowc/tb_run.ico diff --git a/src/cmd/synergyc/tb_wait.ico b/src/cmd/deskflowc/tb_wait.ico similarity index 100% rename from src/cmd/synergyc/tb_wait.ico rename to src/cmd/deskflowc/tb_wait.ico diff --git a/src/cmd/synergyd/CMakeLists.txt b/src/cmd/deskflowd/CMakeLists.txt similarity index 92% rename from src/cmd/synergyd/CMakeLists.txt rename to src/cmd/deskflowd/CMakeLists.txt index 8e92f5939..b63a49124 100644 --- a/src/cmd/synergyd/CMakeLists.txt +++ b/src/cmd/deskflowd/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -set(target synergyd) +set(target deskflowd) file(GLOB headers "*.h") file(GLOB sources "*.cpp") @@ -34,7 +34,7 @@ target_link_libraries( mt net platform - synlib + app license ${libs}) diff --git a/src/cmd/synergyd/synergyd.cpp b/src/cmd/deskflowd/deskflowd.cpp similarity index 92% rename from src/cmd/synergyd/synergyd.cpp rename to src/cmd/deskflowd/deskflowd.cpp index 446ee3717..42b2b266f 100644 --- a/src/cmd/synergyd/synergyd.cpp +++ b/src/cmd/deskflowd/deskflowd.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/DaemonApp.h" +#include "deskflow/DaemonApp.h" #include diff --git a/src/cmd/synergys/.gitignore b/src/cmd/deskflows/.gitignore similarity index 100% rename from src/cmd/synergys/.gitignore rename to src/cmd/deskflows/.gitignore diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/deskflows/CMakeLists.txt similarity index 91% rename from src/cmd/synergys/CMakeLists.txt rename to src/cmd/deskflows/CMakeLists.txt index 5e3908c3c..13a8ddfca 100644 --- a/src/cmd/synergys/CMakeLists.txt +++ b/src/cmd/deskflows/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -set(target synergys) +set(target deskflows) set(sources ${target}.cpp) @@ -60,11 +60,11 @@ target_link_libraries( ipc platform server - synlib + app ${libs}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install(TARGETS ${target} DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) + install(TARGETS ${target} DESTINATION ${DESKFLOW_BUNDLE_BINARY_DIR}) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") install(TARGETS ${target} DESTINATION bin) endif() diff --git a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp similarity index 98% rename from src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp rename to src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp index b54737e91..ec1d762f1 100644 --- a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp +++ b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -185,7 +185,7 @@ void MSWindowsServerTaskBarReceiver::runMenu(int x, int y) { m_events->getSystemTarget())); break; - case ID_SYNERGY_RESETSERVER: + case ID_DESKFLOW_RESETSERVER: m_events->addEvent(Event( m_events->forServerApp().resetServer(), m_events->getSystemTarget())); break; @@ -348,10 +348,10 @@ IArchTaskBarReceiver *createTaskBarReceiver( const BufferedLogOutputter *logBuffer, IEventQueue *events) { ArchMiscWindows::setIcons( (HICON)LoadImage( - ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_SYNERGY), + ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_DESKFLOW), IMAGE_ICON, 32, 32, LR_SHARED), (HICON)LoadImage( - ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_SYNERGY), + ArchMiscWindows::instanceWin32(), MAKEINTRESOURCE(IDI_DESKFLOW), IMAGE_ICON, 16, 16, LR_SHARED)); return new MSWindowsServerTaskBarReceiver( diff --git a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.h b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h similarity index 95% rename from src/cmd/synergys/MSWindowsServerTaskBarReceiver.h rename to src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h index d5f544f05..4b0d1484d 100644 --- a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.h +++ b/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ServerTaskBarReceiver.h" +#include "deskflow/ServerTaskBarReceiver.h" #define WIN32_LEAN_AND_MEAN #include diff --git a/src/cmd/synergys/OSXServerTaskBarReceiver.cpp b/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp similarity index 96% rename from src/cmd/synergys/OSXServerTaskBarReceiver.cpp rename to src/cmd/deskflows/OSXServerTaskBarReceiver.cpp index ab4311c22..3dc8684b9 100644 --- a/src/cmd/synergys/OSXServerTaskBarReceiver.cpp +++ b/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/cmd/synergys/OSXServerTaskBarReceiver.h b/src/cmd/deskflows/OSXServerTaskBarReceiver.h similarity index 92% rename from src/cmd/synergys/OSXServerTaskBarReceiver.h rename to src/cmd/deskflows/OSXServerTaskBarReceiver.h index b95702d3c..c2c4a6402 100644 --- a/src/cmd/synergys/OSXServerTaskBarReceiver.h +++ b/src/cmd/deskflows/OSXServerTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ServerTaskBarReceiver.h" +#include "deskflow/ServerTaskBarReceiver.h" class BufferedLogOutputter; diff --git a/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp similarity index 96% rename from src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp rename to src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp index 124f7a96d..64212cee9 100644 --- a/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp +++ b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/cmd/synergys/XWindowsServerTaskBarReceiver.h b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h similarity index 94% rename from src/cmd/synergys/XWindowsServerTaskBarReceiver.h rename to src/cmd/deskflows/XWindowsServerTaskBarReceiver.h index 35a8f18cd..54c5d7746 100644 --- a/src/cmd/synergys/XWindowsServerTaskBarReceiver.h +++ b/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ServerTaskBarReceiver.h" +#include "deskflow/ServerTaskBarReceiver.h" class BufferedLogOutputter; class IEventQueue; diff --git a/src/cmd/synergys/synergys.cpp b/src/cmd/deskflows/deskflows.cpp similarity index 94% rename from src/cmd/synergys/synergys.cpp rename to src/cmd/deskflows/deskflows.cpp index 65d67ced3..931395066 100644 --- a/src/cmd/synergys/synergys.cpp +++ b/src/cmd/deskflows/deskflows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,7 +19,7 @@ #include "arch/Arch.h" #include "base/EventQueue.h" #include "base/Log.h" -#include "synergy/ServerApp.h" +#include "deskflow/ServerApp.h" #if SYSAPI_WIN32 #include "arch/win32/ArchMiscWindows.h" diff --git a/src/cmd/synergys/synergys.exe.manifest b/src/cmd/deskflows/deskflows.exe.manifest similarity index 100% rename from src/cmd/synergys/synergys.exe.manifest rename to src/cmd/deskflows/deskflows.exe.manifest diff --git a/src/cmd/synergys/synergys.ico b/src/cmd/deskflows/deskflows.ico similarity index 100% rename from src/cmd/synergys/synergys.ico rename to src/cmd/deskflows/deskflows.ico diff --git a/src/cmd/synergys/synergys.rc b/src/cmd/deskflows/deskflows.rc similarity index 88% rename from src/cmd/synergys/synergys.rc rename to src/cmd/deskflows/deskflows.rc index 860d6f548..386de1328 100644 --- a/src/cmd/synergys/synergys.rc +++ b/src/cmd/deskflows/deskflows.rc @@ -54,7 +54,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_SYNERGY ICON "synergys.ico" +IDI_DESKFLOW ICON "deskflows.ico" IDI_TASKBAR_NOT_RUNNING ICON "tb_idle.ico" IDI_TASKBAR_NOT_WORKING ICON "tb_error.ico" IDI_TASKBAR_NOT_CONNECTED ICON "tb_wait.ico" @@ -67,7 +67,7 @@ IDI_TASKBAR_CONNECTED ICON "tb_run.ico" IDR_TASKBAR MENU BEGIN - POPUP "Synergy" + POPUP "Deskflow" BEGIN MENUITEM "Show Status", IDC_TASKBAR_STATUS MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG @@ -84,7 +84,7 @@ BEGIN END MENUITEM "Reload Configuration", IDC_RELOAD_CONFIG MENUITEM "Force Reconnect", IDC_FORCE_RECONNECT - MENUITEM "Reset Server", ID_SYNERGY_RESETSERVER + MENUITEM "Reset Server", ID_DESKFLOW_RESETSERVER MENUITEM SEPARATOR MENUITEM "Quit", IDC_TASKBAR_QUIT END @@ -112,8 +112,8 @@ END STRINGTABLE BEGIN - IDS_FAILED "Synergy is about to quit with errors or warnings. Please check the log then click OK." - IDS_INIT_FAILED "Synergy failed to initialize: %{1}" + IDS_FAILED "Deskflow is about to quit with errors or warnings. Please check the log then click OK." + IDS_INIT_FAILED "Deskflow failed to initialize: %{1}" IDS_UNCAUGHT_EXCEPTION "Uncaught exception: %{1}" END diff --git a/src/cmd/synergys/resource.h b/src/cmd/deskflows/resource.h similarity index 90% rename from src/cmd/synergys/resource.h rename to src/cmd/deskflows/resource.h index 2d098c7c1..0c4c0b349 100644 --- a/src/cmd/synergys/resource.h +++ b/src/cmd/deskflows/resource.h @@ -1,11 +1,11 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by synergys.rc +// Used by deskflows.rc // #define IDS_FAILED 1 #define IDS_INIT_FAILED 2 #define IDS_UNCAUGHT_EXCEPTION 3 -#define IDI_SYNERGY 101 +#define IDI_DESKFLOW 101 #define IDI_TASKBAR_NOT_RUNNING 102 #define IDI_TASKBAR_NOT_WORKING 103 #define IDI_TASKBAR_NOT_CONNECTED 104 @@ -27,8 +27,8 @@ #define IDC_TASKBAR_LOG_LEVEL_DEBUG 40013 #define IDC_TASKBAR_LOG_LEVEL_DEBUG1 40014 #define IDC_TASKBAR_LOG_LEVEL_DEBUG2 40015 -#define ID_SYNERGY_RELOADSYSTEM 40016 -#define ID_SYNERGY_RESETSERVER 40017 +#define ID_DESKFLOW_RELOADSYSTEM 40016 +#define ID_DESKFLOW_RESETSERVER 40017 // Next default values for new objects // diff --git a/src/cmd/synergys/tb_error.ico b/src/cmd/deskflows/tb_error.ico similarity index 100% rename from src/cmd/synergys/tb_error.ico rename to src/cmd/deskflows/tb_error.ico diff --git a/src/cmd/synergys/tb_idle.ico b/src/cmd/deskflows/tb_idle.ico similarity index 100% rename from src/cmd/synergys/tb_idle.ico rename to src/cmd/deskflows/tb_idle.ico diff --git a/src/cmd/synergys/tb_run.ico b/src/cmd/deskflows/tb_run.ico similarity index 100% rename from src/cmd/synergys/tb_run.ico rename to src/cmd/deskflows/tb_run.ico diff --git a/src/cmd/synergys/tb_wait.ico b/src/cmd/deskflows/tb_wait.ico similarity index 100% rename from src/cmd/synergys/tb_wait.ico rename to src/cmd/deskflows/tb_wait.ico diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 862d85d04..163803675 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -set(target synergy) +set(target deskflow) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) @@ -21,7 +21,7 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(res_dir ${CMAKE_SOURCE_DIR}/res/gui) -set(qrc_file ${res_dir}/Synergy.qrc) +set(qrc_file ${res_dir}/Deskflow.qrc) file( GLOB @@ -33,7 +33,7 @@ file( file(GLOB ui_files src/*.ui) if(WIN32) - set(rc_files ${res_dir}/win/Synergy.rc ${CMAKE_BINARY_DIR}/src/version.rc) + set(rc_files ${res_dir}/win/Deskflow.rc ${CMAKE_BINARY_DIR}/src/version.rc) endif() add_executable(${target} WIN32 ${sources} ${ui_files} ${rc_files} ${qrc_file}) @@ -54,9 +54,9 @@ target_link_libraries( Qt6::Network) target_compile_definitions( - ${target} PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}") + ${target} PRIVATE -DDESKFLOW_VERSION_STAGE="${DESKFLOW_VERSION_STAGE}") target_compile_definitions(${target} - PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}") + PRIVATE -DDESKFLOW_REVISION="${DESKFLOW_REVISION}") if(WIN32) set_target_properties(${target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT") @@ -68,9 +68,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") message(STATUS "Found macdeployqt6: ${MACDEPLOYQT_BIN}") set(MACDEPLOYQT_CMD - "${MACDEPLOYQT_BIN} ${SYNERGY_BUNDLE_APP_DIR} -always-overwrite") + "${MACDEPLOYQT_BIN} ${DESKFLOW_BUNDLE_APP_DIR} -always-overwrite") - install(TARGETS ${target} DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) + install(TARGETS ${target} DESTINATION ${DESKFLOW_BUNDLE_BINARY_DIR}) install(CODE "MESSAGE (\"Running: ${MACDEPLOYQT_CMD}\")") install(CODE "execute_process(COMMAND ${MACDEPLOYQT_CMD})") @@ -109,7 +109,7 @@ elseif(WIN32) POST_BUILD COMMAND set PATH=%PATH%$${qt6_install_prefix}/bin COMMAND Qt6::windeployqt - "$/$") + "$/$") endif() endif() diff --git a/src/gui/src/AboutDialog.cpp b/src/gui/src/AboutDialog.cpp index 0838257b4..36e3c3028 100644 --- a/src/gui/src/AboutDialog.cpp +++ b/src/gui/src/AboutDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -25,7 +25,7 @@ #include #include -using namespace synergy::gui; +using namespace deskflow::gui; AboutDialog::AboutDialog(MainWindow *parent) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), @@ -35,8 +35,8 @@ AboutDialog::AboutDialog(MainWindow *parent) this->setFixedSize(this->size()); - QString version = QString::fromStdString(synergy::version()); - m_pLabelSynergyVersion->setText(version); + QString version = QString::fromStdString(deskflow::version()); + m_pLabelDeskflowVersion->setText(version); QString buildDateString = QString::fromLocal8Bit(__DATE__).simplified(); QDate buildDate = QLocale("en_US").toDate(buildDateString, "MMM d yyyy"); @@ -46,7 +46,7 @@ AboutDialog::AboutDialog(MainWindow *parent) int AboutDialog::exec() { m_pDevelopersLabel->setText(importantDevelopers()); - m_pCopyrightLabel->setText(QString::fromStdString(synergy::copyright())); + m_pCopyrightLabel->setText(QString::fromStdString(deskflow::copyright())); updateLogo(); return QDialog::exec(); @@ -71,7 +71,7 @@ QString AboutDialog::importantDevelopers() const { // Chris is the ultimate creator, and the one who started it all in 2001. << "Chris Schoeneman" - // Richard and Adam developed CosmoSynergy, the 90's predecessor project. + // Richard and Adam developed CosmoDeskflow, the 90's predecessor project. << "Richard Lee" << "Adam Feder" diff --git a/src/gui/src/AboutDialog.h b/src/gui/src/AboutDialog.h index 27d26987f..576c794f5 100644 --- a/src/gui/src/AboutDialog.h +++ b/src/gui/src/AboutDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/AboutDialogBase.ui b/src/gui/src/AboutDialogBase.ui index ca04453ba..5dc084f20 100644 --- a/src/gui/src/AboutDialogBase.ui +++ b/src/gui/src/AboutDialogBase.ui @@ -17,7 +17,7 @@ - About Synergy + About Deskflow true @@ -185,7 +185,7 @@ - + 0 diff --git a/src/gui/src/Action.cpp b/src/gui/src/Action.cpp index 3a4823752..610ba359b 100644 --- a/src/gui/src/Action.cpp +++ b/src/gui/src/Action.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/Action.h b/src/gui/src/Action.h index 3a6ef3369..be4c7338a 100644 --- a/src/gui/src/Action.h +++ b/src/gui/src/Action.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp index 4a3c8b5e0..a691e9574 100644 --- a/src/gui/src/ActionDialog.cpp +++ b/src/gui/src/ActionDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ActionDialog.h b/src/gui/src/ActionDialog.h index c112dd2c9..373e2ac11 100644 --- a/src/gui/src/ActionDialog.h +++ b/src/gui/src/ActionDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ActivationDialog.cpp b/src/gui/src/ActivationDialog.cpp index a9bb37302..5d36765b9 100644 --- a/src/gui/src/ActivationDialog.cpp +++ b/src/gui/src/ActivationDialog.cpp @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2016 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -32,8 +32,8 @@ #include #include -using namespace synergy::gui; -using namespace synergy::license; +using namespace deskflow::gui; +using namespace deskflow::license; ActivationDialog::ActivationDialog( QWidget *parent, AppConfig &appConfig, LicenseHandler &licenseHandler) @@ -52,7 +52,7 @@ ActivationDialog::ActivationDialog( m_ui->m_widgetNotice->hide(); } - const QString envSerialKey = ::getenv("SYNERGY_TEST_SERIAL_KEY"); + const QString envSerialKey = ::getenv("DESKFLOW_TEST_SERIAL_KEY"); if (!envSerialKey.isEmpty()) { qDebug() << "using env test serial key:" << envSerialKey; m_ui->m_pTextEditSerialKey->setText(envSerialKey); @@ -178,7 +178,7 @@ void ActivationDialog::showSuccessDialog() { void ActivationDialog::showErrorDialog(const QString &message) { QString fullMessage = - QString("

There was a problem activating Synergy.

" + QString("

There was a problem activating Deskflow.

" R"(

Please contact us )" "and provide the following information:

" "%3") diff --git a/src/gui/src/ActivationDialog.h b/src/gui/src/ActivationDialog.h index b44a0fcc9..ca1d7c3a3 100644 --- a/src/gui/src/ActivationDialog.h +++ b/src/gui/src/ActivationDialog.h @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2016 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/gui/src/AddClientDialog.cpp b/src/gui/src/AddClientDialog.cpp index d9d5cd91a..0c1b3395c 100644 --- a/src/gui/src/AddClientDialog.cpp +++ b/src/gui/src/AddClientDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/AddClientDialog.h b/src/gui/src/AddClientDialog.h index 1c2cac8e0..5c88c0df6 100644 --- a/src/gui/src/AddClientDialog.h +++ b/src/gui/src/AddClientDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/CancelActivationDialog.cpp b/src/gui/src/CancelActivationDialog.cpp index d766f8382..be2810232 100644 --- a/src/gui/src/CancelActivationDialog.cpp +++ b/src/gui/src/CancelActivationDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/CancelActivationDialog.h b/src/gui/src/CancelActivationDialog.h index 483960979..41debe971 100644 --- a/src/gui/src/CancelActivationDialog.h +++ b/src/gui/src/CancelActivationDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/DataDownloader.cpp b/src/gui/src/DataDownloader.cpp index 4fa279708..1e0022a41 100644 --- a/src/gui/src/DataDownloader.cpp +++ b/src/gui/src/DataDownloader.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/DataDownloader.h b/src/gui/src/DataDownloader.h index 629e896ef..7bf455ae7 100644 --- a/src/gui/src/DataDownloader.h +++ b/src/gui/src/DataDownloader.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/QSynergyApplication.cpp b/src/gui/src/DeskflowApplication.cpp similarity index 85% rename from src/gui/src/QSynergyApplication.cpp rename to src/gui/src/DeskflowApplication.cpp index 20f671d55..3baf78a82 100644 --- a/src/gui/src/QSynergyApplication.cpp +++ b/src/gui/src/DeskflowApplication.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#include "QSynergyApplication.h" +#include "DeskflowApplication.h" #include "MainWindow.h" #include #include -QSynergyApplication::QSynergyApplication(int &argc, char **argv) +DeskflowApplication::DeskflowApplication(int &argc, char **argv) : QApplication(argc, argv) { // causes dark mode to be used on some OS (e.g. Windows) diff --git a/src/gui/src/QSynergyApplication.h b/src/gui/src/DeskflowApplication.h similarity index 79% rename from src/gui/src/QSynergyApplication.h rename to src/gui/src/DeskflowApplication.h index 73bfd8599..fb04e152e 100644 --- a/src/gui/src/QSynergyApplication.h +++ b/src/gui/src/DeskflowApplication.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -22,8 +22,8 @@ class QSessionManager; -class QSynergyApplication : public QApplication { +class DeskflowApplication : public QApplication { public: - QSynergyApplication(int &argc, char **argv); - ~QSynergyApplication() override = default; + DeskflowApplication(int &argc, char **argv); + ~DeskflowApplication() override = default; }; diff --git a/src/gui/src/Hotkey.cpp b/src/gui/src/Hotkey.cpp index a82f700ff..ad492e86b 100644 --- a/src/gui/src/Hotkey.cpp +++ b/src/gui/src/Hotkey.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/Hotkey.h b/src/gui/src/Hotkey.h index efeecadc2..37463361b 100644 --- a/src/gui/src/Hotkey.h +++ b/src/gui/src/Hotkey.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/HotkeyDialog.cpp b/src/gui/src/HotkeyDialog.cpp index 6212b3cd3..b78872fc2 100644 --- a/src/gui/src/HotkeyDialog.cpp +++ b/src/gui/src/HotkeyDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/HotkeyDialog.h b/src/gui/src/HotkeyDialog.h index 1ba17d734..cec916211 100644 --- a/src/gui/src/HotkeyDialog.h +++ b/src/gui/src/HotkeyDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/KeySequence.cpp b/src/gui/src/KeySequence.cpp index ab05f3671..5ed4425a6 100644 --- a/src/gui/src/KeySequence.cpp +++ b/src/gui/src/KeySequence.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -22,7 +22,7 @@ #include // this table originally comes from Qt sources (gui/kernel/qkeysequence.cpp) -// and is heavily modified for QSynergy +// and is heavily modified for Deskflow static const struct { int key; const char *name; @@ -211,7 +211,7 @@ QString KeySequence::keyToString(int key) { return QString("\\u%1").arg( QChar(key).toLower().unicode(), 4, 16, QChar('0')); - // give up, synergy probably won't handle this + // give up, deskflow probably won't handle this return ""; } diff --git a/src/gui/src/KeySequence.h b/src/gui/src/KeySequence.h index 94c67a478..d7863f706 100644 --- a/src/gui/src/KeySequence.h +++ b/src/gui/src/KeySequence.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/KeySequenceWidget.cpp b/src/gui/src/KeySequenceWidget.cpp index 4e389f9c9..4d7837379 100644 --- a/src/gui/src/KeySequenceWidget.cpp +++ b/src/gui/src/KeySequenceWidget.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/KeySequenceWidget.h b/src/gui/src/KeySequenceWidget.h index 4dc6bac45..6a7acf97d 100644 --- a/src/gui/src/KeySequenceWidget.h +++ b/src/gui/src/KeySequenceWidget.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 737c38227..9f8dcc496 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -65,19 +65,19 @@ #include #endif -using namespace synergy::gui; -using namespace synergy::license; -using namespace synergy::gui::license; +using namespace deskflow::gui; +using namespace deskflow::license; +using namespace deskflow::gui::license; using CoreMode = CoreProcess::Mode; using CoreConnectionState = CoreProcess::ConnectionState; using CoreProcessState = CoreProcess::ProcessState; -const auto kIconFile16 = ":/icons/16x16/synergy.png"; +const auto kIconFile16 = ":/icons/16x16/deskflow.png"; #ifdef Q_OS_MAC -const auto kLightIconFile = ":/icons/64x64/synergy-light.png"; -const auto kDarkIconFile = ":/icons/64x64/synergy-dark.png"; +const auto kLightIconFile = ":/icons/64x64/deskflow-light.png"; +const auto kDarkIconFile = ":/icons/64x64/deskflow-dark.png"; #endif // Q_OS_MAC MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig) @@ -163,8 +163,8 @@ void MainWindow::setupControls() { m_pLabelIpAddresses->setText( QString("This computer's IP addresses: %1").arg(getIPAddresses())); - if (m_AppConfig.lastVersion() != SYNERGY_VERSION) { - m_AppConfig.setLastVersion(SYNERGY_VERSION); + if (m_AppConfig.lastVersion() != DESKFLOW_VERSION) { + m_AppConfig.setLastVersion(DESKFLOW_VERSION); } #if defined(Q_OS_MAC) @@ -589,7 +589,7 @@ void MainWindow::onCoreProcessStarting() { } #if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI) - if (synergy::platform::isWayland()) { + if (deskflow::platform::isWayland()) { m_WaylandWarnings.showOnce(this, m_CoreProcess.mode()); } #endif @@ -635,7 +635,7 @@ void MainWindow::createMenuBar() { m_pMenuHelp->addAction(m_pActionClearSettings); const auto enableTestMenu = - strToTrue(qEnvironmentVariable("SYNERGY_TEST_MENU")); + strToTrue(qEnvironmentVariable("DESKFLOW_TEST_MENU")); if (enableTestMenu || kDebugBuild) { auto testMenu = new QMenu("Test", m_pMenuBar); @@ -851,19 +851,19 @@ void MainWindow::updateStatus() { using enum CoreProcessState; case Starting: - setStatus("Synergy is starting..."); + setStatus("Deskflow is starting..."); break; case RetryPending: - setStatus("Synergy will retry in a moment..."); + setStatus("Deskflow will retry in a moment..."); break; case Stopping: - setStatus("Synergy is stopping..."); + setStatus("Deskflow is stopping..."); break; case Stopped: - setStatus("Synergy is not running"); + setStatus("Deskflow is not running"); break; case Started: { @@ -872,28 +872,28 @@ void MainWindow::updateStatus() { case Listening: { if (m_CoreProcess.mode() == CoreMode::Server) { - setStatus("Synergy is waiting for clients"); + setStatus("Deskflow is waiting for clients"); } break; } case Connecting: - setStatus("Synergy is connecting..."); + setStatus("Deskflow is connecting..."); break; case Connected: { if (m_SecureSocket) { - setStatus(QString("Synergy is connected (with %1)") + setStatus(QString("Deskflow is connected (with %1)") .arg(m_CoreProcess.secureSocketVersion())); } else { - setStatus("Synergy is connected (without TLS encryption)"); + setStatus("Deskflow is connected (without TLS encryption)"); } break; } case Disconnected: - setStatus("Synergy is disconnected"); + setStatus("Deskflow is disconnected"); break; } } break; diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 8df40a178..047b30407 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -53,16 +53,16 @@ class QRadioButton; class QMessageBox; class QAbstractButton; -class QSynergyApplication; +class DeskflowApplication; class SetupWizard; class MainWindow : public QMainWindow, public Ui::MainWindowBase { - using CoreMode = synergy::gui::CoreProcess::Mode; - using CoreProcess = synergy::gui::CoreProcess; + using CoreMode = deskflow::gui::CoreProcess::Mode; + using CoreProcess = deskflow::gui::CoreProcess; Q_OBJECT - friend class QSynergyApplication; + friend class DeskflowApplication; friend class SetupWizard; friend class ActivationDialog; friend class SettingsDialog; @@ -72,7 +72,7 @@ public: public: explicit MainWindow( - synergy::gui::ConfigScopes &configScopes, AppConfig &appConfig); + deskflow::gui::ConfigScopes &configScopes, AppConfig &appConfig); ~MainWindow() override; void setVisible(bool visible) override; @@ -184,7 +184,7 @@ private: void showAndActivate(); VersionChecker m_VersionChecker; - synergy::gui::TrayIcon m_TrayIcon; + deskflow::gui::TrayIcon m_TrayIcon; bool m_ActivationDialogRunning = false; QStringList m_PendingClientNames; QMenuBar *m_pMenuBar = nullptr; @@ -197,16 +197,16 @@ private: bool m_SaveWindow = false; LicenseHandler m_LicenseHandler; bool m_Quitting = false; - synergy::gui::config::ServerConfigDialogState m_ServerConfigDialogState; + deskflow::gui::config::ServerConfigDialogState m_ServerConfigDialogState; bool m_SaveOnExit = true; - synergy::gui::core::WaylandWarnings m_WaylandWarnings; + deskflow::gui::core::WaylandWarnings m_WaylandWarnings; - synergy::gui::ConfigScopes &m_ConfigScopes; + deskflow::gui::ConfigScopes &m_ConfigScopes; AppConfig &m_AppConfig; ServerConfig m_ServerConfig; - synergy::gui::CoreProcess m_CoreProcess; - synergy::gui::ServerConnection m_ServerConnection; - synergy::gui::ClientConnection m_ClientConnection; - synergy::gui::TlsUtility m_TlsUtility; + deskflow::gui::CoreProcess m_CoreProcess; + deskflow::gui::ServerConnection m_ServerConnection; + deskflow::gui::ClientConnection m_ClientConnection; + deskflow::gui::TlsUtility m_TlsUtility; QTimer m_WindowSaveTimer; }; diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui index 22d9150e8..7995019bd 100644 --- a/src/gui/src/MainWindowBase.ui +++ b/src/gui/src/MainWindowBase.ui @@ -23,7 +23,7 @@ - Synergy + Deskflow @@ -221,7 +221,7 @@ - + No clients connected @@ -398,7 +398,7 @@ - + Connected to server @@ -586,7 +586,7 @@ - &About Synergy... + &About Deskflow... @@ -718,12 +718,12 @@ - synergy::gui::widgets::ServerStateLabel + deskflow::gui::widgets::ServerStateLabel QLabel
gui/widgets/ServerStateLabel.h
 - synergy::gui::widgets::ClientStateLabel + deskflow::gui::widgets::ClientStateLabel QLabel
gui/widgets/ClientStateLabel.h
 diff --git a/src/gui/src/ProcessorArch.h b/src/gui/src/ProcessorArch.h index e47957f8b..f690f2a81 100644 --- a/src/gui/src/ProcessorArch.h +++ b/src/gui/src/ProcessorArch.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/QUtility.cpp b/src/gui/src/QUtility.cpp index ac4eacbef..7cd9227d0 100644 --- a/src/gui/src/QUtility.cpp +++ b/src/gui/src/QUtility.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/QUtility.h b/src/gui/src/QUtility.h index 060ab5a82..d536aeccf 100644 --- a/src/gui/src/QUtility.h +++ b/src/gui/src/QUtility.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ScreenSettingsDialog.cpp b/src/gui/src/ScreenSettingsDialog.cpp index 742435485..b77643bff 100644 --- a/src/gui/src/ScreenSettingsDialog.cpp +++ b/src/gui/src/ScreenSettingsDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -28,7 +28,7 @@ #include #include -using namespace synergy::gui; +using namespace deskflow::gui; using enum ScreenConfig::Modifier; using enum ScreenConfig::SwitchCorner; using enum ScreenConfig::Fix; diff --git a/src/gui/src/ScreenSettingsDialog.h b/src/gui/src/ScreenSettingsDialog.h index 4d483fe91..e6dd25ffd 100644 --- a/src/gui/src/ScreenSettingsDialog.h +++ b/src/gui/src/ScreenSettingsDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ScreenSetupModel.cpp b/src/gui/src/ScreenSetupModel.cpp index 7d26da740..f4ed993f5 100644 --- a/src/gui/src/ScreenSetupModel.cpp +++ b/src/gui/src/ScreenSetupModel.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -23,7 +23,7 @@ #include #include -const QString ScreenSetupModel::m_MimeType = "application/x-qsynergy-screen"; +const QString ScreenSetupModel::m_MimeType = "application/x-deskflow-screen"; ScreenSetupModel::ScreenSetupModel( ScreenList &screens, int numColumns, int numRows) diff --git a/src/gui/src/ScreenSetupModel.h b/src/gui/src/ScreenSetupModel.h index 24121df6d..dee4ae183 100644 --- a/src/gui/src/ScreenSetupModel.h +++ b/src/gui/src/ScreenSetupModel.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp index 660e6a8f0..db15fe3eb 100644 --- a/src/gui/src/ScreenSetupView.cpp +++ b/src/gui/src/ScreenSetupView.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ScreenSetupView.h b/src/gui/src/ScreenSetupView.h index b6b1e40ea..38c8f8d64 100644 --- a/src/gui/src/ScreenSetupView.h +++ b/src/gui/src/ScreenSetupView.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp index e6ced9e2a..fb7ff5f9e 100644 --- a/src/gui/src/ServerConfig.cpp +++ b/src/gui/src/ServerConfig.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -27,7 +27,7 @@ #include #include -using namespace synergy::gui::proxy; +using namespace deskflow::gui::proxy; using enum ScreenConfig::Modifier; using enum ScreenConfig::SwitchCorner; using enum ScreenConfig::Fix; diff --git a/src/gui/src/ServerConfig.h b/src/gui/src/ServerConfig.h index 741b954e0..c154899b8 100644 --- a/src/gui/src/ServerConfig.h +++ b/src/gui/src/ServerConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -36,8 +36,8 @@ class ServerConfigDialog; class MainWindow; class AppConfig; -class ServerConfig : public ScreenConfig, public synergy::gui::IServerConfig { - using QSettingsProxy = synergy::gui::proxy::QSettingsProxy; +class ServerConfig : public ScreenConfig, public deskflow::gui::IServerConfig { + using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; friend class ServerConfigDialog; friend QTextStream & diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp index f1649227f..0417c1682 100644 --- a/src/gui/src/ServerConfigDialog.cpp +++ b/src/gui/src/ServerConfigDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -249,16 +249,12 @@ void ServerConfigDialog::showEvent(QShowEvent *event) { void ServerConfigDialog::accept() { if (m_pCheckBoxUseExternalConfig->isChecked() && !QFile::exists(m_pEditConfigFile->text())) { - auto title = tr("Configuration filename invalid"); - auto description = - tr("You have not filled in a valid configuration file for the synergy " - "server. " - "Do you want to browse for the configuration file now?"); auto selectedButton = QMessageBox::warning( - this, title, description, QMessageBox::Yes | QMessageBox::No); + this, "Filename invalid", "Please select a valid configuration file.", + QMessageBox::Ok | QMessageBox::Ignore); - if (selectedButton != QMessageBox::Yes || + if (selectedButton != QMessageBox::Ok || !on_m_pButtonBrowseConfigFile_clicked()) { return; } @@ -415,16 +411,15 @@ void ServerConfigDialog::on_m_pCheckBoxUseExternalConfig_toggled(bool checked) { bool ServerConfigDialog::on_m_pButtonBrowseConfigFile_clicked() { #if defined(Q_OS_WIN) - const QString synergyConfigFilter( - QObject::tr("Synergy Configurations (*.sgc);;All files (*.*)")); + const QString deskflowConfigFilter( + QObject::tr("Deskflow Configurations (*.sgc);;All files (*.*)")); #else - const QString synergyConfigFilter( - QObject::tr("Synergy Configurations (*.conf);;All files (*.*)")); + const QString deskflowConfigFilter( + QObject::tr("Deskflow Configurations (*.conf);;All files (*.*)")); #endif QString fileName = QFileDialog::getOpenFileName( - this, tr("Browse for a synergys config file"), QString(), - synergyConfigFilter); + this, "Browse for a config file", "", deskflowConfigFilter); if (!fileName.isEmpty()) { m_pEditConfigFile->setText(fileName); diff --git a/src/gui/src/ServerConfigDialog.h b/src/gui/src/ServerConfigDialog.h index 7b859574d..a71170a2b 100644 --- a/src/gui/src/ServerConfigDialog.h +++ b/src/gui/src/ServerConfigDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp index 94f9281d9..c3b615b60 100644 --- a/src/gui/src/SetupWizard.cpp +++ b/src/gui/src/SetupWizard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include "gui/validators/ScreenNameValidator.h" #include "gui/validators/ValidationError.h" -using namespace synergy::gui; +using namespace deskflow::gui; SetupWizard::SetupWizard(AppConfig &appConfig) : m_appConfig(appConfig) { setupUi(this); diff --git a/src/gui/src/SetupWizard.h b/src/gui/src/SetupWizard.h index 4d5de9636..3fbc89f0a 100644 --- a/src/gui/src/SetupWizard.h +++ b/src/gui/src/SetupWizard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/SetupWizardBase.ui b/src/gui/src/SetupWizardBase.ui index 88a141f58..8041f9c56 100644 --- a/src/gui/src/SetupWizardBase.ui +++ b/src/gui/src/SetupWizardBase.ui @@ -26,7 +26,7 @@ Qt::NoContextMenu - Setup Synergy + Setup Deskflow 1.000000000000000 diff --git a/src/gui/src/TrashScreenWidget.cpp b/src/gui/src/TrashScreenWidget.cpp index ffed00a65..7b9a277a7 100644 --- a/src/gui/src/TrashScreenWidget.cpp +++ b/src/gui/src/TrashScreenWidget.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/TrashScreenWidget.h b/src/gui/src/TrashScreenWidget.h index 0c4dad00d..d50e0ed33 100644 --- a/src/gui/src/TrashScreenWidget.h +++ b/src/gui/src/TrashScreenWidget.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp index 13f0d6b7e..7366b56d7 100644 --- a/src/gui/src/main.cpp +++ b/src/gui/src/main.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -16,8 +16,8 @@ * along with this program. If not, see . */ +#include "DeskflowApplication.h" #include "MainWindow.h" -#include "QSynergyApplication.h" #include "SetupWizard.h" #include "common/constants.h" #include "common/version.h" @@ -42,7 +42,7 @@ #include #endif -using namespace synergy::gui; +using namespace deskflow::gui; class QThreadImpl : public QThread { public: @@ -74,11 +74,11 @@ int main(int argc, char *argv[]) { // used as a prefix for settings paths, and must not be a url. QCoreApplication::setOrganizationDomain(kOrgDomain); - QSynergyApplication app(argc, argv); + DeskflowApplication app(argc, argv); - qInstallMessageHandler(synergy::gui::messages::messageHandler); - QString version = QString::fromStdString(synergy::version()); - qInfo("Synergy v%s", qPrintable(version)); + qInstallMessageHandler(deskflow::gui::messages::messageHandler); + QString version = QString::fromStdString(deskflow::version()); + qInfo("Deskflow v%s", qPrintable(version)); dotenv(); Logger::instance().loadEnvVars(); @@ -87,8 +87,8 @@ int main(int argc, char *argv[]) { if (app.applicationDirPath().startsWith("/Volumes/")) { QMessageBox::information( - NULL, "Synergy", - "Please drag Synergy to the Applications folder, " + NULL, "Deskflow", + "Please drag Deskflow to the Applications folder, " "and open it from there."); return 1; } @@ -105,7 +105,8 @@ int main(int argc, char *argv[]) { // --no-reset QStringList arguments = QCoreApplication::arguments(); const auto noReset = hasArg("--no-reset", arguments); - const auto resetEnvVar = strToTrue(qEnvironmentVariable("SYNERGY_RESET_ALL")); + const auto resetEnvVar = + strToTrue(qEnvironmentVariable("DESKFLOW_RESET_ALL")); if (resetEnvVar && !noReset) { diagnostic::clearSettings(configScopes, false); } @@ -130,11 +131,11 @@ int main(int argc, char *argv[]) { MainWindow mainWindow(configScopes, appConfig); QObject::connect( - &app, &QSynergyApplication::aboutToQuit, &mainWindow, + &app, &DeskflowApplication::aboutToQuit, &mainWindow, &MainWindow::onAppAboutToQuit); mainWindow.open(); - return QSynergyApplication::exec(); + return DeskflowApplication::exec(); } #if defined(Q_OS_MAC) @@ -144,7 +145,7 @@ bool checkMacAssistiveDevices() { // new in mavericks, applications are trusted individually // with use of the accessibility api. this call will show a // prompt which can show the security/privacy/accessibility - // tab, with a list of allowed applications. synergy should + // tab, with a list of allowed applications. deskflow should // show up there automatically, but will be unchecked. if (AXIsProcessTrusted()) { @@ -166,10 +167,10 @@ bool checkMacAssistiveDevices() { bool result = AXAPIEnabled(); if (!result) { QMessageBox::information( - NULL, "Synergy", + NULL, "Deskflow", "Please enable access to assistive devices " "System Preferences -> Security & Privacy -> " - "Privacy -> Accessibility, then re-open Synergy."); + "Privacy -> Accessibility, then re-open Deskflow."); } return result; diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 844735d8b..99d51ac12 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -17,12 +17,12 @@ add_subdirectory(arch) add_subdirectory(base) add_subdirectory(client) +add_subdirectory(deskflow) add_subdirectory(io) add_subdirectory(ipc) add_subdirectory(mt) add_subdirectory(net) add_subdirectory(platform) add_subdirectory(server) -add_subdirectory(synergy) add_subdirectory(license) add_subdirectory(gui) diff --git a/src/lib/arch/Arch.cpp b/src/lib/arch/Arch.cpp index 13a07751d..6100ad18a 100644 --- a/src/lib/arch/Arch.cpp +++ b/src/lib/arch/Arch.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h index 7da51eec1..560b2113b 100644 --- a/src/lib/arch/Arch.h +++ b/src/lib/arch/Arch.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/ArchConsoleStd.cpp b/src/lib/arch/ArchConsoleStd.cpp index 7c6b7aaeb..1cf33fe24 100644 --- a/src/lib/arch/ArchConsoleStd.cpp +++ b/src/lib/arch/ArchConsoleStd.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/ArchConsoleStd.h b/src/lib/arch/ArchConsoleStd.h index 92bb092ac..5955611ee 100644 --- a/src/lib/arch/ArchConsoleStd.h +++ b/src/lib/arch/ArchConsoleStd.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/ArchDaemonNone.cpp b/src/lib/arch/ArchDaemonNone.cpp index 14510bd21..601c90675 100644 --- a/src/lib/arch/ArchDaemonNone.cpp +++ b/src/lib/arch/ArchDaemonNone.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/ArchDaemonNone.h b/src/lib/arch/ArchDaemonNone.h index e0adfbdd9..1d7658c08 100644 --- a/src/lib/arch/ArchDaemonNone.h +++ b/src/lib/arch/ArchDaemonNone.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/CMakeLists.txt b/src/lib/arch/CMakeLists.txt index d1fa02a34..51be8a212 100644 --- a/src/lib/arch/CMakeLists.txt +++ b/src/lib/arch/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # diff --git a/src/lib/arch/IArchConsole.h b/src/lib/arch/IArchConsole.h index 424917e1b..d552f77ca 100644 --- a/src/lib/arch/IArchConsole.h +++ b/src/lib/arch/IArchConsole.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,7 +24,7 @@ //! Interface for architecture dependent console output /*! This interface defines the console operations required by -synergy. Each architecture must implement this interface. +deskflow. Each architecture must implement this interface. */ class IArchConsole : public IInterface { public: diff --git a/src/lib/arch/IArchDaemon.h b/src/lib/arch/IArchDaemon.h index c496b785a..111038602 100644 --- a/src/lib/arch/IArchDaemon.h +++ b/src/lib/arch/IArchDaemon.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,7 +23,7 @@ //! Interface for architecture dependent daemonizing /*! -This interface defines the operations required by synergy for installing +This interface defines the operations required by deskflow for installing uninstalling daeamons and daemonizing a process. Each architecture must implement this interface. */ diff --git a/src/lib/arch/IArchFile.h b/src/lib/arch/IArchFile.h index 50148cbe0..62d543dac 100644 --- a/src/lib/arch/IArchFile.h +++ b/src/lib/arch/IArchFile.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -25,7 +25,7 @@ //! Interface for architecture dependent file system operations /*! This interface defines the file system operations required by -synergy. Each architecture must implement this interface. +deskflow. Each architecture must implement this interface. */ class IArchFile : public IInterface { public: @@ -53,7 +53,7 @@ public: //! Get installed directory /*! - Returns the directory in which Synergy is installed. + Returns the directory in which Deskflow is installed. */ virtual std::string getInstalledDirectory() = 0; diff --git a/src/lib/arch/IArchLog.h b/src/lib/arch/IArchLog.h index 0566ee876..c35a5aa80 100644 --- a/src/lib/arch/IArchLog.h +++ b/src/lib/arch/IArchLog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,7 +24,7 @@ //! Interface for architecture dependent logging /*! This interface defines the logging operations required by -synergy. Each architecture must implement this interface. +deskflow. Each architecture must implement this interface. */ class IArchLog : public IInterface { public: diff --git a/src/lib/arch/IArchMultithread.h b/src/lib/arch/IArchMultithread.h index fdd2b53cc..d7f6a78e1 100644 --- a/src/lib/arch/IArchMultithread.h +++ b/src/lib/arch/IArchMultithread.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -66,7 +66,7 @@ typedef ArchThreadImpl *ArchThread; //! Interface for architecture dependent multithreading /*! This interface defines the multithreading operations required by -synergy. Each architecture must implement this interface. +deskflow. Each architecture must implement this interface. */ class IArchMultithread : public IInterface { public: diff --git a/src/lib/arch/IArchNetwork.h b/src/lib/arch/IArchNetwork.h index bcbd55f8b..af53400f3 100644 --- a/src/lib/arch/IArchNetwork.h +++ b/src/lib/arch/IArchNetwork.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -58,7 +58,7 @@ typedef ArchNetAddressImpl *ArchNetAddress; //! Interface for architecture dependent networking /*! This interface defines the networking operations required by -synergy. Each architecture must implement this interface. +deskflow. Each architecture must implement this interface. */ class IArchNetwork : public IInterface { public: diff --git a/src/lib/arch/IArchSleep.h b/src/lib/arch/IArchSleep.h index 9ee0076a4..c3628770e 100644 --- a/src/lib/arch/IArchSleep.h +++ b/src/lib/arch/IArchSleep.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,7 +23,7 @@ //! Interface for architecture dependent sleeping /*! This interface defines the sleep operations required by -synergy. Each architecture must implement this interface. +deskflow. Each architecture must implement this interface. */ class IArchSleep : public IInterface { public: diff --git a/src/lib/arch/IArchString.cpp b/src/lib/arch/IArchString.cpp index e89fbd4b5..8b8dab336 100644 --- a/src/lib/arch/IArchString.cpp +++ b/src/lib/arch/IArchString.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * diff --git a/src/lib/arch/IArchString.h b/src/lib/arch/IArchString.h index 46e7bbc0e..02c6c56e2 100644 --- a/src/lib/arch/IArchString.h +++ b/src/lib/arch/IArchString.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -26,7 +26,7 @@ //! Interface for architecture dependent string operations /*! This interface defines the string operations required by -synergy. Each architecture must implement this interface. +deskflow. Each architecture must implement this interface. */ class IArchString : public IInterface { public: diff --git a/src/lib/arch/IArchSystem.h b/src/lib/arch/IArchSystem.h index b443e808f..76d00f560 100644 --- a/src/lib/arch/IArchSystem.h +++ b/src/lib/arch/IArchSystem.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -43,16 +43,16 @@ public: virtual std::string getPlatformName() const = 0; //@} - //! Get a Synergy setting + //! Get a Deskflow setting /*! - Reads a Synergy setting from the system. + Reads a Deskflow setting from the system. */ virtual std::string setting(const std::string &valueName) const = 0; //@} - //! Set a Synergy setting + //! Set a Deskflow setting /*! - Writes a Synergy setting from the system. + Writes a Deskflow setting from the system. */ virtual void setting( const std::string &valueName, const std::string &valueString) const = 0; diff --git a/src/lib/arch/IArchTaskBar.h b/src/lib/arch/IArchTaskBar.h index c0f2f2495..26e72d9c4 100644 --- a/src/lib/arch/IArchTaskBar.h +++ b/src/lib/arch/IArchTaskBar.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -25,7 +25,7 @@ class IArchTaskBarReceiver; //! Interface for architecture dependent task bar control /*! This interface defines the task bar icon operations required -by synergy. Each architecture must implement this interface +by deskflow. Each architecture must implement this interface though each operation can be a no-op. */ class IArchTaskBar : public IInterface { diff --git a/src/lib/arch/IArchTaskBarReceiver.h b/src/lib/arch/IArchTaskBarReceiver.h index a05604f18..ad5242124 100644 --- a/src/lib/arch/IArchTaskBarReceiver.h +++ b/src/lib/arch/IArchTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -27,7 +27,7 @@ class INode; //! Interface for architecture dependent task bar event handling /*! This interface defines the task bar icon event handlers required -by synergy. Each architecture must implement this interface +by deskflow. Each architecture must implement this interface though each operation can be a no-op. */ class IArchTaskBarReceiver : public IInterface { diff --git a/src/lib/arch/IArchTime.h b/src/lib/arch/IArchTime.h index 067d54375..f11432c03 100644 --- a/src/lib/arch/IArchTime.h +++ b/src/lib/arch/IArchTime.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,7 +23,7 @@ //! Interface for architecture dependent time operations /*! This interface defines the time operations required by -synergy. Each architecture must implement this interface. +deskflow. Each architecture must implement this interface. */ class IArchTime : public IInterface { public: diff --git a/src/lib/arch/XArch.h b/src/lib/arch/XArch.h index f838cbec1..b56ffb915 100644 --- a/src/lib/arch/XArch.h +++ b/src/lib/arch/XArch.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/multibyte.h b/src/lib/arch/multibyte.h index e95dad31f..8bb5085e0 100644 --- a/src/lib/arch/multibyte.h +++ b/src/lib/arch/multibyte.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchConsoleUnix.cpp b/src/lib/arch/unix/ArchConsoleUnix.cpp index 13d499f8a..f2851abbe 100644 --- a/src/lib/arch/unix/ArchConsoleUnix.cpp +++ b/src/lib/arch/unix/ArchConsoleUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchConsoleUnix.h b/src/lib/arch/unix/ArchConsoleUnix.h index 609abbc9e..a39619c0f 100644 --- a/src/lib/arch/unix/ArchConsoleUnix.h +++ b/src/lib/arch/unix/ArchConsoleUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchDaemonUnix.cpp b/src/lib/arch/unix/ArchDaemonUnix.cpp index 020635ba9..84d15fae3 100644 --- a/src/lib/arch/unix/ArchDaemonUnix.cpp +++ b/src/lib/arch/unix/ArchDaemonUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -43,19 +43,19 @@ ArchDaemonUnix::~ArchDaemonUnix() { #ifdef __APPLE__ // In Mac OS X, fork()'d child processes can't use most APIs (the frameworks -// that Synergy uses in fact prevent it and make the process just up and die), +// that Deskflow uses in fact prevent it and make the process just up and die), // so need to exec a copy of the program that doesn't fork so isn't limited. int execSelfNonDaemonized() { extern char **NXArgv; char **selfArgv = NXArgv; - setenv("_SYNERGY_DAEMONIZED", "", 1); + setenv("_DESKFLOW_DAEMONIZED", "", 1); execvp(selfArgv[0], selfArgv); return 0; } -bool alreadyDaemonized() { return getenv("_SYNERGY_DAEMONIZED") != NULL; } +bool alreadyDaemonized() { return getenv("_DESKFLOW_DAEMONIZED") != NULL; } #endif diff --git a/src/lib/arch/unix/ArchDaemonUnix.h b/src/lib/arch/unix/ArchDaemonUnix.h index 6622fff82..e8599286c 100644 --- a/src/lib/arch/unix/ArchDaemonUnix.h +++ b/src/lib/arch/unix/ArchDaemonUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -33,4 +33,4 @@ public: virtual int daemonize(const char *name, DaemonFunc func); }; -#define CONFIG_FILE "/etc/synergy/synergyd.conf" +#define CONFIG_FILE "/etc/deskflow/deskflowd.conf" diff --git a/src/lib/arch/unix/ArchFileUnix.cpp b/src/lib/arch/unix/ArchFileUnix.cpp index 065872e5a..b678cf856 100644 --- a/src/lib/arch/unix/ArchFileUnix.cpp +++ b/src/lib/arch/unix/ArchFileUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -81,7 +81,7 @@ std::string ArchFileUnix::getInstalledDirectory() { #if WINAPI_XWINDOWS return "/usr/bin"; #else - return "/Applications/Synergy.app/Contents/MacOS"; + return "/Applications/Deskflow.app/Contents/MacOS"; #endif } @@ -105,9 +105,9 @@ std::string ArchFileUnix::getProfileDirectory() { dir = m_profileDirectory; } else { #if WINAPI_XWINDOWS - dir = getUserDirectory().append("/.synergy"); + dir = getUserDirectory().append("/.deskflow"); #else - dir = getUserDirectory().append("/Library/Synergy"); + dir = getUserDirectory().append("/Library/Deskflow"); #endif } return dir; diff --git a/src/lib/arch/unix/ArchFileUnix.h b/src/lib/arch/unix/ArchFileUnix.h index a2098f7fd..14744d43b 100644 --- a/src/lib/arch/unix/ArchFileUnix.h +++ b/src/lib/arch/unix/ArchFileUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchLogUnix.cpp b/src/lib/arch/unix/ArchLogUnix.cpp index 4ea3f0e4d..b9aadf0aa 100644 --- a/src/lib/arch/unix/ArchLogUnix.cpp +++ b/src/lib/arch/unix/ArchLogUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchLogUnix.h b/src/lib/arch/unix/ArchLogUnix.h index 0742e4026..85f5cfe03 100644 --- a/src/lib/arch/unix/ArchLogUnix.h +++ b/src/lib/arch/unix/ArchLogUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp index 2ae0cad15..d21900d1e 100644 --- a/src/lib/arch/unix/ArchMultithreadPosix.cpp +++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -38,7 +38,7 @@ #if !HAVE_PTHREAD_SIGNAL // boy, is this platform broken. forget about pthread signal -// handling and let signals through to every process. synergy +// handling and let signals through to every process. deskflow // will not terminate cleanly when it gets SIGTERM or SIGINT. #define pthread_sigmask sigprocmask #define pthread_kill(tid_, sig_) kill(0, (sig_)) @@ -576,7 +576,7 @@ void ArchMultithreadPosix::insert(ArchThreadImpl *thread) { // set thread id. note that we don't worry about m_nextID // wrapping back to 0 and duplicating thread ID's since the - // likelihood of synergy running that long is vanishingly + // likelihood of deskflow running that long is vanishingly // small. thread->m_id = ++m_nextID; diff --git a/src/lib/arch/unix/ArchMultithreadPosix.h b/src/lib/arch/unix/ArchMultithreadPosix.h index 8ed3af6eb..0b230dc4a 100644 --- a/src/lib/arch/unix/ArchMultithreadPosix.h +++ b/src/lib/arch/unix/ArchMultithreadPosix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp index 36ec26dd9..504627b92 100644 --- a/src/lib/arch/unix/ArchNetworkBSD.cpp +++ b/src/lib/arch/unix/ArchNetworkBSD.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchNetworkBSD.h b/src/lib/arch/unix/ArchNetworkBSD.h index 14f4642c6..2809af656 100644 --- a/src/lib/arch/unix/ArchNetworkBSD.h +++ b/src/lib/arch/unix/ArchNetworkBSD.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchSleepUnix.cpp b/src/lib/arch/unix/ArchSleepUnix.cpp index 1f22a13dd..95ccef74e 100644 --- a/src/lib/arch/unix/ArchSleepUnix.cpp +++ b/src/lib/arch/unix/ArchSleepUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchSleepUnix.h b/src/lib/arch/unix/ArchSleepUnix.h index 6c5abd942..dbff2055a 100644 --- a/src/lib/arch/unix/ArchSleepUnix.h +++ b/src/lib/arch/unix/ArchSleepUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchStringUnix.cpp b/src/lib/arch/unix/ArchStringUnix.cpp index 87d885c28..81e0c275e 100644 --- a/src/lib/arch/unix/ArchStringUnix.cpp +++ b/src/lib/arch/unix/ArchStringUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchStringUnix.h b/src/lib/arch/unix/ArchStringUnix.h index 2fba78017..d543ac53f 100644 --- a/src/lib/arch/unix/ArchStringUnix.h +++ b/src/lib/arch/unix/ArchStringUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchSystemUnix.cpp b/src/lib/arch/unix/ArchSystemUnix.cpp index 46094c9dd..8e1c978e4 100644 --- a/src/lib/arch/unix/ArchSystemUnix.cpp +++ b/src/lib/arch/unix/ArchSystemUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -102,8 +102,8 @@ bool ArchSystemUnix::DBusInhibitScreenCall( } reply = screenSaverInterface.call( - "Inhibit", "Synergy", - "Sleep is manually prevented by the Synergy preferences"); + "Inhibit", "Deskflow", + "Sleep is manually prevented by the Deskflow preferences"); if (reply.isValid()) cookies[serviceNum] = reply.value(); } else { diff --git a/src/lib/arch/unix/ArchSystemUnix.h b/src/lib/arch/unix/ArchSystemUnix.h index 7737faf79..656dca585 100644 --- a/src/lib/arch/unix/ArchSystemUnix.h +++ b/src/lib/arch/unix/ArchSystemUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchTaskBarXWindows.cpp b/src/lib/arch/unix/ArchTaskBarXWindows.cpp index db01c7bd1..cfcb6b8fe 100644 --- a/src/lib/arch/unix/ArchTaskBarXWindows.cpp +++ b/src/lib/arch/unix/ArchTaskBarXWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchTaskBarXWindows.h b/src/lib/arch/unix/ArchTaskBarXWindows.h index 1a6e7dd5e..3e30788c4 100644 --- a/src/lib/arch/unix/ArchTaskBarXWindows.h +++ b/src/lib/arch/unix/ArchTaskBarXWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchTimeUnix.cpp b/src/lib/arch/unix/ArchTimeUnix.cpp index fd6e91a51..ad58a9033 100644 --- a/src/lib/arch/unix/ArchTimeUnix.cpp +++ b/src/lib/arch/unix/ArchTimeUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchTimeUnix.h b/src/lib/arch/unix/ArchTimeUnix.h index fe8133d78..64e7602cb 100644 --- a/src/lib/arch/unix/ArchTimeUnix.h +++ b/src/lib/arch/unix/ArchTimeUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/XArchUnix.cpp b/src/lib/arch/unix/XArchUnix.cpp index a85c935de..d078934fa 100644 --- a/src/lib/arch/unix/XArchUnix.cpp +++ b/src/lib/arch/unix/XArchUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/XArchUnix.h b/src/lib/arch/unix/XArchUnix.h index c91c6931e..b00b26394 100644 --- a/src/lib/arch/unix/XArchUnix.h +++ b/src/lib/arch/unix/XArchUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/vsnprintf.h b/src/lib/arch/vsnprintf.h index 56dd02e9e..c0dc7dfe8 100644 --- a/src/lib/arch/vsnprintf.h +++ b/src/lib/arch/vsnprintf.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchConsoleWindows.cpp b/src/lib/arch/win32/ArchConsoleWindows.cpp index d6b3eb8b4..6b965fd81 100644 --- a/src/lib/arch/win32/ArchConsoleWindows.cpp +++ b/src/lib/arch/win32/ArchConsoleWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchConsoleWindows.h b/src/lib/arch/win32/ArchConsoleWindows.h index beb8b447a..6d0e14662 100644 --- a/src/lib/arch/win32/ArchConsoleWindows.h +++ b/src/lib/arch/win32/ArchConsoleWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchDaemonWindows.cpp b/src/lib/arch/win32/ArchDaemonWindows.cpp index 21f8fbcf5..c0af0406f 100644 --- a/src/lib/arch/win32/ArchDaemonWindows.cpp +++ b/src/lib/arch/win32/ArchDaemonWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -31,7 +31,7 @@ ArchDaemonWindows *ArchDaemonWindows::s_daemon = NULL; ArchDaemonWindows::ArchDaemonWindows() : m_daemonThreadID(0) { - m_quitMessage = RegisterWindowMessage("SynergyDaemonExit"); + m_quitMessage = RegisterWindowMessage("DeskflowDaemonExit"); } ArchDaemonWindows::~ArchDaemonWindows() { diff --git a/src/lib/arch/win32/ArchDaemonWindows.h b/src/lib/arch/win32/ArchDaemonWindows.h index 0f457bd61..e39039100 100644 --- a/src/lib/arch/win32/ArchDaemonWindows.h +++ b/src/lib/arch/win32/ArchDaemonWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -137,12 +137,12 @@ private: std::string m_commandLine; }; -#define DEFAULT_DAEMON_NAME _T("Synergy") -#define DEFAULT_DAEMON_INFO _T("Manages the Synergy foreground processes.") +#define DEFAULT_DAEMON_NAME _T("Deskflow") +#define DEFAULT_DAEMON_INFO _T("Manages the Deskflow foreground processes.") -#define LEGACY_SERVER_DAEMON_NAME _T("Synergy Server") -#define LEGACY_CLIENT_DAEMON_NAME _T("Synergy Client") +#define LEGACY_SERVER_DAEMON_NAME _T("Deskflow Server") +#define LEGACY_CLIENT_DAEMON_NAME _T("Deskflow Client") static const TCHAR *const g_daemonKeyPath[] = { - _T("SOFTWARE"), _T("The Synergy Project"), _T("Synergy"), _T("Service"), + _T("SOFTWARE"), _T("The Deskflow Project"), _T("Deskflow"), _T("Service"), NULL}; diff --git a/src/lib/arch/win32/ArchFileWindows.cpp b/src/lib/arch/win32/ArchFileWindows.cpp index d8a29c88b..26bf47fe1 100644 --- a/src/lib/arch/win32/ArchFileWindows.cpp +++ b/src/lib/arch/win32/ArchFileWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -150,7 +150,7 @@ std::string ArchFileWindows::getProfileDirectory() { } // HACK: append program name, this seems wrong. - dir.append("\\Synergy"); + dir.append("\\Deskflow"); return dir; } diff --git a/src/lib/arch/win32/ArchFileWindows.h b/src/lib/arch/win32/ArchFileWindows.h index df4a67091..6d2428147 100644 --- a/src/lib/arch/win32/ArchFileWindows.h +++ b/src/lib/arch/win32/ArchFileWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchLogWindows.cpp b/src/lib/arch/win32/ArchLogWindows.cpp index 717b5fb2b..77deb8b50 100644 --- a/src/lib/arch/win32/ArchLogWindows.cpp +++ b/src/lib/arch/win32/ArchLogWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchLogWindows.h b/src/lib/arch/win32/ArchLogWindows.h index f5cbef821..dcf2f91c3 100644 --- a/src/lib/arch/win32/ArchLogWindows.h +++ b/src/lib/arch/win32/ArchLogWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchMiscWindows.cpp b/src/lib/arch/win32/ArchMiscWindows.cpp index ce14c4339..8a24463c9 100644 --- a/src/lib/arch/win32/ArchMiscWindows.cpp +++ b/src/lib/arch/win32/ArchMiscWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchMiscWindows.h b/src/lib/arch/win32/ArchMiscWindows.h index 4a459af2d..e272460bb 100644 --- a/src/lib/arch/win32/ArchMiscWindows.h +++ b/src/lib/arch/win32/ArchMiscWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchMultithreadWindows.cpp b/src/lib/arch/win32/ArchMultithreadWindows.cpp index c893df4e2..56933028b 100644 --- a/src/lib/arch/win32/ArchMultithreadWindows.cpp +++ b/src/lib/arch/win32/ArchMultithreadWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchMultithreadWindows.h b/src/lib/arch/win32/ArchMultithreadWindows.h index 527338ba0..474d4419f 100644 --- a/src/lib/arch/win32/ArchMultithreadWindows.h +++ b/src/lib/arch/win32/ArchMultithreadWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchNetworkWinsock.cpp b/src/lib/arch/win32/ArchNetworkWinsock.cpp index e1d5e6762..29629a12d 100644 --- a/src/lib/arch/win32/ArchNetworkWinsock.cpp +++ b/src/lib/arch/win32/ArchNetworkWinsock.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchNetworkWinsock.h b/src/lib/arch/win32/ArchNetworkWinsock.h index 0c8e4f1b9..909c26c2a 100644 --- a/src/lib/arch/win32/ArchNetworkWinsock.h +++ b/src/lib/arch/win32/ArchNetworkWinsock.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchSleepWindows.cpp b/src/lib/arch/win32/ArchSleepWindows.cpp index 97bf48d26..cede9bbfe 100644 --- a/src/lib/arch/win32/ArchSleepWindows.cpp +++ b/src/lib/arch/win32/ArchSleepWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchSleepWindows.h b/src/lib/arch/win32/ArchSleepWindows.h index d4f8f742a..c554b5122 100644 --- a/src/lib/arch/win32/ArchSleepWindows.h +++ b/src/lib/arch/win32/ArchSleepWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchStringWindows.cpp b/src/lib/arch/win32/ArchStringWindows.cpp index 78a22c0ca..bbe069279 100644 --- a/src/lib/arch/win32/ArchStringWindows.cpp +++ b/src/lib/arch/win32/ArchStringWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchStringWindows.h b/src/lib/arch/win32/ArchStringWindows.h index a7730fe4d..d62bd0e61 100644 --- a/src/lib/arch/win32/ArchStringWindows.h +++ b/src/lib/arch/win32/ArchStringWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchSystemWindows.cpp b/src/lib/arch/win32/ArchSystemWindows.cpp index 099fdb073..b2cd4c59e 100644 --- a/src/lib/arch/win32/ArchSystemWindows.cpp +++ b/src/lib/arch/win32/ArchSystemWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -27,7 +27,8 @@ #include #include -static const char *s_settingsKeyNames[] = {_T("SOFTWARE"), _T("Synergy"), NULL}; +static const char *s_settingsKeyNames[] = { + _T("SOFTWARE"), _T("Deskflow"), NULL}; // // ArchSystemWindows diff --git a/src/lib/arch/win32/ArchSystemWindows.h b/src/lib/arch/win32/ArchSystemWindows.h index 67de01847..99edcb10f 100644 --- a/src/lib/arch/win32/ArchSystemWindows.h +++ b/src/lib/arch/win32/ArchSystemWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchTaskBarWindows.cpp b/src/lib/arch/win32/ArchTaskBarWindows.cpp index 9d263df29..85e2e2858 100644 --- a/src/lib/arch/win32/ArchTaskBarWindows.cpp +++ b/src/lib/arch/win32/ArchTaskBarWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -21,7 +21,7 @@ #include "arch/IArchTaskBarReceiver.h" #include "arch/XArch.h" #include "arch/win32/ArchMiscWindows.h" -#include "synergy/win32/AppUtilWindows.h" +#include "deskflow/win32/AppUtilWindows.h" #include #include @@ -412,7 +412,7 @@ void ArchTaskBarWindows::threadMainLoop() { m_taskBarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); // register a window class - LPCTSTR className = TEXT("SynergyTaskBar"); + LPCTSTR className = TEXT("DeskflowTaskBar"); WNDCLASSEX classInfo; classInfo.cbSize = sizeof(classInfo); classInfo.style = CS_NOCLOSE; @@ -430,7 +430,7 @@ void ArchTaskBarWindows::threadMainLoop() { // create window m_hwnd = CreateWindowEx( - WS_EX_TOOLWINDOW, className, TEXT("Synergy Task Bar"), WS_POPUP, 0, 0, 1, + WS_EX_TOOLWINDOW, className, TEXT("Deskflow Task Bar"), WS_POPUP, 0, 0, 1, 1, NULL, NULL, instanceWin32(), static_cast(this)); // signal ready @@ -467,4 +467,4 @@ void *ArchTaskBarWindows::threadEntry(void *self) { HINSTANCE ArchTaskBarWindows::instanceWin32() { return ArchMiscWindows::instanceWin32(); -} \ No newline at end of file +} diff --git a/src/lib/arch/win32/ArchTaskBarWindows.h b/src/lib/arch/win32/ArchTaskBarWindows.h index f28120b59..e53b65ba5 100644 --- a/src/lib/arch/win32/ArchTaskBarWindows.h +++ b/src/lib/arch/win32/ArchTaskBarWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchTimeWindows.cpp b/src/lib/arch/win32/ArchTimeWindows.cpp index 8cfb002dc..51e55543a 100644 --- a/src/lib/arch/win32/ArchTimeWindows.cpp +++ b/src/lib/arch/win32/ArchTimeWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchTimeWindows.h b/src/lib/arch/win32/ArchTimeWindows.h index b057e48bc..95c1363cd 100644 --- a/src/lib/arch/win32/ArchTimeWindows.h +++ b/src/lib/arch/win32/ArchTimeWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/XArchWindows.cpp b/src/lib/arch/win32/XArchWindows.cpp index 3f7e2365d..9fe8bd670 100644 --- a/src/lib/arch/win32/XArchWindows.cpp +++ b/src/lib/arch/win32/XArchWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -32,7 +32,7 @@ std::string XArchEvalWindows::eval() const throw() { 0, m_error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&cmsg, 0, NULL) == 0) { cmsg = NULL; - return synergy::string::sprintf("Unknown error, code %d", m_error); + return deskflow::string::sprintf("Unknown error, code %d", m_error); } std::string smsg(cmsg); LocalFree(cmsg); diff --git a/src/lib/arch/win32/XArchWindows.h b/src/lib/arch/win32/XArchWindows.h index 075154686..4f5a41501 100644 --- a/src/lib/arch/win32/XArchWindows.h +++ b/src/lib/arch/win32/XArchWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/CMakeLists.txt b/src/lib/base/CMakeLists.txt index fb57ef1af..cb2701950 100644 --- a/src/lib/base/CMakeLists.txt +++ b/src/lib/base/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # diff --git a/src/lib/base/ELevel.h b/src/lib/base/ELevel.h index 1783b83df..f39c47dae 100644 --- a/src/lib/base/ELevel.h +++ b/src/lib/base/ELevel.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * diff --git a/src/lib/base/Event.cpp b/src/lib/base/Event.cpp index 60ba9e13c..eaeb15070 100644 --- a/src/lib/base/Event.cpp +++ b/src/lib/base/Event.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h index 4b27af2c3..86033bd2f 100644 --- a/src/lib/base/Event.h +++ b/src/lib/base/Event.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/EventQueue.cpp b/src/lib/base/EventQueue.cpp index d494eabc7..61dc9348c 100644 --- a/src/lib/base/EventQueue.cpp +++ b/src/lib/base/EventQueue.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/EventQueue.h b/src/lib/base/EventQueue.h index a0c42b27e..c5b2bd7e6 100644 --- a/src/lib/base/EventQueue.h +++ b/src/lib/base/EventQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/EventTypes.cpp b/src/lib/base/EventTypes.cpp index be39be562..d7d9ac94a 100644 --- a/src/lib/base/EventTypes.cpp +++ b/src/lib/base/EventTypes.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/base/EventTypes.h b/src/lib/base/EventTypes.h index 932a909e5..17d4af8dd 100644 --- a/src/lib/base/EventTypes.h +++ b/src/lib/base/EventTypes.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/base/FunctionEventJob.cpp b/src/lib/base/FunctionEventJob.cpp index e2311ee71..f75096820 100644 --- a/src/lib/base/FunctionEventJob.cpp +++ b/src/lib/base/FunctionEventJob.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/FunctionEventJob.h b/src/lib/base/FunctionEventJob.h index 232ad680c..1af60b493 100644 --- a/src/lib/base/FunctionEventJob.h +++ b/src/lib/base/FunctionEventJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/FunctionJob.cpp b/src/lib/base/FunctionJob.cpp index f806875eb..582c9e2fd 100644 --- a/src/lib/base/FunctionJob.cpp +++ b/src/lib/base/FunctionJob.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/FunctionJob.h b/src/lib/base/FunctionJob.h index 79fa6aa90..df06a28ef 100644 --- a/src/lib/base/FunctionJob.h +++ b/src/lib/base/FunctionJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/IEventJob.h b/src/lib/base/IEventJob.h index bafb8c61c..528035ecd 100644 --- a/src/lib/base/IEventJob.h +++ b/src/lib/base/IEventJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/IEventQueue.h b/src/lib/base/IEventQueue.h index 1646ceff3..6be5ad88d 100644 --- a/src/lib/base/IEventQueue.h +++ b/src/lib/base/IEventQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/IEventQueueBuffer.h b/src/lib/base/IEventQueueBuffer.h index 59302b9d8..824b1496c 100644 --- a/src/lib/base/IEventQueueBuffer.h +++ b/src/lib/base/IEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/IJob.h b/src/lib/base/IJob.h index a4ede28fb..7cc15b7ae 100644 --- a/src/lib/base/IJob.h +++ b/src/lib/base/IJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/ILogOutputter.h b/src/lib/base/ILogOutputter.h index f403fa6de..34f404e71 100644 --- a/src/lib/base/ILogOutputter.h +++ b/src/lib/base/ILogOutputter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/Log.cpp b/src/lib/base/Log.cpp index 822b4aedf..09e00af1f 100644 --- a/src/lib/base/Log.cpp +++ b/src/lib/base/Log.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -229,7 +229,7 @@ void Log::insert(ILogOutputter *outputter, bool alwaysAtHead) { // don't show log unless user requests it, as some users find this // feature irritating (i.e. when they lose network connectivity). // in windows the log window can be displayed by selecting "show log" - // from the synergy system tray icon. + // from the deskflow system tray icon. // if this causes problems for other architectures, then a different // work around should be attempted. // outputter->show(false); diff --git a/src/lib/base/Log.h b/src/lib/base/Log.h index 732188e9d..8bbabf310 100644 --- a/src/lib/base/Log.h +++ b/src/lib/base/Log.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/Path.cpp b/src/lib/base/Path.cpp index fc0da77a5..668364718 100644 --- a/src/lib/base/Path.cpp +++ b/src/lib/base/Path.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include "arch/win32/ArchMiscWindows.h" #endif -namespace synergy { +namespace deskflow { namespace filesystem { @@ -48,4 +48,4 @@ std::string path(const String &filePath) { return filePath; } } // namespace filesystem -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/base/Path.h b/src/lib/base/Path.h index 98c8e3a5a..f375aee44 100644 --- a/src/lib/base/Path.h +++ b/src/lib/base/Path.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef SYNERGY_PATH_H -#define SYNERGY_PATH_H +#ifndef DESKFLOW_PATH_H +#define DESKFLOW_PATH_H #include "String.h" -namespace synergy { +namespace deskflow { namespace filesystem { @@ -31,6 +31,6 @@ std::string path(const String &filePath); } // namespace filesystem -} // namespace synergy +} // namespace deskflow -#endif // SYNERGY_PATH_H +#endif // DESKFLOW_PATH_H diff --git a/src/lib/base/PriorityQueue.h b/src/lib/base/PriorityQueue.h index 6404cd66d..c1bf6f7ad 100644 --- a/src/lib/base/PriorityQueue.h +++ b/src/lib/base/PriorityQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/lib/base/SimpleEventQueueBuffer.cpp b/src/lib/base/SimpleEventQueueBuffer.cpp index 4f4176ea6..aa512cb1c 100644 --- a/src/lib/base/SimpleEventQueueBuffer.cpp +++ b/src/lib/base/SimpleEventQueueBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/SimpleEventQueueBuffer.h b/src/lib/base/SimpleEventQueueBuffer.h index c1678f4c5..d8f460315 100644 --- a/src/lib/base/SimpleEventQueueBuffer.h +++ b/src/lib/base/SimpleEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/Stopwatch.cpp b/src/lib/base/Stopwatch.cpp index 94cfbf6ee..758f09f2c 100644 --- a/src/lib/base/Stopwatch.cpp +++ b/src/lib/base/Stopwatch.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/Stopwatch.h b/src/lib/base/Stopwatch.h index 2abac2020..e4816ed4b 100644 --- a/src/lib/base/Stopwatch.h +++ b/src/lib/base/Stopwatch.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/String.cpp b/src/lib/base/String.cpp index 1c8b8c268..a060dbd7a 100644 --- a/src/lib/base/String.cpp +++ b/src/lib/base/String.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -31,7 +31,7 @@ #include #include -namespace synergy { +namespace deskflow { namespace string { String format(const char *fmt, ...) { @@ -243,7 +243,7 @@ bool CaselessCmp::cmpLess( bool CaselessCmp::less(const String &a, const String &b) { return std::lexicographical_compare( a.begin(), a.end(), b.begin(), b.end(), - &synergy::string::CaselessCmp::cmpLess); + &deskflow::string::CaselessCmp::cmpLess); } bool CaselessCmp::equal(const String &a, const String &b) { @@ -255,4 +255,4 @@ bool CaselessCmp::operator()(const String &a, const String &b) const { } } // namespace string -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/base/String.h b/src/lib/base/String.h index 9b333cbdb..d2b5b5019 100644 --- a/src/lib/base/String.h +++ b/src/lib/base/String.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -27,7 +27,7 @@ // use standard C++ string class for our string class using String = std::string; -namespace synergy { +namespace deskflow { //! String utilities /*! @@ -131,4 +131,4 @@ public: }; } // namespace string -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/base/TMethodEventJob.h b/src/lib/base/TMethodEventJob.h index a67260d55..16a524d72 100644 --- a/src/lib/base/TMethodEventJob.h +++ b/src/lib/base/TMethodEventJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/TMethodJob.h b/src/lib/base/TMethodJob.h index 6c4cc6bd3..dd9b508d8 100644 --- a/src/lib/base/TMethodJob.h +++ b/src/lib/base/TMethodJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/Unicode.cpp b/src/lib/base/Unicode.cpp index 88abaec49..35ab791d9 100644 --- a/src/lib/base/Unicode.cpp +++ b/src/lib/base/Unicode.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/Unicode.h b/src/lib/base/Unicode.h index 45147ae97..f3a2b603b 100644 --- a/src/lib/base/Unicode.h +++ b/src/lib/base/Unicode.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/XBase.cpp b/src/lib/base/XBase.cpp index 95889cbb0..45a305888 100644 --- a/src/lib/base/XBase.cpp +++ b/src/lib/base/XBase.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -58,7 +58,7 @@ String XBase::format(const char * /*id*/, const char *fmt, ...) const throw() { va_list args; va_start(args, fmt); try { - result = synergy::string::vformat(fmt, args); + result = deskflow::string::vformat(fmt, args); } catch (...) { // ignore result.clear(); diff --git a/src/lib/base/XBase.h b/src/lib/base/XBase.h index 416e7bd77..21e167b39 100644 --- a/src/lib/base/XBase.h +++ b/src/lib/base/XBase.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/log_outputters.cpp b/src/lib/base/log_outputters.cpp index 5be96dad8..7af10fd1d 100644 --- a/src/lib/base/log_outputters.cpp +++ b/src/lib/base/log_outputters.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -185,7 +185,7 @@ bool FileLogOutputter::write(ELevel level, const char *message) { bool moveFile = false; std::ofstream m_handle; - m_handle.open(synergy::filesystem::path(m_fileName), std::fstream::app); + m_handle.open(deskflow::filesystem::path(m_fileName), std::fstream::app); if (m_handle.is_open() && m_handle.fail() != true) { m_handle << message << std::endl; @@ -199,7 +199,7 @@ bool FileLogOutputter::write(ELevel level, const char *message) { if (moveFile) { String oldLogFilename = - synergy::string::sprintf("%s.1", m_fileName.c_str()); + deskflow::string::sprintf("%s.1", m_fileName.c_str()); remove(oldLogFilename.c_str()); rename(m_fileName.c_str(), oldLogFilename.c_str()); } diff --git a/src/lib/base/log_outputters.h b/src/lib/base/log_outputters.h index 61d1efa02..79ffe69e2 100644 --- a/src/lib/base/log_outputters.h +++ b/src/lib/base/log_outputters.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/client/CMakeLists.txt b/src/lib/client/CMakeLists.txt index a74afe69b..7ea2b6480 100644 --- a/src/lib/client/CMakeLists.txt +++ b/src/lib/client/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -24,5 +24,5 @@ endif() add_library(client STATIC ${sources}) if(UNIX) - target_link_libraries(client synlib io) + target_link_libraries(client app io) endif() diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp index dac37fbb7..405ee6b58 100644 --- a/src/lib/client/Client.cpp +++ b/src/lib/client/Client.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -25,21 +25,21 @@ #include "base/TMethodJob.h" #include "client/ServerProxy.h" #include "common/stdexcept.h" +#include "deskflow/AppUtil.h" +#include "deskflow/DropHelper.h" +#include "deskflow/FileChunk.h" +#include "deskflow/IPlatformScreen.h" +#include "deskflow/PacketStreamFilter.h" +#include "deskflow/ProtocolUtil.h" +#include "deskflow/Screen.h" +#include "deskflow/StreamChunker.h" +#include "deskflow/XDeskflow.h" +#include "deskflow/protocol_types.h" #include "mt/Thread.h" #include "net/IDataSocket.h" #include "net/ISocketFactory.h" #include "net/SecureSocket.h" #include "net/TCPSocket.h" -#include "synergy/AppUtil.h" -#include "synergy/DropHelper.h" -#include "synergy/FileChunk.h" -#include "synergy/IPlatformScreen.h" -#include "synergy/PacketStreamFilter.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/Screen.h" -#include "synergy/StreamChunker.h" -#include "synergy/XSynergy.h" -#include "synergy/protocol_types.h" #include #include @@ -55,8 +55,8 @@ Client::Client( IEventQueue *events, const String &name, const NetworkAddress &address, - ISocketFactory *socketFactory, synergy::Screen *screen, - synergy::ClientArgs const &args) + ISocketFactory *socketFactory, deskflow::Screen *screen, + deskflow::ClientArgs const &args) : m_mock(false), m_name(name), m_serverAddress(address), @@ -701,12 +701,12 @@ void Client::onFileRecieveCompleted() { void Client::bindNetworkInterface(IDataSocket *socket) const { try { - if (!m_args.m_synergyAddress.empty()) { + if (!m_args.m_deskflowAddress.empty()) { LOG( (CLOG_DEBUG1 "bind to network interface: %s", - m_args.m_synergyAddress.c_str())); + m_args.m_deskflowAddress.c_str())); - NetworkAddress bindAddress(m_args.m_synergyAddress); + NetworkAddress bindAddress(m_args.m_deskflowAddress); bindAddress.resolve(); socket->bind(bindAddress); diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h index 274851034..1c0b13e71 100644 --- a/src/lib/client/Client.h +++ b/src/lib/client/Client.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,34 +18,34 @@ #pragma once -#include "synergy/IClient.h" +#include "deskflow/IClient.h" #include "base/EventTypes.h" +#include "deskflow/ClientArgs.h" +#include "deskflow/Clipboard.h" +#include "deskflow/DragInformation.h" +#include "deskflow/INode.h" #include "mt/CondVar.h" #include "net/NetworkAddress.h" -#include "synergy/ClientArgs.h" -#include "synergy/Clipboard.h" -#include "synergy/DragInformation.h" -#include "synergy/INode.h" #include class EventQueueTimer; -namespace synergy { +namespace deskflow { class Screen; } class ServerProxy; class IDataSocket; class ISocketFactory; -namespace synergy { +namespace deskflow { class IStream; } class IEventQueue; class Thread; class TCPSocket; -//! Synergy client +//! Deskflow client /*! -This class implements the top-level client algorithms for synergy. +This class implements the top-level client algorithms for deskflow. */ class Client : public IClient, public INode { public: @@ -64,8 +64,8 @@ public: */ Client( IEventQueue *events, const String &name, const NetworkAddress &address, - ISocketFactory *socketFactory, synergy::Screen *screen, - synergy::ClientArgs const &args); + ISocketFactory *socketFactory, deskflow::Screen *screen, + deskflow::ClientArgs const &args); Client(Client const &) = delete; Client(Client &&) = delete; ~Client(); @@ -225,8 +225,8 @@ private: String m_name; NetworkAddress m_serverAddress; ISocketFactory *m_socketFactory; - synergy::Screen *m_screen; - synergy::IStream *m_stream; + deskflow::Screen *m_screen; + deskflow::IStream *m_stream; EventQueueTimer *m_timer; ServerProxy *m_server; bool m_ready; @@ -248,6 +248,6 @@ private: bool m_useSecureNetwork; bool m_enableClipboard; size_t m_maximumClipboardSize; - synergy::ClientArgs m_args; + deskflow::ClientArgs m_args; size_t m_resolvedAddressesCount = 0; }; diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp index 1d97a7c98..6c8b7db19 100644 --- a/src/lib/client/ServerProxy.cpp +++ b/src/lib/client/ServerProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,15 +23,15 @@ #include "base/TMethodEventJob.h" #include "base/XBase.h" #include "client/Client.h" +#include "deskflow/AppUtil.h" +#include "deskflow/Clipboard.h" +#include "deskflow/ClipboardChunk.h" +#include "deskflow/FileChunk.h" +#include "deskflow/ProtocolUtil.h" +#include "deskflow/StreamChunker.h" +#include "deskflow/option_types.h" +#include "deskflow/protocol_types.h" #include "io/IStream.h" -#include "synergy/AppUtil.h" -#include "synergy/Clipboard.h" -#include "synergy/ClipboardChunk.h" -#include "synergy/FileChunk.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/StreamChunker.h" -#include "synergy/option_types.h" -#include "synergy/protocol_types.h" #include #include @@ -42,7 +42,7 @@ // ServerProxy::ServerProxy( - Client *client, synergy::IStream *stream, IEventQueue *events) + Client *client, deskflow::IStream *stream, IEventQueue *events) : m_client(client), m_stream(stream), m_seqNum(0), @@ -919,7 +919,7 @@ void ServerProxy::checkMissedLanguages() const { LOG( (CLOG_WARN "You need to install these languages on this computer and restart " - "Synergy to enable support for multiple languages: %s", + "Deskflow to enable support for multiple languages: %s", missedLanguages.c_str())); } } diff --git a/src/lib/client/ServerProxy.h b/src/lib/client/ServerProxy.h index 0061dd810..378f7d35b 100644 --- a/src/lib/client/ServerProxy.h +++ b/src/lib/client/ServerProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -21,15 +21,15 @@ #include "base/Event.h" #include "base/Stopwatch.h" #include "base/String.h" -#include "synergy/clipboard_types.h" -#include "synergy/key_types.h" -#include "synergy/languages/LanguageManager.h" +#include "deskflow/clipboard_types.h" +#include "deskflow/key_types.h" +#include "deskflow/languages/LanguageManager.h" class Client; class ClientInfo; class EventQueueTimer; class IClipboard; -namespace synergy { +namespace deskflow { class IStream; } class IEventQueue; @@ -45,7 +45,7 @@ public: Process messages from the server on \p stream and forward to \p client. */ - ServerProxy(Client *client, synergy::IStream *stream, IEventQueue *events); + ServerProxy(Client *client, deskflow::IStream *stream, IEventQueue *events); ServerProxy(ServerProxy const &) = delete; ServerProxy(ServerProxy &&) = delete; ~ServerProxy(); @@ -124,7 +124,7 @@ private: typedef EResult (ServerProxy::*MessageParser)(const UInt8 *); Client *m_client; - synergy::IStream *m_stream; + deskflow::IStream *m_stream; UInt32 m_seqNum; @@ -144,5 +144,5 @@ private: IEventQueue *m_events; String m_serverLanguage = ""; bool m_isUserNotifiedAboutLanguageSyncError = false; - synergy::languages::LanguageManager m_languageManager; + deskflow::languages::LanguageManager m_languageManager; }; diff --git a/src/lib/common/IInterface.h b/src/lib/common/IInterface.h index 4e0d38d67..3fce440cb 100644 --- a/src/lib/common/IInterface.h +++ b/src/lib/common/IInterface.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/MacOSXPrecomp.h b/src/lib/common/MacOSXPrecomp.h index 8ae4edeef..18a43ceb1 100644 --- a/src/lib/common/MacOSXPrecomp.h +++ b/src/lib/common/MacOSXPrecomp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/basic_types.h b/src/lib/common/basic_types.h index 02b9945ef..94ebe6ad6 100644 --- a/src/lib/common/basic_types.h +++ b/src/lib/common/basic_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/common.h b/src/lib/common/common.h index 8b8a04add..184a732da 100644 --- a/src/lib/common/common.h +++ b/src/lib/common/common.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/constants.h b/src/lib/common/constants.h index 3fb21b52d..3f8f10662 100644 --- a/src/lib/common/constants.h +++ b/src/lib/common/constants.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,13 +18,13 @@ #pragma once -#if !defined(SYNERGY_VERSION) +#if !defined(DESKFLOW_VERSION) #error version was not passed to the compiler #endif -const auto kAppName = "Synergy"; +const auto kAppName = "Deskflow"; const auto kAppDescription = "Mouse and keyboard sharing utility"; -const auto kVersion = SYNERGY_VERSION; +const auto kVersion = DESKFLOW_VERSION; #ifdef GIT_SHA_SHORT const auto kVersionGitSha = GIT_SHA_SHORT; diff --git a/src/lib/common/copyright.h b/src/lib/common/copyright.h index f084d10b4..4ad3d5cb3 100644 --- a/src/lib/common/copyright.h +++ b/src/lib/common/copyright.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include #include -namespace synergy { +namespace deskflow { const auto kCopyrightFormat = // "Copyright (C) 2012-%s Symless Ltd.\n" @@ -38,4 +38,4 @@ inline std::string copyright() { return std::string(buffer.data()); } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/common/ipc.h b/src/lib/common/ipc.h index 90df86a51..85e05396e 100644 --- a/src/lib/common/ipc.h +++ b/src/lib/common/ipc.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -34,7 +34,7 @@ const auto kIpcHost = "127.0.0.1"; const auto kIpcPort = 24801; // handshake: node/gui -> daemon -// $1 = type, the client identifies it's self as gui or node (synergyc/s). +// $1 = type, the client identifies it's self as gui or node (deskflowc/s). const auto kIpcMsgHello = "IHEL%1i"; // handshake: daemon -> node/gui @@ -42,16 +42,16 @@ const auto kIpcMsgHello = "IHEL%1i"; const auto kIpcMsgHelloBack = "IHEL"; // log line: daemon -> gui -// $1 = aggregate log lines collected from synergys/c or the daemon itself. +// $1 = aggregate log lines collected from deskflows/c or the daemon itself. const auto kIpcMsgLogLine = "ILOG%s"; // command: gui -> daemon // $1 = command; the command for the daemon to launch, typically the full -// path to synergys/c. $2 = true when process must be elevated on ms windows. +// path to deskflows/c. $2 = true when process must be elevated on ms windows. const auto kIpcMsgCommand = "ICMD%s%1i"; // shutdown: daemon -> node -// the daemon tells synergys/c to shut down gracefully. +// the daemon tells deskflows/c to shut down gracefully. const auto kIpcMsgShutdown = "ISDN"; // set setting: gui -> daemon diff --git a/src/lib/common/stdbitset.h b/src/lib/common/stdbitset.h index a4d51edf2..49f0712ea 100644 --- a/src/lib/common/stdbitset.h +++ b/src/lib/common/stdbitset.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stddeque.h b/src/lib/common/stddeque.h index c781b8f81..689aa5a3f 100644 --- a/src/lib/common/stddeque.h +++ b/src/lib/common/stddeque.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdexcept.h b/src/lib/common/stdexcept.h index 52ce3ab0d..225499424 100644 --- a/src/lib/common/stdexcept.h +++ b/src/lib/common/stdexcept.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/common/stdfstream.h b/src/lib/common/stdfstream.h index b6845c55b..825693760 100644 --- a/src/lib/common/stdfstream.h +++ b/src/lib/common/stdfstream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdistream.h b/src/lib/common/stdistream.h index 2adda50bc..b51a8a9fe 100644 --- a/src/lib/common/stdistream.h +++ b/src/lib/common/stdistream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdlist.h b/src/lib/common/stdlist.h index 64ac1752c..253b5656c 100644 --- a/src/lib/common/stdlist.h +++ b/src/lib/common/stdlist.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdmap.h b/src/lib/common/stdmap.h index 28e4ad327..c11d65e93 100644 --- a/src/lib/common/stdmap.h +++ b/src/lib/common/stdmap.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdostream.h b/src/lib/common/stdostream.h index c82a02506..4a2bed77e 100644 --- a/src/lib/common/stdostream.h +++ b/src/lib/common/stdostream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdpost.h b/src/lib/common/stdpost.h index 2658532f8..04977a037 100644 --- a/src/lib/common/stdpost.h +++ b/src/lib/common/stdpost.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdpre.h b/src/lib/common/stdpre.h index b09a70747..89fa0c279 100644 --- a/src/lib/common/stdpre.h +++ b/src/lib/common/stdpre.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdset.h b/src/lib/common/stdset.h index 9a0be8d30..7b08a3599 100644 --- a/src/lib/common/stdset.h +++ b/src/lib/common/stdset.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdsstream.h b/src/lib/common/stdsstream.h index d80ed7417..3d1511026 100644 --- a/src/lib/common/stdsstream.h +++ b/src/lib/common/stdsstream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdstring.h b/src/lib/common/stdstring.h index 69433e374..228394d6f 100644 --- a/src/lib/common/stdstring.h +++ b/src/lib/common/stdstring.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdvector.h b/src/lib/common/stdvector.h index 0fcb993db..55248dbfc 100644 --- a/src/lib/common/stdvector.h +++ b/src/lib/common/stdvector.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/version.h b/src/lib/common/version.h index e4dc2bdaf..883ff2056 100644 --- a/src/lib/common/version.h +++ b/src/lib/common/version.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include -namespace synergy { +namespace deskflow { inline std::string version() { std::string result = kVersion; @@ -34,4 +34,4 @@ inline std::string version() { return result; } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/App.cpp b/src/lib/deskflow/App.cpp similarity index 94% rename from src/lib/synergy/App.cpp rename to src/lib/deskflow/App.cpp index 32d5447d9..e907b7a80 100644 --- a/src/lib/synergy/App.cpp +++ b/src/lib/deskflow/App.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/App.h" +#include "deskflow/App.h" #include "DisplayInvalidException.h" #include "arch/Arch.h" @@ -30,12 +30,12 @@ #include "common/copyright.h" #include "common/ipc.h" #include "common/version.h" +#include "deskflow/ArgsBase.h" +#include "deskflow/Config.h" +#include "deskflow/XDeskflow.h" +#include "deskflow/protocol_types.h" #include "ipc/IpcMessage.h" #include "ipc/IpcServerProxy.h" -#include "synergy/ArgsBase.h" -#include "synergy/Config.h" -#include "synergy/XSynergy.h" -#include "synergy/protocol_types.h" #if SYSAPI_WIN32 #include "arch/win32/ArchMiscWindows.h" @@ -63,7 +63,7 @@ #include #endif -using namespace synergy; +using namespace deskflow; App *App::s_instance = nullptr; @@ -73,7 +73,7 @@ App *App::s_instance = nullptr; App::App( IEventQueue *events, CreateTaskBarReceiverFunc createTaskBarReceiver, - synergy::ArgsBase *args) + deskflow::ArgsBase *args) : m_bye(&exit), m_taskBarReceiver(NULL), m_suspended(false), @@ -94,8 +94,8 @@ App::~App() { } void App::version() { - const auto version = synergy::version(); - const auto copyright = synergy::copyright(); + const auto version = deskflow::version(); + const auto copyright = deskflow::copyright(); const auto kBufferLength = 1024; std::vector buffer(kBufferLength); @@ -274,7 +274,7 @@ void App::runEventsLoop(void *) { // MinimalApp // -MinimalApp::MinimalApp() : App(NULL, NULL, new synergy::ArgsBase()) { +MinimalApp::MinimalApp() : App(NULL, NULL, new deskflow::ArgsBase()) { m_arch.init(); setEvents(m_events); } @@ -294,7 +294,7 @@ int MinimalApp::mainLoop() { return 0; } int MinimalApp::foregroundStartup(int argc, char **argv) { return 0; } -synergy::Screen *MinimalApp::createScreen() { return NULL; } +deskflow::Screen *MinimalApp::createScreen() { return NULL; } void MinimalApp::loadConfig() {} diff --git a/src/lib/synergy/App.h b/src/lib/deskflow/App.h similarity index 95% rename from src/lib/synergy/App.h rename to src/lib/deskflow/App.h index fad88e3f0..f3f97e49d 100644 --- a/src/lib/synergy/App.h +++ b/src/lib/deskflow/App.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -22,13 +22,13 @@ #include "base/Log.h" #include "base/String.h" #include "common/common.h" +#include "deskflow/IApp.h" #include "ipc/IpcClient.h" -#include "synergy/IApp.h" #if SYSAPI_WIN32 -#include "synergy/win32/AppUtilWindows.h" +#include "deskflow/win32/AppUtilWindows.h" #elif SYSAPI_UNIX -#include "synergy/unix/AppUtilUnix.h" +#include "deskflow/unix/AppUtilUnix.h" #endif #include @@ -37,7 +37,7 @@ class IArchTaskBarReceiver; class BufferedLogOutputter; class ILogOutputter; class FileLogOutputter; -namespace synergy { +namespace deskflow { class Screen; } class IEventQueue; @@ -54,7 +54,7 @@ public: }; App(IEventQueue *events, CreateTaskBarReceiverFunc createTaskBarReceiver, - synergy::ArgsBase *args); + deskflow::ArgsBase *args); App(App const &) = delete; App(App &&) = delete; virtual ~App(); @@ -75,7 +75,7 @@ public: virtual IEventQueue *getEvents() const { return m_events; } ARCH_APP_UTIL &appUtil() { return m_appUtil; } - synergy::ArgsBase &argsBase() const { return *m_args; } + deskflow::ArgsBase &argsBase() const { return *m_args; } int run(int argc, char **argv); int daemonMainLoop(int, const char **); void setupFileLogging(); @@ -113,7 +113,7 @@ protected: IEventQueue *m_events; private: - synergy::ArgsBase *m_args; + deskflow::ArgsBase *m_args; static App *s_instance; FileLogOutputter *m_fileLog; CreateTaskBarReceiverFunc m_createTaskBarReceiver; @@ -135,7 +135,7 @@ public: virtual void startNode() override; virtual int mainLoop() override; virtual int foregroundStartup(int argc, char **argv) override; - virtual synergy::Screen *createScreen() override; + virtual deskflow::Screen *createScreen() override; virtual void loadConfig() override; virtual bool loadConfig(const String &pathname) override; virtual const char *daemonInfo() const override; diff --git a/src/lib/synergy/AppUtil.cpp b/src/lib/deskflow/AppUtil.cpp similarity index 93% rename from src/lib/synergy/AppUtil.cpp rename to src/lib/deskflow/AppUtil.cpp index 95968283b..e586c283d 100644 --- a/src/lib/synergy/AppUtil.cpp +++ b/src/lib/deskflow/AppUtil.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/AppUtil.h" +#include "deskflow/AppUtil.h" #include "algorithm" diff --git a/src/lib/synergy/AppUtil.h b/src/lib/deskflow/AppUtil.h similarity index 90% rename from src/lib/synergy/AppUtil.h rename to src/lib/deskflow/AppUtil.h index b8065f731..c0887e4b1 100644 --- a/src/lib/synergy/AppUtil.h +++ b/src/lib/deskflow/AppUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,8 +18,8 @@ #pragma once -#include "synergy/IAppUtil.h" -#include "synergy/XSynergy.h" +#include "deskflow/IAppUtil.h" +#include "deskflow/XDeskflow.h" class AppUtil : public IAppUtil { public: diff --git a/src/lib/synergy/ArgParser.cpp b/src/lib/deskflow/ArgParser.cpp similarity index 93% rename from src/lib/synergy/ArgParser.cpp rename to src/lib/deskflow/ArgParser.cpp index 641dc55a3..74d2ef4d5 100644 --- a/src/lib/synergy/ArgParser.cpp +++ b/src/lib/deskflow/ArgParser.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,29 +15,29 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" +#include "deskflow/ArgParser.h" #include "base/Log.h" #include "base/String.h" +#include "deskflow/App.h" +#include "deskflow/ArgsBase.h" +#include "deskflow/ClientArgs.h" +#include "deskflow/ServerArgs.h" +#include "deskflow/ToolArgs.h" #include "license/parse_serial_key.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" -#include "synergy/ClientArgs.h" -#include "synergy/ServerArgs.h" -#include "synergy/ToolArgs.h" #ifdef WINAPI_MSWINDOWS #include #endif -using namespace synergy::license; +using namespace deskflow::license; -synergy::ArgsBase *ArgParser::m_argsBase = nullptr; +deskflow::ArgsBase *ArgParser::m_argsBase = nullptr; ArgParser::ArgParser(App *app) : m_app(app) {} bool ArgParser::parseServerArgs( - synergy::ServerArgs &args, int argc, const char *const *argv) { + deskflow::ServerArgs &args, int argc, const char *const *argv) { setArgsBase(args); updateCommonArgs(argv); int i = 1; @@ -76,7 +76,7 @@ bool ArgParser::parseServerArgs( } bool ArgParser::parseClientArgs( - synergy::ClientArgs &args, int argc, const char *const *argv) { + deskflow::ClientArgs &args, int argc, const char *const *argv) { setArgsBase(args); updateCommonArgs(argv); @@ -102,7 +102,7 @@ bool ArgParser::parseClientArgs( args.m_enableLangSync = true; } else if (isArg(i, argc, argv, nullptr, "--invert-scroll")) { args.m_clientScrollDirection = - synergy::ClientScrollDirection::INVERT_SERVER; + deskflow::ClientScrollDirection::INVERT_SERVER; } else if (isArg(i, argc, argv, nullptr, "--host")) { args.m_hostMode = true; } else if (isArg(i, argc, argv, nullptr, "client")) { @@ -138,11 +138,11 @@ bool ArgParser::parseClientArgs( } bool ArgParser::parsePlatformArgs( - synergy::ArgsBase &argsBase, const int &argc, const char *const *argv, + deskflow::ArgsBase &argsBase, const int &argc, const char *const *argv, int &i, bool isServer) { #if WINAPI_MSWINDOWS if (isArg(i, argc, argv, nullptr, "--service")) { - LOG((CLOG_WARN "obsolete argument --service, use synergyd instead.")); + LOG((CLOG_WARN "obsolete argument --service, use deskflowd instead.")); argsBase.m_shouldExitFail = true; } else if (isArg(i, argc, argv, nullptr, "--exit-pause")) { argsBase.m_pauseOnExit = true; @@ -199,7 +199,7 @@ bool ArgParser::parseToolArgs( bool ArgParser::parseGenericArgs(int argc, const char *const *argv, int &i) { if (isArg(i, argc, argv, "-a", "--address", 1)) { - argsBase().m_synergyAddress = argv[++i]; + argsBase().m_deskflowAddress = argv[++i]; } else if (isArg(i, argc, argv, "-d", "--debug", 1)) { // change logging level argsBase().m_logFilter = argv[++i]; @@ -237,9 +237,9 @@ bool ArgParser::parseGenericArgs(int argc, const char *const *argv, int &i) { } else if (isArg(i, argc, argv, nullptr, "--ipc")) { argsBase().m_enableIpc = true; } else if (isArg(i, argc, argv, nullptr, "--server")) { - // HACK: stop error happening when using portable (synergyp) + // HACK: stop error happening when using portable (deskflowp) } else if (isArg(i, argc, argv, nullptr, "--client")) { - // HACK: stop error happening when using portable (synergyp) + // HACK: stop error happening when using portable (deskflowp) } else if (isArg(i, argc, argv, nullptr, "--enable-drag-drop")) { bool useDragDrop = true; diff --git a/src/lib/synergy/ArgParser.h b/src/lib/deskflow/ArgParser.h similarity index 76% rename from src/lib/synergy/ArgParser.h rename to src/lib/deskflow/ArgParser.h index 70e1b048b..7d6fd92f1 100644 --- a/src/lib/synergy/ArgParser.h +++ b/src/lib/deskflow/ArgParser.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,11 +20,11 @@ #include "base/String.h" #include "common/stdvector.h" -namespace synergy { +namespace deskflow { class ArgsBase; class ServerArgs; class ClientArgs; -} // namespace synergy +} // namespace deskflow class ToolArgs; class App; @@ -34,17 +34,17 @@ class ArgParser { public: ArgParser(App *app); - bool - parseServerArgs(synergy::ServerArgs &args, int argc, const char *const *argv); - bool - parseClientArgs(synergy::ClientArgs &args, int argc, const char *const *argv); + bool parseServerArgs( + deskflow::ServerArgs &args, int argc, const char *const *argv); + bool parseClientArgs( + deskflow::ClientArgs &args, int argc, const char *const *argv); bool parsePlatformArgs( - synergy::ArgsBase &argsBase, const int &argc, const char *const *argv, + deskflow::ArgsBase &argsBase, const int &argc, const char *const *argv, int &i, bool isServer); bool parseToolArgs(ToolArgs &args, int argc, const char *const *argv); bool parseGenericArgs(int argc, const char *const *argv, int &i); bool parseDeprecatedArgs(int argc, const char *const *argv, int &i); - void setArgsBase(synergy::ArgsBase &argsBase) { m_argsBase = &argsBase; } + void setArgsBase(deskflow::ArgsBase &argsBase) { m_argsBase = &argsBase; } static bool isArg( int argi, int argc, const char *const *argv, const char *name1, @@ -58,7 +58,7 @@ public: std::vector &argsArray, String ignoreArg = "", int parametersRequired = 0); - static synergy::ArgsBase &argsBase() { return *m_argsBase; } + static deskflow::ArgsBase &argsBase() { return *m_argsBase; } private: void updateCommonArgs(const char *const *argv); @@ -67,5 +67,5 @@ private: private: App *m_app; - static synergy::ArgsBase *m_argsBase; + static deskflow::ArgsBase *m_argsBase; }; diff --git a/src/lib/synergy/ArgsBase.cpp b/src/lib/deskflow/ArgsBase.cpp similarity index 88% rename from src/lib/synergy/ArgsBase.cpp rename to src/lib/deskflow/ArgsBase.cpp index 240d057af..5c5218a18 100644 --- a/src/lib/synergy/ArgsBase.cpp +++ b/src/lib/deskflow/ArgsBase.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2020 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -18,8 +18,8 @@ #include "ArgsBase.h" -namespace synergy { +namespace deskflow { ArgsBase::~ArgsBase() { // } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/ArgsBase.h b/src/lib/deskflow/ArgsBase.h similarity index 96% rename from src/lib/synergy/ArgsBase.h rename to src/lib/deskflow/ArgsBase.h index 9849bdb9c..ce3463b32 100644 --- a/src/lib/synergy/ArgsBase.h +++ b/src/lib/deskflow/ArgsBase.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include "base/String.h" -namespace synergy { +namespace deskflow { /** * @brief This is the base Argument class that will store the generic @@ -77,7 +77,7 @@ public: bool m_shouldExitFail = false; /// @brief Bind to this address - String m_synergyAddress; + String m_deskflowAddress; /// @brief Should the connections be TLS encrypted bool m_enableCrypto = false; @@ -111,4 +111,4 @@ protected: p = 0; } }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt similarity index 81% rename from src/lib/synergy/CMakeLists.txt rename to src/lib/deskflow/CMakeLists.txt index 02e92b1b1..a57b5f439 100644 --- a/src/lib/synergy/CMakeLists.txt +++ b/src/lib/deskflow/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -14,6 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +set(lib_name app) + file(GLOB headers "*.h" "languages/*.h") file(GLOB sources "*.cpp" "languages/*.cpp") @@ -38,11 +40,11 @@ if(ADD_HEADERS_TO_SOURCES) list(APPEND sources ${headers}) endif() -add_library(synlib STATIC ${sources}) +add_library(${lib_name} STATIC ${sources}) if(UNIX) target_link_libraries( - synlib + ${lib_name} arch client ipc @@ -53,12 +55,12 @@ if(UNIX) server) if(NOT APPLE) - target_link_libraries(synlib pugixml) + target_link_libraries(${lib_name} pugixml) find_package(PkgConfig) if(PKG_CONFIG_FOUND) - target_link_libraries(synlib PkgConfig::lib_glib PkgConfig::lib_gdkpixbuf - PkgConfig::lib_notify) + target_link_libraries(${lib_name} PkgConfig::lib_glib + PkgConfig::lib_gdkpixbuf PkgConfig::lib_notify) endif() endif() endif() diff --git a/src/lib/synergy/Chunk.cpp b/src/lib/deskflow/Chunk.cpp similarity index 91% rename from src/lib/synergy/Chunk.cpp rename to src/lib/deskflow/Chunk.cpp index 28f3f0fd1..bf2cabd0b 100644 --- a/src/lib/synergy/Chunk.cpp +++ b/src/lib/deskflow/Chunk.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/Chunk.h" +#include "deskflow/Chunk.h" #include "base/String.h" Chunk::Chunk(size_t size) : m_dataSize(0) { diff --git a/src/lib/synergy/Chunk.h b/src/lib/deskflow/Chunk.h similarity index 95% rename from src/lib/synergy/Chunk.h rename to src/lib/deskflow/Chunk.h index e6e2033dd..11c2de8be 100644 --- a/src/lib/synergy/Chunk.h +++ b/src/lib/deskflow/Chunk.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/synergy/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp similarity index 94% rename from src/lib/synergy/ClientApp.cpp rename to src/lib/deskflow/ClientApp.cpp index 42212ab6d..79d1402bb 100644 --- a/src/lib/synergy/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ClientApp.h" +#include "deskflow/ClientApp.h" #include "arch/Arch.h" #include "arch/IArchTaskBarReceiver.h" @@ -26,17 +26,17 @@ #include "base/String.h" #include "base/TMethodEventJob.h" #include "client/Client.h" +#include "deskflow/ArgParser.h" +#include "deskflow/ClientArgs.h" +#include "deskflow/Screen.h" +#include "deskflow/XScreen.h" +#include "deskflow/protocol_types.h" #include "net/InverseSockets/InverseSocketFactory.h" #include "net/NetworkAddress.h" #include "net/SocketMultiplexer.h" #include "net/TCPSocketFactory.h" #include "net/XSocket.h" #include "platform/wayland.h" -#include "synergy/ArgParser.h" -#include "synergy/ClientArgs.h" -#include "synergy/Screen.h" -#include "synergy/XScreen.h" -#include "synergy/protocol_types.h" #if SYSAPI_WIN32 #include "arch/win32/ArchMiscWindows.h" @@ -76,7 +76,7 @@ ClientApp::ClientApp( IEventQueue *events, CreateTaskBarReceiverFunc createTaskBarReceiver) - : App(events, createTaskBarReceiver, new synergy::ClientArgs()), + : App(events, createTaskBarReceiver, new deskflow::ClientArgs()), m_client(NULL), m_clientScreen(NULL), m_serverAddress(NULL) {} @@ -132,7 +132,7 @@ void ClientApp::help() { #endif << HELP_SYS_ARGS << HELP_COMMON_ARGS << " " << "\n\n" - << "Connect to a synergy mouse/keyboard sharing server.\n" + << "Connect to a deskflow mouse/keyboard sharing server.\n" << "\n" << " -a, --address
local network interface address.\n" << HELP_COMMON_INFO_1 << HELP_SYS_INFO @@ -163,9 +163,9 @@ void ClientApp::help() { const char *ClientApp::daemonName() const { #if SYSAPI_WIN32 - return "Synergy Client"; + return "Deskflow Client"; #elif SYSAPI_UNIX - return "synergyc"; + return "deskflowc"; #endif } @@ -178,9 +178,9 @@ const char *ClientApp::daemonInfo() const { #endif } -synergy::Screen *ClientApp::createScreen() { +deskflow::Screen *ClientApp::createScreen() { #if WINAPI_MSWINDOWS - return new synergy::Screen( + return new deskflow::Screen( new MSWindowsScreen( false, args().m_noHooks, args().m_stopOnDeskSwitch, m_events, args().m_enableLangSync, args().m_clientScrollDirection), @@ -188,11 +188,11 @@ synergy::Screen *ClientApp::createScreen() { #endif #if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI) - if (synergy::platform::isWayland()) { + if (deskflow::platform::isWayland()) { #if WINAPI_LIBEI LOG((CLOG_INFO "using ei screen for wayland")); - return new synergy::Screen( - new synergy::EiScreen(false, m_events, true), m_events); + return new deskflow::Screen( + new deskflow::EiScreen(false, m_events, true), m_events); #else throw XNoEiSupport(); #endif @@ -201,7 +201,7 @@ synergy::Screen *ClientApp::createScreen() { #if WINAPI_XWINDOWS LOG((CLOG_INFO "using legacy x windows screen")); - return new synergy::Screen( + return new deskflow::Screen( new XWindowsScreen( args().m_display, false, args().m_disableXInitThreads, args().m_yscroll, m_events, args().m_clientScrollDirection), @@ -210,7 +210,7 @@ synergy::Screen *ClientApp::createScreen() { #endif #if WINAPI_CARBON - return new synergy::Screen( + return new deskflow::Screen( new OSXScreen( m_events, false, args().m_enableLangSync, args().m_clientScrollDirection), @@ -256,8 +256,8 @@ void ClientApp::handleScreenError(const Event &, void *) { m_events->addEvent(Event(Event::kQuit)); } -synergy::Screen *ClientApp::openClientScreen() { - synergy::Screen *screen = createScreen(); +deskflow::Screen *ClientApp::openClientScreen() { + deskflow::Screen *screen = createScreen(); screen->setEnableDragDrop(argsBase().m_enableDragDrop); m_events->adoptHandler( m_events->forIScreen().error(), screen->getEventTarget(), @@ -265,7 +265,7 @@ synergy::Screen *ClientApp::openClientScreen() { return screen; } -void ClientApp::closeClientScreen(synergy::Screen *screen) { +void ClientApp::closeClientScreen(deskflow::Screen *screen) { if (screen != NULL) { m_events->removeHandler( m_events->forIScreen().error(), screen->getEventTarget()); @@ -348,7 +348,7 @@ void ClientApp::handleClientDisconnected(const Event &, void *) { Client *ClientApp::openClient( const String &name, const NetworkAddress &address, - synergy::Screen *screen) { + deskflow::Screen *screen) { Client *client = new Client(m_events, name, address, getSocketFactory(), screen, args()); @@ -400,7 +400,7 @@ int ClientApp::foregroundStartup(int argc, char **argv) { bool ClientApp::startClient() { double retryTime; - synergy::Screen *clientScreen = NULL; + deskflow::Screen *clientScreen = NULL; try { if (m_clientScreen == NULL) { clientScreen = openClientScreen(); diff --git a/src/lib/synergy/ClientApp.h b/src/lib/deskflow/ClientApp.h similarity index 86% rename from src/lib/synergy/ClientApp.h rename to src/lib/deskflow/ClientApp.h index 60688fae8..a6ffbe222 100644 --- a/src/lib/synergy/ClientApp.h +++ b/src/lib/deskflow/ClientApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,9 +18,9 @@ #pragma once -#include "synergy/App.h" +#include "deskflow/App.h" -namespace synergy { +namespace deskflow { class Screen; } class Event; @@ -29,7 +29,7 @@ class NetworkAddress; class Thread; class ISocketFactory; -namespace synergy { +namespace deskflow { class ClientArgs; } @@ -54,7 +54,7 @@ public: int runInner( int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) override; - synergy::Screen *createScreen() override; + deskflow::Screen *createScreen() override; int mainLoop() override; void startNode() override; @@ -73,8 +73,8 @@ public: void resetRestartTimeout(); double nextRestartTimeout(); void handleScreenError(const Event &, void *); - synergy::Screen *openClientScreen(); - void closeClientScreen(synergy::Screen *screen); + deskflow::Screen *openClientScreen(); + void closeClientScreen(deskflow::Screen *screen); void handleClientRestart(const Event &, void *vtimer); void scheduleClientRestart(double retryTime); void handleClientConnected(const Event &, void *); @@ -83,14 +83,14 @@ public: void handleClientDisconnected(const Event &, void *); Client *openClient( const String &name, const NetworkAddress &address, - synergy::Screen *screen); + deskflow::Screen *screen); void closeClient(Client *client); bool startClient(); void stopClient(); Client *getClientPtr() { return m_client; } - synergy::ClientArgs &args() const { - return (synergy::ClientArgs &)argsBase(); + deskflow::ClientArgs &args() const { + return (deskflow::ClientArgs &)argsBase(); } // @@ -103,7 +103,7 @@ private: ISocketFactory *getSocketFactory() const; Client *m_client; - synergy::Screen *m_clientScreen; + deskflow::Screen *m_clientScreen; NetworkAddress *m_serverAddress; size_t m_lastServerAddressIndex = 0; }; diff --git a/src/lib/synergy/ClientAppArguments.md b/src/lib/deskflow/ClientAppArguments.md similarity index 96% rename from src/lib/synergy/ClientAppArguments.md rename to src/lib/deskflow/ClientAppArguments.md index 4cba17025..615ca5e88 100644 --- a/src/lib/synergy/ClientAppArguments.md +++ b/src/lib/deskflow/ClientAppArguments.md @@ -10,7 +10,7 @@ As obtained by ```updateCommonArgs()``` The name of the host as reported by the platform. *m_pname* -Name of the process (synergys\[.exe]) +Name of the process (deskflows\[.exe]) ## Platform Arguments @@ -126,7 +126,7 @@ Enables secure data sockets. **--profile-dir** *m_profileDirectory* -If the profile directory is not passed-in, then it is inferred. For XWindows as "~/.synergy" or else "~/Library/Synergy". +If the profile directory is not passed-in, then it is inferred. For XWindows as "~/.deskflow" or else "~/Library/Deskflow". **--plugin-dir** *m_pluginDirectory* @@ -136,7 +136,7 @@ If unspecified, it is inferred. For XWindows "~/plugins" or else "~/Plugins". **--tls-cert** *m_tlsCertFile* -If unspecified and used, then it is sought for as prifleDirectory/SSL/Synergy.pem +If unspecified and used, then it is sought for as prifleDirectory/SSL/Deskflow.pem ## Uncategorised diff --git a/src/lib/synergy/ClientArgs.cpp b/src/lib/deskflow/ClientArgs.cpp similarity index 88% rename from src/lib/synergy/ClientArgs.cpp rename to src/lib/deskflow/ClientArgs.cpp index fc079eda9..cd33744a8 100644 --- a/src/lib/synergy/ClientArgs.cpp +++ b/src/lib/deskflow/ClientArgs.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,9 +17,9 @@ #include "ClientArgs.h" -namespace synergy { +namespace deskflow { ClientArgs::~ClientArgs() {} ClientArgs::ClientArgs() { m_classType = kClient; } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/ClientArgs.h b/src/lib/deskflow/ClientArgs.h similarity index 84% rename from src/lib/synergy/ClientArgs.h rename to src/lib/deskflow/ClientArgs.h index 23e82fe9f..0630aa5d0 100644 --- a/src/lib/synergy/ClientArgs.h +++ b/src/lib/deskflow/ClientArgs.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -#ifndef SYNERGY_CORE_CLIENTARGS_H -#define SYNERGY_CORE_CLIENTARGS_H +#ifndef DESKFLOW_CORE_CLIENTARGS_H +#define DESKFLOW_CORE_CLIENTARGS_H #include "ArgsBase.h" -namespace synergy { +namespace deskflow { enum ClientScrollDirection { SERVER = 1, INVERT_SERVER = -1 }; class ClientArgs : public ArgsBase { @@ -49,10 +49,10 @@ public: bool m_hostMode = false; /** - * @brief m_serverAddress stores synergy server address + * @brief m_serverAddress stores deskflow server address */ std::string m_serverAddress; }; -} // namespace synergy +} // namespace deskflow -#endif // SYNERGY_CORE_CLIENTARGS_H +#endif // DESKFLOW_CORE_CLIENTARGS_H diff --git a/src/lib/synergy/ClientTaskBarReceiver.cpp b/src/lib/deskflow/ClientTaskBarReceiver.cpp similarity index 89% rename from src/lib/synergy/ClientTaskBarReceiver.cpp rename to src/lib/deskflow/ClientTaskBarReceiver.cpp index 48c390588..d11f6e023 100644 --- a/src/lib/synergy/ClientTaskBarReceiver.cpp +++ b/src/lib/deskflow/ClientTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ClientTaskBarReceiver.h" +#include "deskflow/ClientTaskBarReceiver.h" #include "arch/Arch.h" #include "base/IEventQueue.h" #include "base/String.h" @@ -94,22 +94,22 @@ void ClientTaskBarReceiver::unlock() const { std::string ClientTaskBarReceiver::getToolTip() const { switch (m_state) { case kNotRunning: - return synergy::string::sprintf("%s: Not running", kAppName); + return deskflow::string::sprintf("%s: Not running", kAppName); case kNotWorking: - return synergy::string::sprintf( + return deskflow::string::sprintf( "%s: %s", kAppName, m_errorMessage.c_str()); case kNotConnected: - return synergy::string::sprintf( + return deskflow::string::sprintf( "%s: Not connected: %s", kAppName, m_errorMessage.c_str()); case kConnecting: - return synergy::string::sprintf( + return deskflow::string::sprintf( "%s: Connecting to %s...", kAppName, m_server.c_str()); case kConnected: - return synergy::string::sprintf( + return deskflow::string::sprintf( "%s: Connected to %s", kAppName, m_server.c_str()); default: diff --git a/src/lib/synergy/ClientTaskBarReceiver.h b/src/lib/deskflow/ClientTaskBarReceiver.h similarity index 95% rename from src/lib/synergy/ClientTaskBarReceiver.h rename to src/lib/deskflow/ClientTaskBarReceiver.h index b2277990a..21556d4f0 100644 --- a/src/lib/synergy/ClientTaskBarReceiver.h +++ b/src/lib/deskflow/ClientTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -26,7 +26,7 @@ class IEventQueue; -//! Implementation of IArchTaskBarReceiver for the synergy server +//! Implementation of IArchTaskBarReceiver for the deskflow server class ClientTaskBarReceiver : public IArchTaskBarReceiver { public: ClientTaskBarReceiver(IEventQueue *events); diff --git a/src/lib/synergy/Clipboard.cpp b/src/lib/deskflow/Clipboard.cpp similarity index 95% rename from src/lib/synergy/Clipboard.cpp rename to src/lib/deskflow/Clipboard.cpp index 70baacd46..344570e3e 100644 --- a/src/lib/synergy/Clipboard.cpp +++ b/src/lib/deskflow/Clipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/Clipboard.h" +#include "deskflow/Clipboard.h" // // Clipboard diff --git a/src/lib/synergy/Clipboard.h b/src/lib/deskflow/Clipboard.h similarity index 95% rename from src/lib/synergy/Clipboard.h rename to src/lib/deskflow/Clipboard.h index f4d2237ec..2cd6db676 100644 --- a/src/lib/synergy/Clipboard.h +++ b/src/lib/deskflow/Clipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IClipboard.h" +#include "deskflow/IClipboard.h" //! Memory buffer clipboard /*! diff --git a/src/lib/synergy/ClipboardChunk.cpp b/src/lib/deskflow/ClipboardChunk.cpp similarity index 91% rename from src/lib/synergy/ClipboardChunk.cpp rename to src/lib/deskflow/ClipboardChunk.cpp index 008c5c518..a46d70044 100644 --- a/src/lib/synergy/ClipboardChunk.cpp +++ b/src/lib/deskflow/ClipboardChunk.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -#include "synergy/ClipboardChunk.h" +#include "deskflow/ClipboardChunk.h" #include "base/Log.h" +#include "deskflow/ProtocolUtil.h" +#include "deskflow/protocol_types.h" #include "io/IStream.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/protocol_types.h" #include size_t ClipboardChunk::s_expectedSize = 0; @@ -74,7 +74,7 @@ ClipboardChunk *ClipboardChunk::end(ClipboardID id, UInt32 sequence) { } int ClipboardChunk::assemble( - synergy::IStream *stream, String &dataCached, ClipboardID &id, + deskflow::IStream *stream, String &dataCached, ClipboardID &id, UInt32 &sequence) { UInt8 mark; String data; @@ -85,7 +85,7 @@ int ClipboardChunk::assemble( } if (mark == kDataStart) { - s_expectedSize = synergy::string::stringToSizeType(data); + s_expectedSize = deskflow::string::stringToSizeType(data); LOG((CLOG_DEBUG "start receiving clipboard data")); dataCached.clear(); return kStart; @@ -109,7 +109,7 @@ int ClipboardChunk::assemble( return kError; } -void ClipboardChunk::send(synergy::IStream *stream, void *data) { +void ClipboardChunk::send(deskflow::IStream *stream, void *data) { ClipboardChunk *clipboardData = static_cast(data); LOG((CLOG_DEBUG1 "sending clipboard chunk")); diff --git a/src/lib/synergy/ClipboardChunk.h b/src/lib/deskflow/ClipboardChunk.h similarity index 82% rename from src/lib/synergy/ClipboardChunk.h rename to src/lib/deskflow/ClipboardChunk.h index 38f3ae265..28932e4e6 100644 --- a/src/lib/synergy/ClipboardChunk.h +++ b/src/lib/deskflow/ClipboardChunk.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,12 +19,12 @@ #include "base/String.h" #include "common/basic_types.h" -#include "synergy/Chunk.h" -#include "synergy/clipboard_types.h" +#include "deskflow/Chunk.h" +#include "deskflow/clipboard_types.h" #define CLIPBOARD_CHUNK_META_SIZE 7 -namespace synergy { +namespace deskflow { class IStream; }; @@ -39,10 +39,10 @@ public: static ClipboardChunk *end(ClipboardID id, UInt32 sequence); static int assemble( - synergy::IStream *stream, String &dataCached, ClipboardID &id, + deskflow::IStream *stream, String &dataCached, ClipboardID &id, UInt32 &sequence); - static void send(synergy::IStream *stream, void *data); + static void send(deskflow::IStream *stream, void *data); static size_t getExpectedSize() { return s_expectedSize; } diff --git a/src/lib/synergy/Config.cpp b/src/lib/deskflow/Config.cpp similarity index 96% rename from src/lib/synergy/Config.cpp rename to src/lib/deskflow/Config.cpp index 9538e697e..990499b30 100644 --- a/src/lib/synergy/Config.cpp +++ b/src/lib/deskflow/Config.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ #include #endif -namespace synergy { +namespace deskflow { Config::Config(const std::string &filename, const std::string §ion) : m_filename(filename), @@ -113,4 +113,4 @@ bool Config::load(const std::string &firstArg) { #endif // HAVE_TOMLPLUSPLUS } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/Config.h b/src/lib/deskflow/Config.h similarity index 94% rename from src/lib/synergy/Config.h rename to src/lib/deskflow/Config.h index 7c96504e2..e46501d69 100644 --- a/src/lib/synergy/Config.h +++ b/src/lib/deskflow/Config.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include #include -namespace synergy { +namespace deskflow { //! App configuration /*! @@ -57,4 +57,4 @@ private: std::vector m_argv; }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/DaemonApp.cpp b/src/lib/deskflow/DaemonApp.cpp similarity index 93% rename from src/lib/synergy/DaemonApp.cpp rename to src/lib/deskflow/DaemonApp.cpp index 055badabb..4c15bb913 100644 --- a/src/lib/synergy/DaemonApp.cpp +++ b/src/lib/deskflow/DaemonApp.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ // TODO: split this class into windows and unix to get rid // of all the #ifdefs! -#include "synergy/DaemonApp.h" +#include "deskflow/DaemonApp.h" #include "arch/XArch.h" #include "base/EventQueue.h" @@ -26,23 +26,23 @@ #include "base/TMethodEventJob.h" #include "base/log_outputters.h" #include "common/ipc.h" +#include "deskflow/App.h" +#include "deskflow/ArgParser.h" +#include "deskflow/ClientArgs.h" +#include "deskflow/ServerArgs.h" #include "ipc/IpcClientProxy.h" #include "ipc/IpcLogOutputter.h" #include "ipc/IpcMessage.h" #include "ipc/IpcSettingMessage.h" #include "net/SocketMultiplexer.h" -#include "synergy/App.h" -#include "synergy/ArgParser.h" -#include "synergy/ClientArgs.h" -#include "synergy/ServerArgs.h" #if SYSAPI_WIN32 #include "arch/win32/ArchMiscWindows.h" +#include "deskflow/Screen.h" #include "platform/MSWindowsDebugOutputter.h" #include "platform/MSWindowsEventQueueBuffer.h" #include "platform/MSWindowsWatchdog.h" -#include "synergy/Screen.h" #define WIN32_LEAN_AND_MEAN #include @@ -59,7 +59,7 @@ using namespace std; -const char *const kLogFilename = "synergyd.log"; +const char *const kLogFilename = "deskflowd.log"; namespace { void updateSetting(const IpcMessage &message) { @@ -76,8 +76,8 @@ bool isServerCommandLine(const std::vector &cmd) { if (cmd.size() > 1) { isServer = - (cmd[0].find("synergys") != String::npos) || - (cmd[0].find("synergy-core") != String::npos && cmd[1] == "server"); + (cmd[0].find("deskflows") != String::npos) || + (cmd[0].find("deskflow-core") != String::npos && cmd[1] == "server"); } return isServer; @@ -165,10 +165,10 @@ int DaemonApp::run(int argc, char **argv) { } else { #if SYSAPI_WIN32 LOG((CLOG_PRINT "daemonizing windows service")); - arch.daemonize("Synergy", winMainLoopStatic); + arch.daemonize("Deskflow", winMainLoopStatic); #elif SYSAPI_UNIX LOG((CLOG_PRINT "daemonizing unix service")); - arch.daemonize("Synergy", unixMainLoopStatic); + arch.daemonize("Deskflow", unixMainLoopStatic); #endif } @@ -264,7 +264,7 @@ void DaemonApp::mainLoop(bool logToFile, bool foreground) { void DaemonApp::foregroundError(const char *message) { #if SYSAPI_WIN32 - MessageBox(NULL, message, "Synergy Service", MB_OK | MB_ICONERROR); + MessageBox(NULL, message, "Deskflow Service", MB_OK | MB_ICONERROR); #elif SYSAPI_UNIX cerr << message << endl; #endif @@ -307,10 +307,10 @@ void DaemonApp::handleIpcMessage(const Event &e, void *) { int argc = static_cast(argsArray.size()); if (isServerCommandLine(argsArray)) { - auto serverArgs = new synergy::ServerArgs(); + auto serverArgs = new deskflow::ServerArgs(); argParser.parseServerArgs(*serverArgs, argc, argv); } else { - auto clientArgs = new synergy::ClientArgs(); + auto clientArgs = new deskflow::ClientArgs(); argParser.parseClientArgs(*clientArgs, argc, argv); } diff --git a/src/lib/synergy/DaemonApp.h b/src/lib/deskflow/DaemonApp.h similarity index 96% rename from src/lib/synergy/DaemonApp.h rename to src/lib/deskflow/DaemonApp.h index 0dd94a86a..3710290a7 100644 --- a/src/lib/synergy/DaemonApp.h +++ b/src/lib/deskflow/DaemonApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/synergy/DisplayInvalidException.h b/src/lib/deskflow/DisplayInvalidException.h similarity index 83% rename from src/lib/synergy/DisplayInvalidException.h rename to src/lib/deskflow/DisplayInvalidException.h index 084213528..8c7fc8def 100644 --- a/src/lib/synergy/DisplayInvalidException.h +++ b/src/lib/deskflow/DisplayInvalidException.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2018 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef SYNERGY_DISPLAYINVALIDEXCEPTION_H -#define SYNERGY_DISPLAYINVALIDEXCEPTION_H +#ifndef DESKFLOW_DISPLAYINVALIDEXCEPTION_H +#define DESKFLOW_DISPLAYINVALIDEXCEPTION_H #include #include @@ -28,4 +28,4 @@ public: DisplayInvalidException(std::string msg) : std::runtime_error(msg) {} }; -#endif // SYNERGY_DISPLAYINVALIDEXCEPTION_H +#endif // DESKFLOW_DISPLAYINVALIDEXCEPTION_H diff --git a/src/lib/synergy/DragInformation.cpp b/src/lib/deskflow/DragInformation.cpp similarity index 97% rename from src/lib/synergy/DragInformation.cpp rename to src/lib/deskflow/DragInformation.cpp index ed72bd146..0ab653846 100644 --- a/src/lib/synergy/DragInformation.cpp +++ b/src/lib/deskflow/DragInformation.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/DragInformation.h" +#include "deskflow/DragInformation.h" #include "base/Log.h" #include diff --git a/src/lib/synergy/DragInformation.h b/src/lib/deskflow/DragInformation.h similarity index 97% rename from src/lib/synergy/DragInformation.h rename to src/lib/deskflow/DragInformation.h index d25f98c70..bc33a2501 100644 --- a/src/lib/synergy/DragInformation.h +++ b/src/lib/deskflow/DragInformation.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/synergy/DropHelper.cpp b/src/lib/deskflow/DropHelper.cpp similarity index 95% rename from src/lib/synergy/DropHelper.cpp rename to src/lib/deskflow/DropHelper.cpp index 272851c90..a77db88fb 100644 --- a/src/lib/synergy/DropHelper.cpp +++ b/src/lib/deskflow/DropHelper.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/DropHelper.h" +#include "deskflow/DropHelper.h" #include "base/Log.h" diff --git a/src/lib/synergy/DropHelper.h b/src/lib/deskflow/DropHelper.h similarity index 90% rename from src/lib/synergy/DropHelper.h rename to src/lib/deskflow/DropHelper.h index d232f3f07..71961ddfc 100644 --- a/src/lib/synergy/DropHelper.h +++ b/src/lib/deskflow/DropHelper.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ #pragma once #include "base/String.h" -#include "synergy/DragInformation.h" +#include "deskflow/DragInformation.h" class DropHelper { public: diff --git a/src/lib/synergy/FileChunk.cpp b/src/lib/deskflow/FileChunk.cpp similarity index 91% rename from src/lib/synergy/FileChunk.cpp rename to src/lib/deskflow/FileChunk.cpp index f291bd64d..f7cd27959 100644 --- a/src/lib/synergy/FileChunk.cpp +++ b/src/lib/deskflow/FileChunk.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -#include "synergy/FileChunk.h" +#include "deskflow/FileChunk.h" #include "base/Log.h" #include "base/Stopwatch.h" +#include "deskflow/ProtocolUtil.h" +#include "deskflow/protocol_types.h" #include "io/IStream.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/protocol_types.h" static const UInt16 kIntervalThreshold = 1; @@ -60,7 +60,7 @@ FileChunk *FileChunk::end() { } int FileChunk::assemble( - synergy::IStream *stream, String &dataReceived, size_t &expectedSize) { + deskflow::IStream *stream, String &dataReceived, size_t &expectedSize) { // parse UInt8 mark = 0; String content; @@ -75,7 +75,7 @@ int FileChunk::assemble( switch (mark) { case kDataStart: dataReceived.clear(); - expectedSize = synergy::string::stringToSizeType(content); + expectedSize = deskflow::string::stringToSizeType(content); receivedDataSize = 0; elapsedTime = 0; stopwatch.reset(); @@ -133,7 +133,7 @@ int FileChunk::assemble( } void FileChunk::send( - synergy::IStream *stream, UInt8 mark, char *data, size_t dataSize) { + deskflow::IStream *stream, UInt8 mark, char *data, size_t dataSize) { String chunk(data, dataSize); switch (mark) { diff --git a/src/lib/synergy/FileChunk.h b/src/lib/deskflow/FileChunk.h similarity index 79% rename from src/lib/synergy/FileChunk.h rename to src/lib/deskflow/FileChunk.h index 95ad18d30..668221abc 100644 --- a/src/lib/synergy/FileChunk.h +++ b/src/lib/deskflow/FileChunk.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,11 +19,11 @@ #include "base/String.h" #include "common/basic_types.h" -#include "synergy/Chunk.h" +#include "deskflow/Chunk.h" #define FILE_CHUNK_META_SIZE 2 -namespace synergy { +namespace deskflow { class IStream; }; @@ -35,7 +35,7 @@ public: static FileChunk *data(UInt8 *data, size_t dataSize); static FileChunk *end(); static int - assemble(synergy::IStream *stream, String &dataCached, size_t &expectedSize); + assemble(deskflow::IStream *stream, String &dataCached, size_t &expectedSize); static void - send(synergy::IStream *stream, UInt8 mark, char *data, size_t dataSize); + send(deskflow::IStream *stream, UInt8 mark, char *data, size_t dataSize); }; diff --git a/src/lib/synergy/IApp.h b/src/lib/deskflow/IApp.h similarity index 88% rename from src/lib/synergy/IApp.h rename to src/lib/deskflow/IApp.h index 917df352f..6f63a8f9a 100644 --- a/src/lib/synergy/IApp.h +++ b/src/lib/deskflow/IApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -22,13 +22,13 @@ typedef int (*StartupFunc)(int, char **); -namespace synergy { +namespace deskflow { class ArgsBase; } class ILogOutputter; class IArchTaskBarReceiver; -namespace synergy { +namespace deskflow { class Screen; } class IEventQueue; @@ -36,7 +36,7 @@ class IEventQueue; class IApp : public IInterface { public: virtual void setByeFunc(void (*bye)(int)) = 0; - virtual synergy::ArgsBase &argsBase() const = 0; + virtual deskflow::ArgsBase &argsBase() const = 0; virtual int standardStartup(int argc, char **argv) = 0; virtual int runInner( int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) = 0; @@ -47,6 +47,6 @@ public: virtual void initApp(int argc, const char **argv) = 0; virtual const char *daemonName() const = 0; virtual int foregroundStartup(int argc, char **argv) = 0; - virtual synergy::Screen *createScreen() = 0; + virtual deskflow::Screen *createScreen() = 0; virtual IEventQueue *getEvents() const = 0; }; diff --git a/src/lib/synergy/IAppUtil.h b/src/lib/deskflow/IAppUtil.h similarity index 93% rename from src/lib/synergy/IAppUtil.h rename to src/lib/deskflow/IAppUtil.h index a4cbd4ed5..c607ecf9f 100644 --- a/src/lib/synergy/IAppUtil.h +++ b/src/lib/deskflow/IAppUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -20,7 +20,7 @@ #include "base/String.h" #include "common/IInterface.h" -#include "synergy/IApp.h" +#include "deskflow/IApp.h" class IAppUtil : public IInterface { public: diff --git a/src/lib/synergy/IClient.h b/src/lib/deskflow/IClient.h similarity index 96% rename from src/lib/synergy/IClient.h rename to src/lib/deskflow/IClient.h index 727ff195b..5b59f91f4 100644 --- a/src/lib/synergy/IClient.h +++ b/src/lib/deskflow/IClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,11 +19,11 @@ #pragma once #include "base/String.h" -#include "synergy/IScreen.h" -#include "synergy/clipboard_types.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/option_types.h" +#include "deskflow/IScreen.h" +#include "deskflow/clipboard_types.h" +#include "deskflow/key_types.h" +#include "deskflow/mouse_types.h" +#include "deskflow/option_types.h" //! Client interface /*! diff --git a/src/lib/synergy/IClipboard.cpp b/src/lib/deskflow/IClipboard.cpp similarity index 98% rename from src/lib/synergy/IClipboard.cpp rename to src/lib/deskflow/IClipboard.cpp index 62774ba94..54a61765f 100644 --- a/src/lib/synergy/IClipboard.cpp +++ b/src/lib/deskflow/IClipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/IClipboard.h" +#include "deskflow/IClipboard.h" #include "common/stdvector.h" // diff --git a/src/lib/synergy/IClipboard.h b/src/lib/deskflow/IClipboard.h similarity index 99% rename from src/lib/synergy/IClipboard.h rename to src/lib/deskflow/IClipboard.h index b4ecc2d7d..09442fe64 100644 --- a/src/lib/synergy/IClipboard.h +++ b/src/lib/deskflow/IClipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/IKeyState.cpp b/src/lib/deskflow/IKeyState.cpp similarity index 97% rename from src/lib/synergy/IKeyState.cpp rename to src/lib/deskflow/IKeyState.cpp index 415b9adcd..332e6610d 100644 --- a/src/lib/synergy/IKeyState.cpp +++ b/src/lib/deskflow/IKeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/IKeyState.h" +#include "deskflow/IKeyState.h" #include #include diff --git a/src/lib/synergy/IKeyState.h b/src/lib/deskflow/IKeyState.h similarity index 98% rename from src/lib/synergy/IKeyState.h rename to src/lib/deskflow/IKeyState.h index f1988cad6..f0f8e1bea 100644 --- a/src/lib/synergy/IKeyState.h +++ b/src/lib/deskflow/IKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -24,7 +24,7 @@ #include "base/String.h" #include "common/IInterface.h" #include "common/stdset.h" -#include "synergy/key_types.h" +#include "deskflow/key_types.h" //! Key state interface /*! diff --git a/src/lib/synergy/INode.h b/src/lib/deskflow/INode.h similarity index 93% rename from src/lib/synergy/INode.h rename to src/lib/deskflow/INode.h index 6334c50a0..8e667a3ed 100644 --- a/src/lib/synergy/INode.h +++ b/src/lib/deskflow/INode.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/IPlatformScreen.cpp b/src/lib/deskflow/IPlatformScreen.cpp similarity index 88% rename from src/lib/synergy/IPlatformScreen.cpp rename to src/lib/deskflow/IPlatformScreen.cpp index 24476effc..1776e8458 100644 --- a/src/lib/synergy/IPlatformScreen.cpp +++ b/src/lib/deskflow/IPlatformScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless. * * This package is free software; you can redistribute it and/or @@ -15,6 +15,6 @@ * along with this program. If not, see . */ -#include "synergy/IPlatformScreen.h" +#include "deskflow/IPlatformScreen.h" bool IPlatformScreen::fakeMediaKey(KeyID id) { return false; } diff --git a/src/lib/synergy/IPlatformScreen.h b/src/lib/deskflow/IPlatformScreen.h similarity index 96% rename from src/lib/synergy/IPlatformScreen.h rename to src/lib/deskflow/IPlatformScreen.h index a74016967..600f661cb 100644 --- a/src/lib/synergy/IPlatformScreen.h +++ b/src/lib/deskflow/IPlatformScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,13 +18,13 @@ #pragma once -#include "synergy/DragInformation.h" -#include "synergy/IKeyState.h" -#include "synergy/IPrimaryScreen.h" -#include "synergy/IScreen.h" -#include "synergy/ISecondaryScreen.h" -#include "synergy/clipboard_types.h" -#include "synergy/option_types.h" +#include "deskflow/DragInformation.h" +#include "deskflow/IKeyState.h" +#include "deskflow/IPrimaryScreen.h" +#include "deskflow/IScreen.h" +#include "deskflow/ISecondaryScreen.h" +#include "deskflow/clipboard_types.h" +#include "deskflow/option_types.h" class IClipboard; diff --git a/src/lib/synergy/IPrimaryScreen.cpp b/src/lib/deskflow/IPrimaryScreen.cpp similarity index 96% rename from src/lib/synergy/IPrimaryScreen.cpp rename to src/lib/deskflow/IPrimaryScreen.cpp index 41dd5cb14..ae6e3aa52 100644 --- a/src/lib/synergy/IPrimaryScreen.cpp +++ b/src/lib/deskflow/IPrimaryScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/IPrimaryScreen.h" +#include "deskflow/IPrimaryScreen.h" #include "base/EventQueue.h" #include diff --git a/src/lib/synergy/IPrimaryScreen.h b/src/lib/deskflow/IPrimaryScreen.h similarity index 97% rename from src/lib/synergy/IPrimaryScreen.h rename to src/lib/deskflow/IPrimaryScreen.h index f9bda9b7e..22f7d3ba6 100644 --- a/src/lib/synergy/IPrimaryScreen.h +++ b/src/lib/deskflow/IPrimaryScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -21,8 +21,8 @@ #include "base/Event.h" #include "base/EventTypes.h" #include "common/IInterface.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" +#include "deskflow/key_types.h" +#include "deskflow/mouse_types.h" //! Primary screen interface /*! diff --git a/src/lib/synergy/IScreen.h b/src/lib/deskflow/IScreen.h similarity index 95% rename from src/lib/synergy/IScreen.h rename to src/lib/deskflow/IScreen.h index a4b10aa2b..5a1df2038 100644 --- a/src/lib/synergy/IScreen.h +++ b/src/lib/deskflow/IScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -21,7 +21,7 @@ #include "base/Event.h" #include "base/EventTypes.h" #include "common/IInterface.h" -#include "synergy/clipboard_types.h" +#include "deskflow/clipboard_types.h" class IClipboard; diff --git a/src/lib/synergy/IScreenSaver.h b/src/lib/deskflow/IScreenSaver.h similarity index 97% rename from src/lib/synergy/IScreenSaver.h rename to src/lib/deskflow/IScreenSaver.h index b009c78a2..d1d01a56c 100644 --- a/src/lib/synergy/IScreenSaver.h +++ b/src/lib/deskflow/IScreenSaver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/ISecondaryScreen.h b/src/lib/deskflow/ISecondaryScreen.h similarity index 95% rename from src/lib/synergy/ISecondaryScreen.h rename to src/lib/deskflow/ISecondaryScreen.h index 67f4e6c9a..dd70bc2ab 100644 --- a/src/lib/synergy/ISecondaryScreen.h +++ b/src/lib/deskflow/ISecondaryScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -21,7 +21,7 @@ #include "base/Event.h" #include "base/EventTypes.h" #include "common/IInterface.h" -#include "synergy/mouse_types.h" +#include "deskflow/mouse_types.h" //! Secondary screen interface /*! diff --git a/src/lib/synergy/KeyMap.cpp b/src/lib/deskflow/KeyMap.cpp similarity index 99% rename from src/lib/synergy/KeyMap.cpp rename to src/lib/deskflow/KeyMap.cpp index 8113b82ec..e60f234db 100644 --- a/src/lib/synergy/KeyMap.cpp +++ b/src/lib/deskflow/KeyMap.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2005 Chris Schoeneman * @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -#include "synergy/KeyMap.h" +#include "deskflow/KeyMap.h" #include "base/Log.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" -#include "synergy/key_types.h" +#include "deskflow/App.h" +#include "deskflow/ArgsBase.h" +#include "deskflow/key_types.h" #include #include #include -namespace synergy { +namespace deskflow { KeyMap::NameToKeyMap *KeyMap::s_nameToKeyMap = NULL; KeyMap::NameToModifierMap *KeyMap::s_nameToModifierMap = NULL; @@ -1106,7 +1106,7 @@ String KeyMap::formatKey(KeyID key, KeyModifierMask mask) { else if (key >= 33 && key < 127) { x += (char)key; } else { - x += synergy::string::sprintf("\\u%04x", key); + x += deskflow::string::sprintf("\\u%04x", key); } } else if (!x.empty()) { // remove trailing '+' @@ -1253,4 +1253,4 @@ KeyMap::Keystroke::Keystroke(SInt32 group, bool absolute, bool restore) m_data.m_group.m_restore = restore; } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/KeyMap.h b/src/lib/deskflow/KeyMap.h similarity index 98% rename from src/lib/synergy/KeyMap.h rename to src/lib/deskflow/KeyMap.h index b0e5b0b99..eddf77c53 100644 --- a/src/lib/synergy/KeyMap.h +++ b/src/lib/deskflow/KeyMap.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2005 Chris Schoeneman * @@ -22,13 +22,13 @@ #include "common/stdmap.h" #include "common/stdset.h" #include "common/stdvector.h" -#include "synergy/key_types.h" +#include "deskflow/key_types.h" #ifdef TEST_ENV #include "gtest/gtest_prod.h" #endif -namespace synergy { +namespace deskflow { //! Key map /*! @@ -474,8 +474,8 @@ private: typedef std::set KeyButtonSet; // Key maps for parsing/formatting - typedef std::map NameToKeyMap; - typedef std::map + typedef std::map NameToKeyMap; + typedef std::map NameToModifierMap; typedef std::map KeyToNameMap; typedef std::map ModifierToNameMap; @@ -489,7 +489,7 @@ private: bool m_composeAcrossGroups; // half-duplex info - KeyButtonSet m_halfDuplex; // half-duplex set by synergy + KeyButtonSet m_halfDuplex; // half-duplex set by deskflow KeySet m_halfDuplexMods; // half-duplex set by user // dummy KeyItem for changing modifiers @@ -505,4 +505,4 @@ private: static ModifierToNameMap *s_modifierToNameMap; }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/KeyState.cpp b/src/lib/deskflow/KeyState.cpp similarity index 97% rename from src/lib/synergy/KeyState.cpp rename to src/lib/deskflow/KeyState.cpp index 8232ed5b8..3e159cb75 100644 --- a/src/lib/synergy/KeyState.cpp +++ b/src/lib/deskflow/KeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -#include "synergy/KeyState.h" +#include "deskflow/KeyState.h" #include "base/Log.h" -#include "synergy/ClientApp.h" -#include "synergy/ClientArgs.h" +#include "deskflow/ClientApp.h" +#include "deskflow/ClientArgs.h" #include #include @@ -663,7 +663,7 @@ static const KeyID s_numpadTable[] = { KeyState::KeyState( IEventQueue *events, std::vector layouts, bool isLangSyncEnabled) : IKeyState(events), - m_keyMapPtr(new synergy::KeyMap()), + m_keyMapPtr(new deskflow::KeyMap()), m_keyMap(*m_keyMapPtr), m_mask(0), m_events(events), @@ -673,7 +673,7 @@ KeyState::KeyState( } KeyState::KeyState( - IEventQueue *events, synergy::KeyMap &keyMap, std::vector layouts, + IEventQueue *events, deskflow::KeyMap &keyMap, std::vector layouts, bool isLangSyncEnabled) : IKeyState(events), m_keyMapPtr(0), @@ -749,12 +749,12 @@ void KeyState::sendKeyEvent( } } -void KeyState::updateKeyMap(synergy::KeyMap *existing) { +void KeyState::updateKeyMap(deskflow::KeyMap *existing) { if (existing) { m_keyMap.swap(*existing); } else { // get the current keyboard map - synergy::KeyMap keyMap; + deskflow::KeyMap keyMap; getKeyMap(keyMap); m_keyMap.swap(keyMap); m_keyMap.finish(); @@ -794,7 +794,7 @@ void KeyState::updateKeyState() { } void KeyState::addActiveModifierCB( - KeyID, SInt32 group, synergy::KeyMap::KeyItem &keyItem, void *vcontext) { + KeyID, SInt32 group, deskflow::KeyMap::KeyItem &keyItem, void *vcontext) { AddActiveModifierContext *context = static_cast(vcontext); if (group == context->m_activeGroup && @@ -835,7 +835,7 @@ void KeyState::fakeKeyDown( Keystrokes keys; ModifierToKeys oldActiveModifiers = m_activeModifiers; - const synergy::KeyMap::KeyItem *keyItem = m_keyMap.mapKey( + const deskflow::KeyMap::KeyItem *keyItem = m_keyMap.mapKey( keys, id, pollActiveGroup(), m_activeModifiers, getActiveModifiersRValue(), mask, false, lang); @@ -881,7 +881,7 @@ bool KeyState::fakeKeyRepeat( // get keys for key repeat Keystrokes keys; ModifierToKeys oldActiveModifiers = m_activeModifiers; - const synergy::KeyMap::KeyItem *keyItem = m_keyMap.mapKey( + const deskflow::KeyMap::KeyItem *keyItem = m_keyMap.mapKey( keys, id, pollActiveGroup(), m_activeModifiers, getActiveModifiersRValue(), mask, true, lang); if (keyItem == NULL) { @@ -1011,7 +1011,7 @@ bool KeyState::isIgnoredKey(KeyID key, KeyModifierMask) const { } KeyButton KeyState::getButton(KeyID id, SInt32 group) const { - const synergy::KeyMap::KeyItemList *items = + const deskflow::KeyMap::KeyItemList *items = m_keyMap.findCompatibleKey(id, group, 0, 0); if (items == NULL) { return 0; @@ -1117,7 +1117,7 @@ void KeyState::updateModifierKeyState( KeyButton button, const ModifierToKeys &oldModifiers, const ModifierToKeys &newModifiers) { // get the pressed modifier buttons before and after - synergy::KeyMap::ButtonToKeyMap oldKeys, newKeys; + deskflow::KeyMap::ButtonToKeyMap oldKeys, newKeys; for (ModifierToKeys::const_iterator i = oldModifiers.begin(); i != oldModifiers.end(); ++i) { oldKeys.insert(std::make_pair(i->second.m_button, &i->second)); @@ -1128,7 +1128,7 @@ void KeyState::updateModifierKeyState( } // get the modifier buttons that were pressed or released - synergy::KeyMap::ButtonToKeyMap pressed, released; + deskflow::KeyMap::ButtonToKeyMap pressed, released; std::set_difference( oldKeys.begin(), oldKeys.end(), newKeys.begin(), newKeys.end(), std::inserter(released, released.end()), ButtonToKeyLess()); @@ -1137,14 +1137,14 @@ void KeyState::updateModifierKeyState( std::inserter(pressed, pressed.end()), ButtonToKeyLess()); // update state - for (synergy::KeyMap::ButtonToKeyMap::const_iterator i = released.begin(); + for (deskflow::KeyMap::ButtonToKeyMap::const_iterator i = released.begin(); i != released.end(); ++i) { if (i->first != button) { m_keys[i->first] = 0; m_syntheticKeys[i->first] = 0; } } - for (synergy::KeyMap::ButtonToKeyMap::const_iterator i = pressed.begin(); + for (deskflow::KeyMap::ButtonToKeyMap::const_iterator i = pressed.begin(); i != pressed.end(); ++i) { if (i->first != button) { m_keys[i->first] = 1; diff --git a/src/lib/synergy/KeyState.h b/src/lib/deskflow/KeyState.h similarity index 89% rename from src/lib/synergy/KeyState.h rename to src/lib/deskflow/KeyState.h index ca1f759cb..db80fff3b 100644 --- a/src/lib/synergy/KeyState.h +++ b/src/lib/deskflow/KeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,8 +18,8 @@ #pragma once -#include "synergy/IKeyState.h" -#include "synergy/KeyMap.h" +#include "deskflow/IKeyState.h" +#include "deskflow/KeyMap.h" //! Core key state /*! @@ -31,8 +31,8 @@ public: KeyState( IEventQueue *events, std::vector layouts, bool isLangSyncEnabled); KeyState( - IEventQueue *events, synergy::KeyMap &keyMap, std::vector layouts, - bool isLangSyncEnabled); + IEventQueue *events, deskflow::KeyMap &keyMap, + std::vector layouts, bool isLangSyncEnabled); virtual ~KeyState(); //! @name manipulators @@ -63,7 +63,7 @@ public: //@} - void updateKeyMap(synergy::KeyMap *existing); + void updateKeyMap(deskflow::KeyMap *existing); // IKeyState overrides void updateKeyMap() override { this->updateKeyMap(nullptr); } void updateKeyState() override; @@ -89,7 +89,7 @@ public: SInt32 getKeyState(KeyButton keyButton) { return m_keys[keyButton]; } protected: - typedef synergy::KeyMap::Keystroke Keystroke; + typedef deskflow::KeyMap::Keystroke Keystroke; //! @name protected manipulators //@{ @@ -98,7 +98,7 @@ protected: /*! Fills \p keyMap with the current keyboard map. */ - virtual void getKeyMap(synergy::KeyMap &keyMap) = 0; + virtual void getKeyMap(deskflow::KeyMap &keyMap) = 0; //! Fake a key event /*! @@ -140,8 +140,8 @@ protected: //@} private: - typedef synergy::KeyMap::Keystrokes Keystrokes; - typedef synergy::KeyMap::ModifierToKeys ModifierToKeys; + typedef deskflow::KeyMap::Keystrokes Keystrokes; + typedef deskflow::KeyMap::ModifierToKeys ModifierToKeys; public: struct AddActiveModifierContext { @@ -164,8 +164,8 @@ private: class ButtonToKeyLess { public: bool operator()( - const synergy::KeyMap::ButtonToKeyMap::value_type &a, - const synergy::KeyMap::ButtonToKeyMap::value_type b) const { + const deskflow::KeyMap::ButtonToKeyMap::value_type &a, + const deskflow::KeyMap::ButtonToKeyMap::value_type b) const { return (a.first < b.first); } }; @@ -198,15 +198,15 @@ private: // active modifiers collection callback static void addActiveModifierCB( - KeyID id, SInt32 group, synergy::KeyMap::KeyItem &keyItem, + KeyID id, SInt32 group, deskflow::KeyMap::KeyItem &keyItem, void *vcontext); private: // must be declared before m_keyMap. used when this class owns the key map. - synergy::KeyMap *m_keyMapPtr; + deskflow::KeyMap *m_keyMapPtr; // the keyboard map - synergy::KeyMap &m_keyMap; + deskflow::KeyMap &m_keyMap; // current modifier state KeyModifierMask m_mask; diff --git a/src/lib/synergy/PacketStreamFilter.cpp b/src/lib/deskflow/PacketStreamFilter.cpp similarity index 96% rename from src/lib/synergy/PacketStreamFilter.cpp rename to src/lib/deskflow/PacketStreamFilter.cpp index 73909cee1..5effb78af 100644 --- a/src/lib/synergy/PacketStreamFilter.cpp +++ b/src/lib/deskflow/PacketStreamFilter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/PacketStreamFilter.h" +#include "deskflow/PacketStreamFilter.h" #include "base/IEventQueue.h" #include "base/TMethodEventJob.h" #include "mt/Lock.h" @@ -29,7 +29,7 @@ // PacketStreamFilter::PacketStreamFilter( - IEventQueue *events, synergy::IStream *stream, bool adoptStream) + IEventQueue *events, deskflow::IStream *stream, bool adoptStream) : StreamFilter(events, stream, adoptStream), m_size(0), m_inputShutdown(false), diff --git a/src/lib/synergy/PacketStreamFilter.h b/src/lib/deskflow/PacketStreamFilter.h similarity index 92% rename from src/lib/synergy/PacketStreamFilter.h rename to src/lib/deskflow/PacketStreamFilter.h index bf307e83a..7df5a47b9 100644 --- a/src/lib/synergy/PacketStreamFilter.h +++ b/src/lib/deskflow/PacketStreamFilter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -31,7 +31,7 @@ Filters a stream to read and write packets. class PacketStreamFilter : public StreamFilter { public: PacketStreamFilter( - IEventQueue *events, synergy::IStream *stream, bool adoptStream = true); + IEventQueue *events, deskflow::IStream *stream, bool adoptStream = true); ~PacketStreamFilter(); // IStream overrides diff --git a/src/lib/synergy/PlatformScreen.cpp b/src/lib/deskflow/PlatformScreen.cpp similarity index 92% rename from src/lib/synergy/PlatformScreen.cpp rename to src/lib/deskflow/PlatformScreen.cpp index 804bfd535..536aa1524 100644 --- a/src/lib/synergy/PlatformScreen.cpp +++ b/src/lib/deskflow/PlatformScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -#include "synergy/PlatformScreen.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" +#include "deskflow/PlatformScreen.h" +#include "deskflow/App.h" +#include "deskflow/ArgsBase.h" PlatformScreen::PlatformScreen( - IEventQueue *events, synergy::ClientScrollDirection scrollDirection) + IEventQueue *events, deskflow::ClientScrollDirection scrollDirection) : IPlatformScreen(events), m_draggingStarted(false), m_fakeDraggingStarted(false), diff --git a/src/lib/synergy/PlatformScreen.h b/src/lib/deskflow/PlatformScreen.h similarity index 89% rename from src/lib/synergy/PlatformScreen.h rename to src/lib/deskflow/PlatformScreen.h index 60be8a2dc..9f21ed34c 100644 --- a/src/lib/synergy/PlatformScreen.h +++ b/src/lib/deskflow/PlatformScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -19,9 +19,9 @@ #pragma once #include "common/stdexcept.h" -#include "synergy/ClientArgs.h" -#include "synergy/DragInformation.h" -#include "synergy/IPlatformScreen.h" +#include "deskflow/ClientArgs.h" +#include "deskflow/DragInformation.h" +#include "deskflow/IPlatformScreen.h" //! Base screen implementation /*! @@ -32,8 +32,8 @@ subclasses to implement the rest. class PlatformScreen : public IPlatformScreen { public: PlatformScreen( - IEventQueue *events, synergy::ClientScrollDirection scrollDirection = - synergy::ClientScrollDirection::SERVER); + IEventQueue *events, deskflow::ClientScrollDirection scrollDirection = + deskflow::ClientScrollDirection::SERVER); virtual ~PlatformScreen(); // IScreen overrides @@ -142,6 +142,6 @@ private: * This member contains client scroll direction. * This member is used only on client side. */ - synergy::ClientScrollDirection m_clientScrollDirection = - synergy::ClientScrollDirection::SERVER; + deskflow::ClientScrollDirection m_clientScrollDirection = + deskflow::ClientScrollDirection::SERVER; }; diff --git a/src/lib/synergy/ProtocolUtil.cpp b/src/lib/deskflow/ProtocolUtil.cpp similarity index 93% rename from src/lib/synergy/ProtocolUtil.cpp rename to src/lib/deskflow/ProtocolUtil.cpp index 2147a391a..fabd088cd 100644 --- a/src/lib/synergy/ProtocolUtil.cpp +++ b/src/lib/deskflow/ProtocolUtil.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ProtocolUtil.h" +#include "deskflow/ProtocolUtil.h" #include "base/Log.h" #include "common/stdvector.h" #include "io/IStream.h" @@ -76,7 +76,7 @@ void writeString(const String *StringData, std::vector &Buffer) { } // namespace -void ProtocolUtil::writef(synergy::IStream *stream, const char *fmt, ...) { +void ProtocolUtil::writef(deskflow::IStream *stream, const char *fmt, ...) { assert(stream != NULL); assert(fmt != NULL); LOG((CLOG_DEBUG2 "writef(%s)", fmt)); @@ -90,7 +90,7 @@ void ProtocolUtil::writef(synergy::IStream *stream, const char *fmt, ...) { va_end(args); } -bool ProtocolUtil::readf(synergy::IStream *stream, const char *fmt, ...) { +bool ProtocolUtil::readf(deskflow::IStream *stream, const char *fmt, ...) { bool result = false; if (stream && fmt) { @@ -112,7 +112,7 @@ bool ProtocolUtil::readf(synergy::IStream *stream, const char *fmt, ...) { } void ProtocolUtil::vwritef( - synergy::IStream *stream, const char *fmt, UInt32 size, va_list args) { + deskflow::IStream *stream, const char *fmt, UInt32 size, va_list args) { assert(stream != NULL); assert(fmt != NULL); @@ -138,7 +138,7 @@ void ProtocolUtil::vwritef( } void ProtocolUtil::vreadf( - synergy::IStream *stream, const char *fmt, va_list args) { + deskflow::IStream *stream, const char *fmt, va_list args) { assert(stream != NULL); assert(fmt != NULL); @@ -426,7 +426,8 @@ UInt32 ProtocolUtil::eatLength(const char **pfmt) { } } -void ProtocolUtil::read(synergy::IStream *stream, void *vbuffer, UInt32 count) { +void ProtocolUtil::read( + deskflow::IStream *stream, void *vbuffer, UInt32 count) { assert(stream != NULL); assert(vbuffer != NULL); @@ -449,7 +450,7 @@ void ProtocolUtil::read(synergy::IStream *stream, void *vbuffer, UInt32 count) { } } -UInt8 ProtocolUtil::read1ByteInt(synergy::IStream *stream) { +UInt8 ProtocolUtil::read1ByteInt(deskflow::IStream *stream) { const UInt32 BufferSize = 1; std::array buffer = {}; read(stream, buffer.data(), BufferSize); @@ -460,7 +461,7 @@ UInt8 ProtocolUtil::read1ByteInt(synergy::IStream *stream) { return Result; } -UInt16 ProtocolUtil::read2BytesInt(synergy::IStream *stream) { +UInt16 ProtocolUtil::read2BytesInt(deskflow::IStream *stream) { const UInt32 BufferSize = 2; std::array buffer = {}; read(stream, buffer.data(), BufferSize); @@ -472,7 +473,7 @@ UInt16 ProtocolUtil::read2BytesInt(synergy::IStream *stream) { return Result; } -UInt32 ProtocolUtil::read4BytesInt(synergy::IStream *stream) { +UInt32 ProtocolUtil::read4BytesInt(deskflow::IStream *stream) { const int BufferSize = 4; std::array buffer = {}; read(stream, buffer.data(), BufferSize); @@ -488,7 +489,7 @@ UInt32 ProtocolUtil::read4BytesInt(synergy::IStream *stream) { } void ProtocolUtil::readVector1ByteInt( - synergy::IStream *stream, std::vector &destination) { + deskflow::IStream *stream, std::vector &destination) { UInt32 size = read4BytesInt(stream); for (UInt32 i = 0; i < size; ++i) { destination.push_back(read1ByteInt(stream)); @@ -496,7 +497,7 @@ void ProtocolUtil::readVector1ByteInt( } void ProtocolUtil::readVector2BytesInt( - synergy::IStream *stream, std::vector &destination) { + deskflow::IStream *stream, std::vector &destination) { UInt32 size = read4BytesInt(stream); for (UInt32 i = 0; i < size; ++i) { destination.push_back(read2BytesInt(stream)); @@ -504,7 +505,7 @@ void ProtocolUtil::readVector2BytesInt( } void ProtocolUtil::readVector4BytesInt( - synergy::IStream *stream, std::vector &destination) { + deskflow::IStream *stream, std::vector &destination) { UInt32 size = read4BytesInt(stream); for (UInt32 i = 0; i < size; ++i) { destination.push_back(read4BytesInt(stream)); @@ -512,7 +513,7 @@ void ProtocolUtil::readVector4BytesInt( } void ProtocolUtil::readBytes( - synergy::IStream *stream, UInt32 len, String *destination) { + deskflow::IStream *stream, UInt32 len, String *destination) { assert(len == 0); // read the string length diff --git a/src/lib/synergy/ProtocolUtil.h b/src/lib/deskflow/ProtocolUtil.h similarity index 75% rename from src/lib/synergy/ProtocolUtil.h rename to src/lib/deskflow/ProtocolUtil.h index d81dbc3a0..3309eb52a 100644 --- a/src/lib/synergy/ProtocolUtil.h +++ b/src/lib/deskflow/ProtocolUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,13 +23,13 @@ #include -namespace synergy { +namespace deskflow { class IStream; } -//! Synergy protocol utilities +//! Deskflow protocol utilities /*! -This class provides various functions for implementing the synergy +This class provides various functions for implementing the deskflow protocol. */ class ProtocolUtil { @@ -52,7 +52,7 @@ public: - \%s -- converts String* to stream of bytes - \%S -- converts integer N and const UInt8* to stream of N bytes */ - static void writef(synergy::IStream *, const char *fmt, ...); + static void writef(deskflow::IStream *, const char *fmt, ...); //! Read formatted data /*! @@ -70,36 +70,36 @@ public: - \%4I -- reads NBO 4 byte integers; arg is std::vector* - \%s -- reads bytes; argument must be a String*, \b not a char* */ - static bool readf(synergy::IStream *, const char *fmt, ...); + static bool readf(deskflow::IStream *, const char *fmt, ...); private: static void - vwritef(synergy::IStream *, const char *fmt, UInt32 size, va_list); - static void vreadf(synergy::IStream *, const char *fmt, va_list); + vwritef(deskflow::IStream *, const char *fmt, UInt32 size, va_list); + static void vreadf(deskflow::IStream *, const char *fmt, va_list); static UInt32 getLength(const char *fmt, va_list); static void writef(std::vector &, const char *fmt, va_list); static UInt32 eatLength(const char **fmt); - static void read(synergy::IStream *, void *, UInt32); + static void read(deskflow::IStream *, void *, UInt32); /** * @brief Handles 1,2, or 4 byte Integers */ - static UInt8 read1ByteInt(synergy::IStream *stream); - static UInt16 read2BytesInt(synergy::IStream *stream); - static UInt32 read4BytesInt(synergy::IStream *stream); + static UInt8 read1ByteInt(deskflow::IStream *stream); + static UInt16 read2BytesInt(deskflow::IStream *stream); + static UInt32 read4BytesInt(deskflow::IStream *stream); /** * @brief Handles a Vector of integers */ - static void readVector1ByteInt(synergy::IStream *, std::vector &); - static void readVector2BytesInt(synergy::IStream *, std::vector &); - static void readVector4BytesInt(synergy::IStream *, std::vector &); + static void readVector1ByteInt(deskflow::IStream *, std::vector &); + static void readVector2BytesInt(deskflow::IStream *, std::vector &); + static void readVector4BytesInt(deskflow::IStream *, std::vector &); /** * @brief Handles an array of bytes */ - static void readBytes(synergy::IStream *, UInt32, String *); + static void readBytes(deskflow::IStream *, UInt32, String *); }; //! Mismatched read exception diff --git a/src/lib/synergy/Screen.cpp b/src/lib/deskflow/Screen.cpp similarity index 98% rename from src/lib/synergy/Screen.cpp rename to src/lib/deskflow/Screen.cpp index 55c0fef14..f8e6b104e 100644 --- a/src/lib/synergy/Screen.cpp +++ b/src/lib/deskflow/Screen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#include "synergy/Screen.h" +#include "deskflow/Screen.h" #include "base/IEventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/IPlatformScreen.h" +#include "deskflow/protocol_types.h" #include "server/ClientProxy.h" -#include "synergy/IPlatformScreen.h" -#include "synergy/protocol_types.h" -namespace synergy { +namespace deskflow { // // Screen @@ -427,4 +427,4 @@ String Screen::getSecureInputApp() const { return m_screen->getSecureInputApp(); } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/Screen.h b/src/lib/deskflow/Screen.h similarity index 96% rename from src/lib/synergy/Screen.h rename to src/lib/deskflow/Screen.h index 7c29c94eb..e9d7c5a40 100644 --- a/src/lib/synergy/Screen.h +++ b/src/lib/deskflow/Screen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,18 +19,18 @@ #pragma once #include "base/String.h" -#include "synergy/DragInformation.h" -#include "synergy/IScreen.h" -#include "synergy/clipboard_types.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/option_types.h" +#include "deskflow/DragInformation.h" +#include "deskflow/IScreen.h" +#include "deskflow/clipboard_types.h" +#include "deskflow/key_types.h" +#include "deskflow/mouse_types.h" +#include "deskflow/option_types.h" class IClipboard; class IPlatformScreen; class IEventQueue; -namespace synergy { +namespace deskflow { //! Platform independent screen /*! @@ -352,4 +352,4 @@ private: bool m_enableDragDrop; }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp similarity index 92% rename from src/lib/synergy/ServerApp.cpp rename to src/lib/deskflow/ServerApp.cpp index 512c964c9..c189636a0 100644 --- a/src/lib/synergy/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,13 +16,19 @@ * along with this program. If not, see . */ -#include "synergy/ServerApp.h" +#include "deskflow/ServerApp.h" #include "arch/Arch.h" #include "base/IEventQueue.h" #include "base/Log.h" #include "base/Path.h" #include "base/TMethodEventJob.h" +#include "deskflow/App.h" +#include "deskflow/ArgParser.h" +#include "deskflow/Screen.h" +#include "deskflow/ServerArgs.h" +#include "deskflow/ServerTaskBarReceiver.h" +#include "deskflow/XScreen.h" #include "net/InverseSockets/InverseSocketFactory.h" #include "net/SocketMultiplexer.h" #include "net/TCPSocketFactory.h" @@ -32,12 +38,6 @@ #include "server/Config.h" #include "server/PrimaryClient.h" #include "server/Server.h" -#include "synergy/App.h" -#include "synergy/ArgParser.h" -#include "synergy/Screen.h" -#include "synergy/ServerArgs.h" -#include "synergy/ServerTaskBarReceiver.h" -#include "synergy/XScreen.h" #if SYSAPI_WIN32 #include "arch/win32/ArchMiscWindows.h" @@ -74,7 +74,7 @@ #include #include -using namespace synergy::server; +using namespace deskflow::server; // // ServerApp @@ -82,14 +82,14 @@ using namespace synergy::server; ServerApp::ServerApp( IEventQueue *events, CreateTaskBarReceiverFunc createTaskBarReceiver) - : App(events, createTaskBarReceiver, new synergy::ServerArgs()), + : App(events, createTaskBarReceiver, new deskflow::ServerArgs()), m_server(NULL), m_serverState(kUninitialized), m_serverScreen(NULL), m_primaryClient(NULL), m_listener(NULL), m_timer(NULL), - m_synergyAddress(NULL) {} + m_deskflowAddress(NULL) {} ServerApp::~ServerApp() {} @@ -105,11 +105,11 @@ void ServerApp::parseArgs(int argc, const char *const *argv) { m_bye(kExitArgs); } } else { - if (!args().m_synergyAddress.empty()) { + if (!args().m_deskflowAddress.empty()) { try { - *m_synergyAddress = - NetworkAddress(args().m_synergyAddress, kDefaultPort); - m_synergyAddress->resolve(); + *m_deskflowAddress = + NetworkAddress(args().m_deskflowAddress, kDefaultPort); + m_deskflowAddress->resolve(); } catch (XSocketAddress &e) { LOG((CLOG_CRIT "%s: %s" BYE, args().m_pname, e.what(), args().m_pname)); m_bye(kExitArgs); @@ -140,7 +140,7 @@ void ServerApp::help() { #endif << HELP_SYS_ARGS HELP_COMMON_ARGS "\n\n" - << "Start the synergy mouse/keyboard sharing server.\n" + << "Start the deskflow mouse/keyboard sharing server.\n" << "\n" << " -a, --address
listen for clients on the given address.\n" << " -c, --config use the named configuration file " @@ -238,7 +238,7 @@ bool ServerApp::loadConfig(const String &pathname) { try { // load configuration LOG((CLOG_DEBUG "opening configuration \"%s\"", pathname.c_str())); - std::ifstream configStream(synergy::filesystem::path(pathname)); + std::ifstream configStream(deskflow::filesystem::path(pathname)); if (!configStream.is_open()) { // report failure to open configuration as a debug message // since we try several paths and we expect some to be @@ -349,7 +349,7 @@ void ServerApp::closePrimaryClient(PrimaryClient *primaryClient) { delete primaryClient; } -void ServerApp::closeServerScreen(synergy::Screen *screen) { +void ServerApp::closeServerScreen(deskflow::Screen *screen) { if (screen != NULL) { m_events->removeHandler( m_events->forIScreen().error(), screen->getEventTarget()); @@ -430,7 +430,7 @@ bool ServerApp::initServer() { } double retryTime; - synergy::Screen *serverScreen = NULL; + deskflow::Screen *serverScreen = NULL; PrimaryClient *primaryClient = NULL; try { String name = args().m_config->getCanonicalName(args().m_name); @@ -475,8 +475,8 @@ bool ServerApp::initServer() { } } -synergy::Screen *ServerApp::openServerScreen() { - synergy::Screen *screen = createScreen(); +deskflow::Screen *ServerApp::openServerScreen() { + deskflow::Screen *screen = createScreen(); screen->setEnableDragDrop(argsBase().m_enableDragDrop); m_events->adoptHandler( m_events->forIScreen().error(), screen->getEventTarget(), @@ -512,7 +512,7 @@ bool ServerApp::startServer() { ClientListener *listener = NULL; try { - listener = openClientListener(args().m_config->getSynergyAddress()); + listener = openClientListener(args().m_config->getDeskflowAddress()); m_server = openServer(*args().m_config, m_primaryClient); listener->setServer(m_server); m_server->setListener(listener); @@ -552,20 +552,20 @@ bool ServerApp::startServer() { } } -synergy::Screen *ServerApp::createScreen() { +deskflow::Screen *ServerApp::createScreen() { #if WINAPI_MSWINDOWS - return new synergy::Screen( + return new deskflow::Screen( new MSWindowsScreen( true, args().m_noHooks, args().m_stopOnDeskSwitch, m_events), m_events); #endif #if defined(WINAPI_XWINDOWS) or defined(WINAPI_LIBEI) - if (synergy::platform::isWayland()) { + if (deskflow::platform::isWayland()) { #if WINAPI_LIBEI LOG((CLOG_INFO "using ei screen for wayland")); - return new synergy::Screen( - new synergy::EiScreen(true, m_events, true), m_events); + return new deskflow::Screen( + new deskflow::EiScreen(true, m_events, true), m_events); #else throw XNoEiSupport(); #endif @@ -574,17 +574,17 @@ synergy::Screen *ServerApp::createScreen() { #if WINAPI_XWINDOWS LOG((CLOG_INFO "using legacy x windows screen")); - return new synergy::Screen( + return new deskflow::Screen( new XWindowsScreen( args().m_display, true, args().m_disableXInitThreads, 0, m_events), m_events); #elif WINAPI_CARBON - return new synergy::Screen(new OSXScreen(m_events, true), m_events); + return new deskflow::Screen(new OSXScreen(m_events, true), m_events); #endif } PrimaryClient * -ServerApp::openPrimaryClient(const String &name, synergy::Screen *screen) { +ServerApp::openPrimaryClient(const String &name, deskflow::Screen *screen) { LOG((CLOG_DEBUG1 "creating primary screen")); return new PrimaryClient(name, screen); } @@ -685,10 +685,10 @@ int ServerApp::mainLoop() { // set the contact address, if provided, in the config. // otherwise, if the config doesn't have an address, use // the default. - if (m_synergyAddress->isValid()) { - args().m_config->setSynergyAddress(*m_synergyAddress); - } else if (!args().m_config->getSynergyAddress().isValid()) { - args().m_config->setSynergyAddress(NetworkAddress(kDefaultPort)); + if (m_deskflowAddress->isValid()) { + args().m_config->setDeskflowAddress(*m_deskflowAddress); + } else if (!args().m_config->getDeskflowAddress().isValid()) { + args().m_config->setDeskflowAddress(NetworkAddress(kDefaultPort)); } // canonicalize the primary screen name @@ -720,7 +720,7 @@ int ServerApp::mainLoop() { new TMethodEventJob(this, &ServerApp::forceReconnect)); // to work around the sticky meta keys problem, we'll give users - // the option to reset the state of synergys + // the option to reset the state of deskflows m_events->adoptHandler( m_events->forServerApp().resetServer(), m_events->getSystemTarget(), new TMethodEventJob(this, &ServerApp::resetServer)); @@ -774,7 +774,7 @@ void ServerApp::resetServer(const Event &, void *) { int ServerApp::runInner( int argc, char **argv, ILogOutputter *outputter, StartupFunc startup) { // general initialization - m_synergyAddress = new NetworkAddress; + m_deskflowAddress = new NetworkAddress; args().m_config = std::make_shared(m_events); args().m_pname = ARCH->getBasename(argv[0]); @@ -791,7 +791,7 @@ int ServerApp::runInner( delete m_taskBarReceiver; } - delete m_synergyAddress; + delete m_deskflowAddress; return result; } @@ -819,9 +819,9 @@ int ServerApp::foregroundStartup(int argc, char **argv) { const char *ServerApp::daemonName() const { #if SYSAPI_WIN32 - return "Synergy Server"; + return "Deskflow Server"; #elif SYSAPI_UNIX - return "synergys"; + return "deskflows"; #endif } diff --git a/src/lib/synergy/ServerApp.h b/src/lib/deskflow/ServerApp.h similarity index 83% rename from src/lib/synergy/ServerApp.h rename to src/lib/deskflow/ServerApp.h index 9ddda0c30..7fdf88ee7 100644 --- a/src/lib/synergy/ServerApp.h +++ b/src/lib/deskflow/ServerApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -22,9 +22,9 @@ #include "arch/IArchMultithread.h" #include "base/EventTypes.h" #include "base/String.h" +#include "deskflow/App.h" #include "net/NetworkAddress.h" #include "server/Config.h" -#include "synergy/App.h" enum EServerState { kUninitialized, @@ -36,7 +36,7 @@ enum EServerState { }; class Server; -namespace synergy { +namespace deskflow { class Screen; } class ClientListener; @@ -45,12 +45,12 @@ class ILogOutputter; class IEventQueue; class ISocketFactory; -namespace synergy { +namespace deskflow { class ServerArgs; } class ServerApp : public App { - using ServerConfig = synergy::server::Config; + using ServerConfig = deskflow::server::Config; public: ServerApp( @@ -67,7 +67,7 @@ public: const char *daemonInfo() const override; void loadConfig() override; bool loadConfig(const String &pathname) override; - synergy::Screen *createScreen() override; + deskflow::Screen *createScreen() override; int mainLoop() override; int runInner( int argc, char **argv, ILogOutputter *outputter, @@ -98,12 +98,13 @@ public: void closeClientListener(ClientListener *listen); void stopServer(); void closePrimaryClient(PrimaryClient *primaryClient); - void closeServerScreen(synergy::Screen *screen); + void closeServerScreen(deskflow::Screen *screen); void cleanupServer(); bool initServer(); void retryHandler(const Event &, void *); - synergy::Screen *openServerScreen(); - PrimaryClient *openPrimaryClient(const String &name, synergy::Screen *screen); + deskflow::Screen *openServerScreen(); + PrimaryClient * + openPrimaryClient(const String &name, deskflow::Screen *screen); void handleScreenError(const Event &, void *); void handleSuspend(const Event &, void *); void handleResume(const Event &, void *); @@ -113,8 +114,8 @@ public: bool startServer(); Server *getServerPtr() { return m_server; } - synergy::ServerArgs &args() const { - return (synergy::ServerArgs &)argsBase(); + deskflow::ServerArgs &args() const { + return (deskflow::ServerArgs &)argsBase(); } // @@ -131,18 +132,18 @@ private: Server *m_server; EServerState m_serverState; - synergy::Screen *m_serverScreen; + deskflow::Screen *m_serverScreen; PrimaryClient *m_primaryClient; ClientListener *m_listener; EventQueueTimer *m_timer; - NetworkAddress *m_synergyAddress; + NetworkAddress *m_deskflowAddress; }; // configuration file name #if SYSAPI_WIN32 -#define USER_CONFIG_NAME "synergy.sgc" -#define SYSTEM_CONFIG_NAME "synergy.sgc" +#define USER_CONFIG_NAME "deskflow.sgc" +#define SYSTEM_CONFIG_NAME "deskflow.sgc" #elif SYSAPI_UNIX -#define USER_CONFIG_NAME ".synergy.conf" -#define SYSTEM_CONFIG_NAME "synergy.conf" +#define USER_CONFIG_NAME ".deskflow.conf" +#define SYSTEM_CONFIG_NAME "deskflow.conf" #endif diff --git a/src/lib/synergy/ServerAppArguments.md b/src/lib/deskflow/ServerAppArguments.md similarity index 95% rename from src/lib/synergy/ServerAppArguments.md rename to src/lib/deskflow/ServerAppArguments.md index 9f918b284..a9132471c 100644 --- a/src/lib/synergy/ServerAppArguments.md +++ b/src/lib/deskflow/ServerAppArguments.md @@ -10,7 +10,7 @@ As obtained by ```updateCommonArgs()``` The name of the host as reported by the platform. *m_pname* -Name of the process (synergys\[.exe]) +Name of the process (deskflows\[.exe]) ## Platform Arguments @@ -126,7 +126,7 @@ Enables secure data sockets. **--profile-dir** *m_profileDirectory* -If the profile directory is not passed-in, then it is inferred. For XWindows as "~/.synergy" or else "~/Library/Synergy". +If the profile directory is not passed-in, then it is inferred. For XWindows as "~/.deskflow" or else "~/Library/Deskflow". **--plugin-dir** *m_pluginDirectory* @@ -136,12 +136,12 @@ If unspecified, it is inferred. For XWindows "~/plugins" or else "~/Plugins". **--tls-cert** *m_tlsCertFile* -If unspecified and used, then it is sought for as prifleDirectory/SSL/Synergy.pem +If unspecified and used, then it is sought for as prifleDirectory/SSL/Deskflow.pem ## Uncategorised **-a** / **--address** -*m_synergyAddress* +*m_deskflowAddress* Used as the listening address. diff --git a/src/lib/synergy/ServerArgs.cpp b/src/lib/deskflow/ServerArgs.cpp similarity index 88% rename from src/lib/synergy/ServerArgs.cpp rename to src/lib/deskflow/ServerArgs.cpp index 71936a40d..5163beb40 100644 --- a/src/lib/synergy/ServerArgs.cpp +++ b/src/lib/deskflow/ServerArgs.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2020 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,9 +17,9 @@ #include "ServerArgs.h" -namespace synergy { +namespace deskflow { ServerArgs::~ServerArgs() {} ServerArgs::ServerArgs() { m_classType = kServer; } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/ServerArgs.h b/src/lib/deskflow/ServerArgs.h similarity index 86% rename from src/lib/synergy/ServerArgs.h rename to src/lib/deskflow/ServerArgs.h index 3b280971a..c6e6dd9f1 100644 --- a/src/lib/synergy/ServerArgs.h +++ b/src/lib/deskflow/ServerArgs.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2020 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,11 +23,11 @@ #include -namespace synergy { +namespace deskflow { class ServerArgs : public ArgsBase { - using License = synergy::license::License; - using Config = synergy::server::Config; + using License = deskflow::license::License; + using Config = deskflow::server::Config; public: ServerArgs(); @@ -44,4 +44,4 @@ public: std::shared_ptr m_config; }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/ServerTaskBarReceiver.cpp b/src/lib/deskflow/ServerTaskBarReceiver.cpp similarity index 88% rename from src/lib/synergy/ServerTaskBarReceiver.cpp rename to src/lib/deskflow/ServerTaskBarReceiver.cpp index ade50630c..4a4d1eba9 100644 --- a/src/lib/synergy/ServerTaskBarReceiver.cpp +++ b/src/lib/deskflow/ServerTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ServerTaskBarReceiver.h" +#include "deskflow/ServerTaskBarReceiver.h" #include "arch/Arch.h" #include "base/IEventQueue.h" #include "base/String.h" @@ -97,17 +97,17 @@ void ServerTaskBarReceiver::unlock() const { std::string ServerTaskBarReceiver::getToolTip() const { switch (m_state) { case kNotRunning: - return synergy::string::sprintf("%s: Not running", kAppName); + return deskflow::string::sprintf("%s: Not running", kAppName); case kNotWorking: - return synergy::string::sprintf( + return deskflow::string::sprintf( "%s: %s", kAppName, m_errorMessage.c_str()); case kNotConnected: - return synergy::string::sprintf("%s: Waiting for clients", kAppName); + return deskflow::string::sprintf("%s: Waiting for clients", kAppName); case kConnected: - return synergy::string::sprintf("%s: Connected", kAppName); + return deskflow::string::sprintf("%s: Connected", kAppName); default: return ""; diff --git a/src/lib/synergy/ServerTaskBarReceiver.h b/src/lib/deskflow/ServerTaskBarReceiver.h similarity index 94% rename from src/lib/synergy/ServerTaskBarReceiver.h rename to src/lib/deskflow/ServerTaskBarReceiver.h index ba009a86d..0227631d6 100644 --- a/src/lib/synergy/ServerTaskBarReceiver.h +++ b/src/lib/deskflow/ServerTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -23,12 +23,12 @@ #include "base/EventTypes.h" #include "base/String.h" #include "common/stdvector.h" +#include "deskflow/ServerApp.h" #include "server/Server.h" -#include "synergy/ServerApp.h" class IEventQueue; -//! Implementation of IArchTaskBarReceiver for the synergy server +//! Implementation of IArchTaskBarReceiver for the deskflow server class ServerTaskBarReceiver : public IArchTaskBarReceiver { public: ServerTaskBarReceiver(IEventQueue *events); diff --git a/src/lib/synergy/StreamChunker.cpp b/src/lib/deskflow/StreamChunker.cpp similarity index 93% rename from src/lib/synergy/StreamChunker.cpp rename to src/lib/deskflow/StreamChunker.cpp index eae8d7cab..548a0a629 100644 --- a/src/lib/synergy/StreamChunker.cpp +++ b/src/lib/deskflow/StreamChunker.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/StreamChunker.h" +#include "deskflow/StreamChunker.h" #include "base/Event.h" #include "base/EventTypes.h" @@ -24,11 +24,11 @@ #include "base/Stopwatch.h" #include "base/String.h" #include "common/stdexcept.h" +#include "deskflow/ClipboardChunk.h" +#include "deskflow/FileChunk.h" +#include "deskflow/protocol_types.h" #include "mt/Lock.h" #include "mt/Mutex.h" -#include "synergy/ClipboardChunk.h" -#include "synergy/FileChunk.h" -#include "synergy/protocol_types.h" #include @@ -56,7 +56,7 @@ void StreamChunker::sendFile( size_t size = (size_t)file.tellg(); // send first message (file size) - String fileSize = synergy::string::sizeTypeToString(size); + String fileSize = deskflow::string::sizeTypeToString(size); FileChunk *sizeMessage = FileChunk::start(fileSize); events->addEvent( @@ -113,7 +113,7 @@ void StreamChunker::sendClipboard( String &data, size_t size, ClipboardID id, UInt32 sequence, IEventQueue *events, void *eventTarget) { // send first message (data size) - String dataSize = synergy::string::sizeTypeToString(size); + String dataSize = deskflow::string::sizeTypeToString(size); ClipboardChunk *sizeMessage = ClipboardChunk::start(id, sequence, dataSize); events->addEvent(Event( diff --git a/src/lib/synergy/StreamChunker.h b/src/lib/deskflow/StreamChunker.h similarity index 92% rename from src/lib/synergy/StreamChunker.h rename to src/lib/deskflow/StreamChunker.h index e9615ed5c..9624feaac 100644 --- a/src/lib/synergy/StreamChunker.h +++ b/src/lib/deskflow/StreamChunker.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ #pragma once #include "base/String.h" -#include "synergy/clipboard_types.h" +#include "deskflow/clipboard_types.h" class IEventQueue; class Mutex; diff --git a/src/lib/synergy/ToolApp.cpp b/src/lib/deskflow/ToolApp.cpp similarity index 90% rename from src/lib/synergy/ToolApp.cpp rename to src/lib/deskflow/ToolApp.cpp index d56f379dd..b8bc7e0db 100644 --- a/src/lib/synergy/ToolApp.cpp +++ b/src/lib/deskflow/ToolApp.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -#include "synergy/ToolApp.h" +#include "deskflow/ToolApp.h" #include "arch/Arch.h" #include "base/Log.h" #include "base/String.h" -#include "synergy/ArgParser.h" +#include "deskflow/ArgParser.h" #include @@ -53,7 +53,7 @@ UInt32 ToolApp::run(int argc, char **argv) { return kExitFailed; } else { String output = - synergy::string::sprintf("activeDesktop:%s", name.c_str()); + deskflow::string::sprintf("activeDesktop:%s", name.c_str()); LOG((CLOG_INFO "%s", output.c_str())); } #endif @@ -64,7 +64,7 @@ UInt32 ToolApp::run(int argc, char **argv) { } else if (m_args.m_getArch) { std::cout << ARCH->getPlatformName() << std::endl; } else { - throw XSynergy("Nothing to do"); + throw XDeskflow("Nothing to do"); } } catch (std::exception &e) { LOG((CLOG_CRIT "an error occurred: %s\n", e.what())); diff --git a/src/lib/synergy/ToolApp.h b/src/lib/deskflow/ToolApp.h similarity index 88% rename from src/lib/synergy/ToolApp.h rename to src/lib/deskflow/ToolApp.h index f38b556ec..8eb2eae6b 100644 --- a/src/lib/synergy/ToolApp.h +++ b/src/lib/deskflow/ToolApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,8 +18,8 @@ #pragma once #include "common/basic_types.h" -#include "synergy/App.h" -#include "synergy/ToolArgs.h" +#include "deskflow/App.h" +#include "deskflow/ToolArgs.h" class ToolApp : public MinimalApp { public: diff --git a/src/lib/synergy/ToolArgs.cpp b/src/lib/deskflow/ToolArgs.cpp similarity index 90% rename from src/lib/synergy/ToolArgs.cpp rename to src/lib/deskflow/ToolArgs.cpp index 70a8f50b8..03e215844 100644 --- a/src/lib/synergy/ToolArgs.cpp +++ b/src/lib/deskflow/ToolArgs.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/ToolArgs.h" +#include "deskflow/ToolArgs.h" ToolArgs::ToolArgs() : m_printActiveDesktopName(false), diff --git a/src/lib/synergy/ToolArgs.h b/src/lib/deskflow/ToolArgs.h similarity index 94% rename from src/lib/synergy/ToolArgs.h rename to src/lib/deskflow/ToolArgs.h index 14337f309..80028183c 100644 --- a/src/lib/synergy/ToolArgs.h +++ b/src/lib/deskflow/ToolArgs.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/synergy/XSynergy.cpp b/src/lib/deskflow/XDeskflow.cpp similarity index 89% rename from src/lib/synergy/XSynergy.cpp rename to src/lib/deskflow/XDeskflow.cpp index c236e69fa..2747d3279 100644 --- a/src/lib/synergy/XSynergy.cpp +++ b/src/lib/deskflow/XDeskflow.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/XSynergy.h" +#include "deskflow/XDeskflow.h" #include "base/String.h" // @@ -42,8 +42,8 @@ int XIncompatibleClient::getMinor() const throw() { return m_minor; } String XIncompatibleClient::getWhat() const throw() { return format( "XIncompatibleClient", "incompatible client %{1}.%{2}", - synergy::string::sprintf("%d", m_major).c_str(), - synergy::string::sprintf("%d", m_minor).c_str()); + deskflow::string::sprintf("%d", m_major).c_str(), + deskflow::string::sprintf("%d", m_minor).c_str()); } // @@ -87,5 +87,5 @@ int XExitApp::getCode() const throw() { return m_code; } String XExitApp::getWhat() const throw() { return format( "XExitApp", "exiting with code %{1}", - synergy::string::sprintf("%d", m_code).c_str()); + deskflow::string::sprintf("%d", m_code).c_str()); } diff --git a/src/lib/synergy/XSynergy.h b/src/lib/deskflow/XDeskflow.h similarity index 87% rename from src/lib/synergy/XSynergy.h rename to src/lib/deskflow/XDeskflow.h index c8c17a133..e749b7c8f 100644 --- a/src/lib/synergy/XSynergy.h +++ b/src/lib/deskflow/XDeskflow.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -20,26 +20,26 @@ #include "base/XBase.h" -//! Generic synergy exception -XBASE_SUBCLASS(XSynergy, XBase); +//! Generic deskflow exception +XBASE_SUBCLASS(XDeskflow, XBase); //! Subscription error /*! Thrown when there is a problem with the subscription. */ -XBASE_SUBCLASS(XSubscription, XSynergy); +XBASE_SUBCLASS(XSubscription, XDeskflow); //! Client error exception /*! Thrown when the client fails to follow the protocol. */ -XBASE_SUBCLASS_WHAT(XBadClient, XSynergy); +XBASE_SUBCLASS_WHAT(XBadClient, XDeskflow); //! Incompatible client exception /*! Thrown when a client attempting to connect has an incompatible version. */ -class XIncompatibleClient : public XSynergy { +class XIncompatibleClient : public XDeskflow { public: XIncompatibleClient(int major, int minor); @@ -66,7 +66,7 @@ private: Thrown when a client attempting to connect is using the same name as a client that is already connected. */ -class XDuplicateClient : public XSynergy { +class XDuplicateClient : public XDeskflow { public: XDuplicateClient(const String &name); virtual ~XDuplicateClient() _NOEXCEPT {} @@ -91,7 +91,7 @@ private: Thrown when a client attempting to connect is using a name that is unknown to the server. */ -class XUnknownClient : public XSynergy { +class XUnknownClient : public XDeskflow { public: XUnknownClient(const String &name); virtual ~XUnknownClient() _NOEXCEPT {} @@ -117,7 +117,7 @@ Thrown when we want to abort, with the opportunity to clean up. This is a little bit of a hack, but it's a better way of exiting, than just calling exit(int). */ -class XExitApp : public XSynergy { +class XExitApp : public XDeskflow { public: XExitApp(int code); virtual ~XExitApp() _NOEXCEPT {} diff --git a/src/lib/synergy/XScreen.cpp b/src/lib/deskflow/XScreen.cpp similarity index 94% rename from src/lib/synergy/XScreen.cpp rename to src/lib/deskflow/XScreen.cpp index e822ba13d..662700840 100644 --- a/src/lib/synergy/XScreen.cpp +++ b/src/lib/deskflow/XScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/XScreen.h" +#include "deskflow/XScreen.h" // // XScreenOpenFailure diff --git a/src/lib/synergy/XScreen.h b/src/lib/deskflow/XScreen.h similarity index 97% rename from src/lib/synergy/XScreen.h rename to src/lib/deskflow/XScreen.h index 001347126..56121ac0d 100644 --- a/src/lib/synergy/XScreen.h +++ b/src/lib/deskflow/XScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/clipboard_types.h b/src/lib/deskflow/clipboard_types.h similarity index 96% rename from src/lib/synergy/clipboard_types.h rename to src/lib/deskflow/clipboard_types.h index 3de4ebb09..2404f8eb0 100644 --- a/src/lib/synergy/clipboard_types.h +++ b/src/lib/deskflow/clipboard_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/key_types.cpp b/src/lib/deskflow/key_types.cpp similarity index 98% rename from src/lib/synergy/key_types.cpp rename to src/lib/deskflow/key_types.cpp index 3da3162f9..bc13f82f4 100644 --- a/src/lib/synergy/key_types.cpp +++ b/src/lib/deskflow/key_types.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/key_types.h" +#include "deskflow/key_types.h" const KeyNameMapEntry kKeyNameMap[] = { {"AltGr", kKeyAltGr}, diff --git a/src/lib/synergy/key_types.h b/src/lib/deskflow/key_types.h similarity index 99% rename from src/lib/synergy/key_types.h rename to src/lib/deskflow/key_types.h index 2dbcd12d1..813ae054d 100644 --- a/src/lib/synergy/key_types.h +++ b/src/lib/deskflow/key_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/languages/LanguageManager.cpp b/src/lib/deskflow/languages/LanguageManager.cpp similarity index 96% rename from src/lib/synergy/languages/LanguageManager.cpp rename to src/lib/deskflow/languages/LanguageManager.cpp index c5296cc3c..bbcfe3ccb 100644 --- a/src/lib/synergy/languages/LanguageManager.cpp +++ b/src/lib/deskflow/languages/LanguageManager.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -35,7 +35,7 @@ String vectorToString( } // anonymous namespace -namespace synergy { +namespace deskflow { namespace languages { @@ -100,4 +100,4 @@ bool LanguageManager::isLanguageInstalled(const String &language) const { } // namespace languages -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/synergy/languages/LanguageManager.h b/src/lib/deskflow/languages/LanguageManager.h similarity index 89% rename from src/lib/synergy/languages/LanguageManager.h rename to src/lib/deskflow/languages/LanguageManager.h index 4163cdb71..a7ffaf65f 100644 --- a/src/lib/synergy/languages/LanguageManager.h +++ b/src/lib/deskflow/languages/LanguageManager.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifndef SYNERGY_LANGUAGESLANGUAGEMANAGER_H -#define SYNERGY_LANGUAGESLANGUAGEMANAGER_H +#ifndef DESKFLOW_LANGUAGESLANGUAGEMANAGER_H +#define DESKFLOW_LANGUAGESLANGUAGEMANAGER_H #include "base/String.h" -#include "synergy/AppUtil.h" +#include "deskflow/AppUtil.h" #include -namespace synergy { +namespace deskflow { namespace languages { @@ -75,6 +75,6 @@ public: } // namespace languages -} // namespace synergy +} // namespace deskflow -#endif // SYNERGY_LANGUAGESLANGUAGEMANAGER_H +#endif // DESKFLOW_LANGUAGESLANGUAGEMANAGER_H diff --git a/src/lib/synergy/mouse_types.h b/src/lib/deskflow/mouse_types.h similarity index 96% rename from src/lib/synergy/mouse_types.h rename to src/lib/deskflow/mouse_types.h index 86b095ec8..c42ebcb87 100644 --- a/src/lib/synergy/mouse_types.h +++ b/src/lib/deskflow/mouse_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/option_types.h b/src/lib/deskflow/option_types.h similarity index 98% rename from src/lib/synergy/option_types.h rename to src/lib/deskflow/option_types.h index 4e2b16182..7896ec546 100644 --- a/src/lib/synergy/option_types.h +++ b/src/lib/deskflow/option_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/protocol_types.cpp b/src/lib/deskflow/protocol_types.cpp similarity index 92% rename from src/lib/synergy/protocol_types.cpp rename to src/lib/deskflow/protocol_types.cpp index 95b4ee950..dca443e26 100644 --- a/src/lib/synergy/protocol_types.cpp +++ b/src/lib/deskflow/protocol_types.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -#include "synergy/protocol_types.h" +#include "deskflow/protocol_types.h" -const char *const kMsgHello = "Synergy%2i%2i"; -const char *const kMsgHelloBack = "Synergy%2i%2i%s"; +const char *const kMsgHello = "Deskflow%2i%2i"; +const char *const kMsgHelloBack = "Deskflow%2i%2i%s"; const char *const kMsgCNoop = "CNOP"; const char *const kMsgCClose = "CBYE"; const char *const kMsgCEnter = "CINN%2i%2i%4i%2i"; diff --git a/src/lib/synergy/protocol_types.h b/src/lib/deskflow/protocol_types.h similarity index 98% rename from src/lib/synergy/protocol_types.h rename to src/lib/deskflow/protocol_types.h index 95fc2ebec..759d23196 100644 --- a/src/lib/synergy/protocol_types.h +++ b/src/lib/deskflow/protocol_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -31,7 +31,7 @@ // 1.6: adds clipboard streaming // 1.7 adds security input notifications // 1.8 adds language synchronization functionality -// NOTE: with new version, synergy minor version should increment +// NOTE: with new version, deskflow minor version should increment static const SInt16 kProtocolMajorVersion = 1; static const SInt16 kProtocolMinorVersion = 8; diff --git a/src/lib/synergy/unix/AppUtilUnix.cpp b/src/lib/deskflow/unix/AppUtilUnix.cpp similarity index 94% rename from src/lib/synergy/unix/AppUtilUnix.cpp rename to src/lib/deskflow/unix/AppUtilUnix.cpp index 0a4f6d88b..d59194b2b 100644 --- a/src/lib/synergy/unix/AppUtilUnix.cpp +++ b/src/lib/deskflow/unix/AppUtilUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -#include "synergy/unix/AppUtilUnix.h" -#include "synergy/ArgsBase.h" +#include "deskflow/unix/AppUtilUnix.h" +#include "deskflow/ArgsBase.h" #include #if WINAPI_XWINDOWS -#include "synergy/unix/X11LayoutsParser.h" +#include "deskflow/unix/X11LayoutsParser.h" #include #elif WINAPI_CARBON #include @@ -177,7 +177,7 @@ void AppUtilUnix::showNotification( LOG( (CLOG_INFO "showing notification, title=\"%s\", text=\"%s\"", title.c_str(), text.c_str())); - if (!notify_init("Synergy")) { + if (!notify_init("Deskflow")) { LOG((CLOG_INFO "failed to initialize libnotify")); return; } @@ -198,8 +198,8 @@ void AppUtilUnix::showNotification( notify_uninit(); #elif WINAPI_CARBON - // synergys and synergyc are not allowed to send native notifications on MacOS - // instead ask main synergy process to show them instead + // deskflows and deskflowc are not allowed to send native notifications on + // MacOS instead ask main deskflow process to show them instead LOG((CLOG_INFO "mac notification: %s|%s", title.c_str(), text.c_str())); #endif } diff --git a/src/lib/synergy/unix/AppUtilUnix.h b/src/lib/deskflow/unix/AppUtilUnix.h similarity index 93% rename from src/lib/synergy/unix/AppUtilUnix.h rename to src/lib/deskflow/unix/AppUtilUnix.h index 38d2282f4..1cbe96bad 100644 --- a/src/lib/synergy/unix/AppUtilUnix.h +++ b/src/lib/deskflow/unix/AppUtilUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/AppUtil.h" +#include "deskflow/AppUtil.h" #define ARCH_APP_UTIL AppUtilUnix diff --git a/src/lib/synergy/unix/SynergyXkbKeyboard.cpp b/src/lib/deskflow/unix/DeskflowXkbKeyboard.cpp similarity index 81% rename from src/lib/synergy/unix/SynergyXkbKeyboard.cpp rename to src/lib/deskflow/unix/DeskflowXkbKeyboard.cpp index ac21866fc..9d952467d 100644 --- a/src/lib/synergy/unix/SynergyXkbKeyboard.cpp +++ b/src/lib/deskflow/unix/DeskflowXkbKeyboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2021 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,14 +19,14 @@ #if WINAPI_XWINDOWS #include -#include "SynergyXkbKeyboard.h" +#include "DeskflowXkbKeyboard.h" #include "base/Log.h" -namespace synergy { +namespace deskflow { namespace linux { -SynergyXkbKeyboard::SynergyXkbKeyboard() { +DeskflowXkbKeyboard::DeskflowXkbKeyboard() { using XkbDisplay = std::unique_ptr; XkbDisplay display( XkbOpenDisplay(nullptr, nullptr, nullptr, nullptr, nullptr, nullptr), @@ -41,15 +41,15 @@ SynergyXkbKeyboard::SynergyXkbKeyboard() { } } -const char *SynergyXkbKeyboard::getLayout() const { +const char *DeskflowXkbKeyboard::getLayout() const { return m_data.layout ? m_data.layout : "us"; } -const char *SynergyXkbKeyboard::getVariant() const { +const char *DeskflowXkbKeyboard::getVariant() const { return m_data.variant ? m_data.variant : ""; } -SynergyXkbKeyboard::~SynergyXkbKeyboard() { +DeskflowXkbKeyboard::~DeskflowXkbKeyboard() { std::free(m_data.model); std::free(m_data.layout); std::free(m_data.variant); @@ -58,6 +58,6 @@ SynergyXkbKeyboard::~SynergyXkbKeyboard() { } // namespace linux -} // namespace synergy +} // namespace deskflow #endif // WINAPI_XWINDOWS diff --git a/src/lib/synergy/unix/SynergyXkbKeyboard.h b/src/lib/deskflow/unix/DeskflowXkbKeyboard.h similarity index 77% rename from src/lib/synergy/unix/SynergyXkbKeyboard.h rename to src/lib/deskflow/unix/DeskflowXkbKeyboard.h index ab31c11c9..93e0cae9a 100644 --- a/src/lib/synergy/unix/SynergyXkbKeyboard.h +++ b/src/lib/deskflow/unix/DeskflowXkbKeyboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2021 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,27 +24,27 @@ #include #include -namespace synergy { +namespace deskflow { namespace linux { -class SynergyXkbKeyboard { +class DeskflowXkbKeyboard { XkbRF_VarDefsRec m_data = {}; public: - SynergyXkbKeyboard(); - SynergyXkbKeyboard(const SynergyXkbKeyboard &) = delete; - SynergyXkbKeyboard &operator=(const SynergyXkbKeyboard &) = delete; + DeskflowXkbKeyboard(); + DeskflowXkbKeyboard(const DeskflowXkbKeyboard &) = delete; + DeskflowXkbKeyboard &operator=(const DeskflowXkbKeyboard &) = delete; const char *getLayout() const; const char *getVariant() const; - ~SynergyXkbKeyboard(); + ~DeskflowXkbKeyboard(); }; } // namespace linux -} // namespace synergy +} // namespace deskflow #endif // XKBKEYBOARD_H diff --git a/src/lib/synergy/unix/ISO639Table.h b/src/lib/deskflow/unix/ISO639Table.h similarity index 99% rename from src/lib/synergy/unix/ISO639Table.h rename to src/lib/deskflow/unix/ISO639Table.h index d2ac6ebde..b79a70f6d 100644 --- a/src/lib/synergy/unix/ISO639Table.h +++ b/src/lib/deskflow/unix/ISO639Table.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/unix/X11LayoutsParser.cpp b/src/lib/deskflow/unix/X11LayoutsParser.cpp similarity index 98% rename from src/lib/synergy/unix/X11LayoutsParser.cpp rename to src/lib/deskflow/unix/X11LayoutsParser.cpp index 2711f1851..dc2af1a80 100644 --- a/src/lib/synergy/unix/X11LayoutsParser.cpp +++ b/src/lib/deskflow/unix/X11LayoutsParser.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -20,8 +20,8 @@ #include #include +#include "DeskflowXkbKeyboard.h" #include "ISO639Table.h" -#include "SynergyXkbKeyboard.h" #include "X11LayoutsParser.h" #include "base/Log.h" #include "pugixml.hpp" @@ -172,7 +172,7 @@ X11LayoutsParser::getX11LanguageList(const String &pathToEvdevFile) { std::vector layoutNames; std::vector layoutVariantNames; - synergy::linux::SynergyXkbKeyboard keyboard; + deskflow::linux::DeskflowXkbKeyboard keyboard; splitLine(layoutNames, keyboard.getLayout(), ','); splitLine(layoutVariantNames, keyboard.getVariant(), ','); diff --git a/src/lib/synergy/unix/X11LayoutsParser.h b/src/lib/deskflow/unix/X11LayoutsParser.h similarity index 97% rename from src/lib/synergy/unix/X11LayoutsParser.h rename to src/lib/deskflow/unix/X11LayoutsParser.h index abb2639a8..fab08b188 100644 --- a/src/lib/synergy/unix/X11LayoutsParser.h +++ b/src/lib/deskflow/unix/X11LayoutsParser.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp similarity index 95% rename from src/lib/synergy/win32/AppUtilWindows.cpp rename to src/lib/deskflow/win32/AppUtilWindows.cpp index 81908bf39..dbc6953a0 100644 --- a/src/lib/synergy/win32/AppUtilWindows.cpp +++ b/src/lib/deskflow/win32/AppUtilWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/win32/AppUtilWindows.h" +#include "deskflow/win32/AppUtilWindows.h" #include "arch/IArchTaskBarReceiver.h" #include "arch/win32/ArchMiscWindows.h" @@ -27,11 +27,11 @@ #include "base/Log.h" #include "base/log_outputters.h" #include "common/constants.h" +#include "deskflow/App.h" +#include "deskflow/ArgsBase.h" +#include "deskflow/Screen.h" +#include "deskflow/XDeskflow.h" #include "platform/MSWindowsScreen.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" -#include "synergy/Screen.h" -#include "synergy/XSynergy.h" #include #include @@ -224,9 +224,9 @@ void AppUtilWindows::showNotification( return; } if (!WinToastLib::WinToast::instance()->isInitialized()) { - WinToastLib::WinToast::instance()->setAppName(L"Synergy"); + WinToastLib::WinToast::instance()->setAppName(L"Deskflow"); const auto aumi = WinToastLib::WinToast::configureAUMI( - L"Symless", L"Synergy", L"Synergy App", L"1.14.1+"); + L"Symless", L"Deskflow", L"Deskflow App", L"1.14.1+"); WinToastLib::WinToast::instance()->setAppUserModelId(aumi); if (!WinToastLib::WinToast::instance()->initialize()) { diff --git a/src/lib/synergy/win32/AppUtilWindows.h b/src/lib/deskflow/win32/AppUtilWindows.h similarity index 95% rename from src/lib/synergy/win32/AppUtilWindows.h rename to src/lib/deskflow/win32/AppUtilWindows.h index 561617069..c9382b9fa 100644 --- a/src/lib/synergy/win32/AppUtilWindows.h +++ b/src/lib/deskflow/win32/AppUtilWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/AppUtil.h" +#include "deskflow/AppUtil.h" #define WIN32_LEAN_AND_MEAN #include "Windows.h" diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt index fcac62fc1..496fa1565 100644 --- a/src/lib/gui/CMakeLists.txt +++ b/src/lib/gui/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2024 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -16,7 +16,7 @@ set(target gui) set(res_dir ${CMAKE_SOURCE_DIR}/res/gui) -set(qrc_file ${res_dir}/Synergy.qrc) +set(qrc_file ${res_dir}/Deskflow.qrc) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) diff --git a/src/lib/gui/Logger.cpp b/src/lib/gui/Logger.cpp index f61f4ec09..4dac6b621 100644 --- a/src/lib/gui/Logger.cpp +++ b/src/lib/gui/Logger.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -28,10 +28,10 @@ #include #endif -namespace synergy::gui { +namespace deskflow::gui { const auto kForceDebugMessages = QStringList{ - "Synergy", // TEST + "Deskflow", // TEST "No functional TLS backend was found", "No TLS backend is available", "QSslSocket::connectToHostEncrypted: TLS initialization failed", @@ -72,12 +72,12 @@ QString printLine( } void Logger::loadEnvVars() { - const auto debugEnvVar = qEnvironmentVariable("SYNERGY_GUI_DEBUG"); + const auto debugEnvVar = qEnvironmentVariable("DESKFLOW_GUI_DEBUG"); if (!debugEnvVar.isEmpty()) { m_debug = strToTrue(debugEnvVar); } - const auto verboseEnvVar = qEnvironmentVariable("SYNERGY_GUI_VERBOSE"); + const auto verboseEnvVar = qEnvironmentVariable("DESKFLOW_GUI_VERBOSE"); if (!verboseEnvVar.isEmpty()) { m_verbose = strToTrue(verboseEnvVar); } @@ -127,4 +127,4 @@ void Logger::handleMessage( emit newLine(logLine); } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/Logger.h b/src/lib/gui/Logger.h index dc1bab89d..7d53cb68e 100644 --- a/src/lib/gui/Logger.h +++ b/src/lib/gui/Logger.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ const bool kDebug = false; const bool kDebug = true; #endif -namespace synergy::gui { +namespace deskflow::gui { class Logger : public QObject { Q_OBJECT @@ -51,4 +51,4 @@ inline void logVerbose(const QString &message) { Logger::instance().logVerbose(message); } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/OSXHelpers.h b/src/lib/gui/OSXHelpers.h index 2670494ce..a2db5cd9f 100644 --- a/src/lib/gui/OSXHelpers.h +++ b/src/lib/gui/OSXHelpers.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/OSXHelpers.mm b/src/lib/gui/OSXHelpers.mm index 54fd83866..b80bfee99 100644 --- a/src/lib/gui/OSXHelpers.mm +++ b/src/lib/gui/OSXHelpers.mm @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -54,7 +54,7 @@ bool isOSXDevelopmentBuild() { std::string bundleURL = [[[NSBundle mainBundle] bundleURL].absoluteString UTF8String]; - return (bundleURL.find("Applications/Synergy.app") == std::string::npos); + return (bundleURL.find("Applications/Deskflow.app") == std::string::npos); } bool @@ -62,7 +62,7 @@ showOSXNotification(const QString& title, const QString& body) { #if OSX_DEPLOYMENT_TARGET >= 1014 // accessing notification center on unsigned build causes an immidiate - // application shutodown (in this case synergys) and cannot be caught + // application shutodown (in this case deskflows) and cannot be caught // to avoid issues with it need to first check if this is a dev build if (isOSXDevelopmentBuild()) { diff --git a/src/lib/gui/TrayIcon.cpp b/src/lib/gui/TrayIcon.cpp index 98df215ff..b59dde8f8 100644 --- a/src/lib/gui/TrayIcon.cpp +++ b/src/lib/gui/TrayIcon.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include "Logger.h" #include "common/constants.h" -namespace synergy::gui { +namespace deskflow::gui { const auto kShowRetryInterval = 1000; @@ -74,4 +74,4 @@ void TrayIcon::create(std::vector const &actions) { showRetryLoop(); } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/TrayIcon.h b/src/lib/gui/TrayIcon.h index f9d8350cd..70322f058 100644 --- a/src/lib/gui/TrayIcon.h +++ b/src/lib/gui/TrayIcon.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { class TrayIcon : public QObject { Q_OBJECT @@ -47,4 +47,4 @@ private: QIcon m_icon; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/VersionChecker.cpp b/src/lib/gui/VersionChecker.cpp index 785061638..e2cf52ee8 100644 --- a/src/lib/gui/VersionChecker.cpp +++ b/src/lib/gui/VersionChecker.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ #include #include -const char *const kVersion = SYNERGY_VERSION; +const char *const kVersion = DESKFLOW_VERSION; VersionChecker::VersionChecker(std::shared_ptr network) : m_network( @@ -37,22 +37,22 @@ VersionChecker::VersionChecker(std::shared_ptr network) void VersionChecker::checkLatest() const { const QString url = - qEnvironmentVariable("SYNERGY_VERSION_URL", SYNERGY_VERSION_URL); + qEnvironmentVariable("DESKFLOW_VERSION_URL", DESKFLOW_VERSION_URL); auto request = QNetworkRequest(url); - auto userAgent = QString("Synergy %1 on %2") + auto userAgent = QString("Deskflow %1 on %2") .arg(kVersion) .arg(QSysInfo::prettyProductName()); request.setHeader(QNetworkRequest::UserAgentHeader, userAgent); - request.setRawHeader("X-Synergy-Version", kVersion); + request.setRawHeader("X-Deskflow-Version", kVersion); request.setRawHeader( - "X-Synergy-Language", QLocale::system().name().toStdString().c_str()); + "X-Deskflow-Language", QLocale::system().name().toStdString().c_str()); m_network->get(request); } void VersionChecker::replyFinished(QNetworkReply *reply) { auto newestVersion = QString(reply->readAll()); if (!newestVersion.isEmpty() && - compareVersions(SYNERGY_VERSION, newestVersion) > 0) { + compareVersions(DESKFLOW_VERSION, newestVersion) > 0) { emit updateFound(newestVersion); } } diff --git a/src/lib/gui/VersionChecker.h b/src/lib/gui/VersionChecker.h index 3ad1e3472..8199d7039 100644 --- a/src/lib/gui/VersionChecker.h +++ b/src/lib/gui/VersionChecker.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/byte_utils.h b/src/lib/gui/byte_utils.h index 941abfc74..70a7dbc9d 100644 --- a/src/lib/gui/byte_utils.h +++ b/src/lib/gui/byte_utils.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { inline int bytesToInt(const char *buffer, size_t size) { QByteArray byteArray(buffer, static_cast(size)); @@ -39,4 +39,4 @@ inline QByteArray intToBytes(int value) { return bytes; } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/config/AppConfig.cpp b/src/lib/gui/config/AppConfig.cpp index 62cdf13e4..67fc99572 100644 --- a/src/lib/gui/config/AppConfig.cpp +++ b/src/lib/gui/config/AppConfig.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -28,7 +28,7 @@ #include #include -using namespace synergy::gui; +using namespace deskflow::gui; // this should be incremented each time the wizard is changed, // which will force it to re-run for existing installations. @@ -38,15 +38,15 @@ static const char *const kLogLevelNames[] = { "INFO", "DEBUG", "DEBUG1", "DEBUG2"}; #if defined(Q_OS_WIN) -const char AppConfig::m_CoreServerName[] = "synergys.exe"; -const char AppConfig::m_CoreClientName[] = "synergyc.exe"; +const char AppConfig::m_CoreServerName[] = "deskflows.exe"; +const char AppConfig::m_CoreClientName[] = "deskflowc.exe"; const char AppConfig::m_LogDir[] = "log/"; -const char AppConfig::m_ConfigFilename[] = "synergy.sgc"; +const char AppConfig::m_ConfigFilename[] = "deskflow.sgc"; #else -const char AppConfig::m_CoreServerName[] = "synergys"; -const char AppConfig::m_CoreClientName[] = "synergyc"; +const char AppConfig::m_CoreServerName[] = "deskflows"; +const char AppConfig::m_CoreClientName[] = "deskflowc"; const char AppConfig::m_LogDir[] = "/var/log/"; -const char AppConfig::m_ConfigFilename[] = "synergy.conf"; +const char AppConfig::m_ConfigFilename[] = "deskflow.conf"; #endif // TODO: instead, use key value pair table, which would be less fragile. @@ -97,7 +97,7 @@ const char *const AppConfig::m_SettingsName[] = { }; AppConfig::AppConfig( - synergy::gui::IConfigScopes &scopes, std::shared_ptr deps) + deskflow::gui::IConfigScopes &scopes, std::shared_ptr deps) : m_Scopes(scopes), m_pDeps(deps), m_ScreenName(deps->hostname()), diff --git a/src/lib/gui/config/AppConfig.h b/src/lib/gui/config/AppConfig.h index 3dd7a5ef9..f693be5ff 100644 --- a/src/lib/gui/config/AppConfig.h +++ b/src/lib/gui/config/AppConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -33,10 +33,10 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { const ElevateMode kDefaultElevateMode = ElevateMode::kAutomatic; -const QString kDefaultLogFile = "synergy.log"; +const QString kDefaultLogFile = "deskflow.log"; const int kDefaultTlsKeyLength = 2048; #if defined(Q_OS_WIN) @@ -45,7 +45,7 @@ const ProcessMode kDefaultProcessMode = ProcessMode::kService; const ProcessMode kDefaultProcessMode = ProcessMode::kDesktop; #endif // Q_OS_WIN -} // namespace synergy::gui +} // namespace deskflow::gui /** * @brief Simply reads and writes app settings. @@ -55,9 +55,9 @@ const ProcessMode kDefaultProcessMode = ProcessMode::kDesktop; * instance is widely accessible, but that has previously led to this class * becoming a god object. */ -class AppConfig : public QObject, public synergy::gui::IAppConfig { - using ProcessMode = synergy::gui::ProcessMode; - using IConfigScopes = synergy::gui::IConfigScopes; +class AppConfig : public QObject, public deskflow::gui::IAppConfig { + using ProcessMode = deskflow::gui::ProcessMode; + using IConfigScopes = deskflow::gui::IConfigScopes; Q_OBJECT @@ -112,7 +112,7 @@ public: struct Deps { virtual ~Deps() = default; virtual QString defaultTlsCertPath() const { - return synergy::gui::paths::defaultTlsCertPath(); + return deskflow::gui::paths::defaultTlsCertPath(); } virtual QString hostname() const { return QHostInfo::localHostName(); } }; @@ -302,10 +302,10 @@ private: QString m_Interface = ""; int m_LogLevel = 0; bool m_LogToFile = false; - QString m_LogFilename = logDir() + synergy::gui::kDefaultLogFile; + QString m_LogFilename = logDir() + deskflow::gui::kDefaultLogFile; int m_WizardLastRun = 0; bool m_StartedBefore = false; - ElevateMode m_ElevateMode = synergy::gui::kDefaultElevateMode; + ElevateMode m_ElevateMode = deskflow::gui::kDefaultElevateMode; QString m_ActivateEmail = ""; bool m_TlsEnabled = true; bool m_AutoHide = false; @@ -324,12 +324,12 @@ private: bool m_ClientGroupChecked = false; QString m_ServerHostname = ""; bool m_EnableService = - synergy::gui::kDefaultProcessMode == ProcessMode::kService; + deskflow::gui::kDefaultProcessMode == ProcessMode::kService; bool m_CloseToTray = true; - int m_TlsKeyLength = synergy::gui::kDefaultTlsKeyLength; + int m_TlsKeyLength = deskflow::gui::kDefaultTlsKeyLength; std::optional m_MainWindowSize; std::optional m_MainWindowPosition; - bool m_ShowDevThanks = !synergy::gui::license::isLicensedProduct(); + bool m_ShowDevThanks = !deskflow::gui::license::isLicensedProduct(); bool m_LoadFromSystemScope = false; bool m_ShowCloseReminder = true; @@ -339,7 +339,7 @@ private: */ bool m_TlsChanged = false; - synergy::gui::IConfigScopes &m_Scopes; + deskflow::gui::IConfigScopes &m_Scopes; std::shared_ptr m_pDeps; QString m_ScreenName; QString m_TlsCertPath; diff --git a/src/lib/gui/config/ConfigScopes.cpp b/src/lib/gui/config/ConfigScopes.cpp index f352adf44..51431698b 100644 --- a/src/lib/gui/config/ConfigScopes.cpp +++ b/src/lib/gui/config/ConfigScopes.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2020 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { using namespace proxy; @@ -140,4 +140,4 @@ void ConfigScopes::setInScope( } } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/config/ConfigScopes.h b/src/lib/gui/config/ConfigScopes.h index 7ff670a6e..ff9d519b4 100644 --- a/src/lib/gui/config/ConfigScopes.h +++ b/src/lib/gui/config/ConfigScopes.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2020 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -24,11 +24,11 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { /// @brief Encapsulates Qt config for both user and global scopes. class ConfigScopes : public QObject, public IConfigScopes { - using QSettingsProxy = synergy::gui::proxy::QSettingsProxy; + using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; Q_OBJECT @@ -71,4 +71,4 @@ private: std::shared_ptr m_pSystemSettingsProxy; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/config/ElevateMode.h b/src/lib/gui/config/ElevateMode.h index 49dbe82ed..3ec6a34b6 100644 --- a/src/lib/gui/config/ElevateMode.h +++ b/src/lib/gui/config/ElevateMode.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless * * This package is free software; you can redistribute it and/or @@ -20,11 +20,11 @@ /** * @brief The elevate mode tristate determines two behaviors on Windows. * - * The first, switch-on-desk-switch (SodS), passed through synergyd as a - * command line argument to synergy core, determines if the server restarts + * The first, switch-on-desk-switch (SodS), passed through deskflowd as a + * command line argument to deskflow core, determines if the server restarts * when switching Windows desktops (e.g. when Windows UAC dialog pops up). - * The second, passed as a boolean flag to Synergyd over the IPC inside - * IpcMessageType::CommandMessage, determines whether Synergy should be started + * The second, passed as a boolean flag to Deskflowd over the IPC inside + * IpcMessageType::CommandMessage, determines whether Deskflow should be started * with elevated privileges. * * The matrix for these two behaviors is as follows: diff --git a/src/lib/gui/config/IAppConfig.h b/src/lib/gui/config/IAppConfig.h index c973fa1ed..8a6efbdf0 100644 --- a/src/lib/gui/config/IAppConfig.h +++ b/src/lib/gui/config/IAppConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,12 +23,12 @@ #include -namespace synergy::gui { +namespace deskflow::gui { enum class ProcessMode { kService, kDesktop }; class IAppConfig { - using IConfigScopes = synergy::gui::IConfigScopes; + using IConfigScopes = deskflow::gui::IConfigScopes; public: virtual ~IAppConfig() = default; @@ -92,4 +92,4 @@ public: virtual void setInvertConnection(bool invertConnection) = 0; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/config/IConfigScopes.h b/src/lib/gui/config/IConfigScopes.h index e52c3911b..3243810b4 100644 --- a/src/lib/gui/config/IConfigScopes.h +++ b/src/lib/gui/config/IConfigScopes.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,10 +23,10 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { class IConfigScopes { - using QSettingsProxy = synergy::gui::proxy::QSettingsProxy; + using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; public: enum class Scope { Current, System, User }; @@ -75,4 +75,4 @@ public: Scope scope = Scope::Current) = 0; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/config/IServerConfig.h b/src/lib/gui/config/IServerConfig.h index 1114c97d3..12c6ff605 100644 --- a/src/lib/gui/config/IServerConfig.h +++ b/src/lib/gui/config/IServerConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include "ScreenList.h" -namespace synergy::gui { +namespace deskflow::gui { class IServerConfig { public: @@ -35,4 +35,4 @@ public: virtual const ScreenList &screens() const = 0; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/config/Screen.cpp b/src/lib/gui/config/Screen.cpp index 1ebde0ad3..b6290b067 100644 --- a/src/lib/gui/config/Screen.cpp +++ b/src/lib/gui/config/Screen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -22,7 +22,7 @@ #include #include -using namespace synergy::gui::proxy; +using namespace deskflow::gui::proxy; using enum ScreenConfig::Modifier; using enum ScreenConfig::SwitchCorner; using enum ScreenConfig::Fix; diff --git a/src/lib/gui/config/Screen.h b/src/lib/gui/config/Screen.h index eee8e7fda..241fa1fd7 100644 --- a/src/lib/gui/config/Screen.h +++ b/src/lib/gui/config/Screen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -32,7 +32,7 @@ class QTextStream; class ScreenSettingsDialog; class Screen : public ScreenConfig { - using QSettingsProxy = synergy::gui::proxy::QSettingsProxy; + using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; friend class ScreenSettingsDialog; friend class ScreenSetupModel; diff --git a/src/lib/gui/config/ScreenConfig.cpp b/src/lib/gui/config/ScreenConfig.cpp index 697b70ba7..1b97785ce 100644 --- a/src/lib/gui/config/ScreenConfig.cpp +++ b/src/lib/gui/config/ScreenConfig.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/lib/gui/config/ScreenConfig.h b/src/lib/gui/config/ScreenConfig.h index c4e5aa5f8..1214778f1 100644 --- a/src/lib/gui/config/ScreenConfig.h +++ b/src/lib/gui/config/ScreenConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -25,7 +25,7 @@ /// @brief Screen configuration base class class ScreenConfig { - using QSettingsProxy = synergy::gui::proxy::QSettingsProxy; + using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; public: enum class Modifier { diff --git a/src/lib/gui/config/ScreenList.cpp b/src/lib/gui/config/ScreenList.cpp index c06624ebb..b5d489238 100644 --- a/src/lib/gui/config/ScreenList.cpp +++ b/src/lib/gui/config/ScreenList.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2021 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/lib/gui/config/ScreenList.h b/src/lib/gui/config/ScreenList.h index c8bd89fcc..a99abf665 100644 --- a/src/lib/gui/config/ScreenList.h +++ b/src/lib/gui/config/ScreenList.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/config/ServerConfigDialogState.h b/src/lib/gui/config/ServerConfigDialogState.h index 39dfd57f0..43a23f46d 100644 --- a/src/lib/gui/config/ServerConfigDialogState.h +++ b/src/lib/gui/config/ServerConfigDialogState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #pragma once -namespace synergy::gui::config { +namespace deskflow::gui::config { /** * @brief Represents the state of the server config dialog. @@ -35,4 +35,4 @@ private: bool m_isVisible = false; }; -} // namespace synergy::gui::config +} // namespace deskflow::gui::config diff --git a/src/lib/gui/constants.h b/src/lib/gui/constants.h index ae230f039..ef899aabc 100644 --- a/src/lib/gui/constants.h +++ b/src/lib/gui/constants.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -namespace synergy::gui { +namespace deskflow::gui { // important: this is used for settings paths on some platforms, // and must not be a url. qt automatically converts this to reverse domain @@ -47,10 +47,10 @@ const auto kUrlDownload = QString("%1/download?%2").arg(kUrlProduct, kUrlSourceQuery); const auto kUrlBugReport = QString("%1/issues").arg(kUrlGitHub); -#ifdef SYNERGY_PRODUCT_NAME -const QString kProductName = SYNERGY_PRODUCT_NAME; +#ifdef DESKFLOW_PRODUCT_NAME +const QString kProductName = DESKFLOW_PRODUCT_NAME; #else const QString kProductName; #endif -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/core/ClientConnection.cpp b/src/lib/gui/core/ClientConnection.cpp index 942bb93f7..eeb5ef963 100644 --- a/src/lib/gui/core/ClientConnection.cpp +++ b/src/lib/gui/core/ClientConnection.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { // // ClientConnection::Deps @@ -82,4 +82,4 @@ void ClientConnection::showMessage(const QString &logLine) { } } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/core/ClientConnection.h b/src/lib/gui/core/ClientConnection.h index 8b7d31946..e51ca8907 100644 --- a/src/lib/gui/core/ClientConnection.h +++ b/src/lib/gui/core/ClientConnection.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ class QWidget; -namespace synergy::gui { +namespace deskflow::gui { class ClientConnection : public QObject { Q_OBJECT @@ -63,4 +63,4 @@ private: bool m_showMessage = true; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/core/CommandProcess.cpp b/src/lib/gui/core/CommandProcess.cpp index 83828eab7..0b125306d 100644 --- a/src/lib/gui/core/CommandProcess.cpp +++ b/src/lib/gui/core/CommandProcess.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/core/CommandProcess.h b/src/lib/gui/core/CommandProcess.h index bf0c9b2c8..ee047081d 100644 --- a/src/lib/gui/core/CommandProcess.h +++ b/src/lib/gui/core/CommandProcess.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index a2a2d057c..3e5e29523 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -37,13 +37,13 @@ #include #include -using namespace synergy::license; -using namespace synergy::gui::license; +using namespace deskflow::license; +using namespace deskflow::gui::license; -namespace synergy::gui { +namespace deskflow::gui { const int kRetryDelay = 1000; -const auto kServerConfigFilename = "synergy-server.conf"; +const auto kServerConfigFilename = "deskflow-server.conf"; const auto kLineSplitRegex = QRegularExpression("\r|\n|\r\n"); // @@ -499,9 +499,9 @@ bool CoreProcess::addGenericArgs( // is switched; this is because we may need to elevate or not // based on which desk the user is in (login always needs // elevation, where as default desk does not). - // Note that this is only enabled when synergy is set to elevate + // Note that this is only enabled when deskflow is set to elevate // 'as needed' (e.g. on a UAC dialog popup) in order to prevent - // unnecessary restarts when synergy was started elevated or + // unnecessary restarts when deskflow was started elevated or // when it is not allowed to elevate. In these cases restarting // the server is fruitless. if (m_appConfig.elevateMode() == ElevateMode::kAutomatic) { @@ -709,8 +709,8 @@ void CoreProcess::checkLogLine(const QString &line) { checkSecureSocket(line); - // subprocess (synergys, synergyc) is not allowed to show notifications - // process the log from it and show notification from synergy instead + // subprocess (deskflows, deskflowc) is not allowed to show notifications + // process the log from it and show notification from deskflow instead #ifdef Q_OS_MAC checkOSXNotification(line); #endif @@ -752,4 +752,4 @@ QString CoreProcess::correctedInterface() const { QString CoreProcess::correctedAddress() const { return wrapIpv6(m_address); } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/core/CoreProcess.h b/src/lib/gui/core/CoreProcess.h index 37695371a..e90c1cf56 100644 --- a/src/lib/gui/core/CoreProcess.h +++ b/src/lib/gui/core/CoreProcess.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -30,13 +30,13 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { class CoreProcess : public QObject { - using IServerConfig = synergy::gui::IServerConfig; - using QProcessProxy = synergy::gui::proxy::QProcessProxy; - using IQIpcClient = synergy::gui::ipc::IQIpcClient; - using ILicense = synergy::license::ILicense; + using IServerConfig = deskflow::gui::IServerConfig; + using QProcessProxy = deskflow::gui::proxy::QProcessProxy; + using IQIpcClient = deskflow::gui::ipc::IQIpcClient; + using ILicense = deskflow::license::ILicense; Q_OBJECT @@ -140,4 +140,4 @@ private: QTimer m_retryTimer; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/core/CoreTool.cpp b/src/lib/gui/core/CoreTool.cpp index 846ddd5f2..5f86001cc 100644 --- a/src/lib/gui/core/CoreTool.cpp +++ b/src/lib/gui/core/CoreTool.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -24,12 +24,12 @@ #include #include -static const char kCoreBinary[] = "syntool"; +static const char kCoreBinary[] = "deskflow-legacy"; #ifdef Q_WS_WIN -static const char kSerialKeyFilename[] = "Synergy.subkey"; +static const char kSerialKeyFilename[] = "Deskflow.subkey"; #else -static const char kSerialKeyFilename[] = ".synergy.subkey"; +static const char kSerialKeyFilename[] = ".deskflow.subkey"; #endif QString CoreTool::getProfileDir() const { diff --git a/src/lib/gui/core/CoreTool.h b/src/lib/gui/core/CoreTool.h index d23bc215e..ba1277b6a 100644 --- a/src/lib/gui/core/CoreTool.h +++ b/src/lib/gui/core/CoreTool.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/core/ServerConnection.cpp b/src/lib/gui/core/ServerConnection.cpp index 40fc3ee97..0d7b8e59f 100644 --- a/src/lib/gui/core/ServerConnection.cpp +++ b/src/lib/gui/core/ServerConnection.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { // // ServerConnection::Deps @@ -118,4 +118,4 @@ void ServerConnection::handleNewClient(const QString &clientName) { } } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/core/ServerConnection.h b/src/lib/gui/core/ServerConnection.h index e6899389d..da58cd810 100644 --- a/src/lib/gui/core/ServerConnection.h +++ b/src/lib/gui/core/ServerConnection.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -25,11 +25,11 @@ #include "gui/config/ServerConfigDialogState.h" #include "gui/messages.h" -namespace synergy::gui { +namespace deskflow::gui { class ServerConnection : public QObject { Q_OBJECT - using IServerConfig = synergy::gui::IServerConfig; + using IServerConfig = deskflow::gui::IServerConfig; public: struct Deps { @@ -60,4 +60,4 @@ private: bool m_messageShowing = false; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/core/ServerMessage.cpp b/src/lib/gui/core/ServerMessage.cpp index 48e930121..118db30d2 100644 --- a/src/lib/gui/core/ServerMessage.cpp +++ b/src/lib/gui/core/ServerMessage.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #include "ServerMessage.h" -namespace synergy::gui { +namespace deskflow::gui { ServerMessage::ServerMessage(const QString &message) : m_message(message), @@ -53,4 +53,4 @@ QString ServerMessage::parseClientName(const QString &line) const { return clientName; } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/core/ServerMessage.h b/src/lib/gui/core/ServerMessage.h index 5ced6a079..a5acab033 100644 --- a/src/lib/gui/core/ServerMessage.h +++ b/src/lib/gui/core/ServerMessage.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -namespace synergy::gui { +namespace deskflow::gui { class ServerMessage { QString m_message; @@ -39,4 +39,4 @@ private: QString parseClientName(const QString &line) const; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/core/WaylandWarnings.cpp b/src/lib/gui/core/WaylandWarnings.cpp index dd313d49e..9137d50ce 100644 --- a/src/lib/gui/core/WaylandWarnings.cpp +++ b/src/lib/gui/core/WaylandWarnings.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,9 +19,9 @@ #include "messages.h" -using namespace synergy::platform; +using namespace deskflow::platform; -namespace synergy::gui::core { +namespace deskflow::gui::core { // // WaylandWarnings::Deps @@ -62,4 +62,4 @@ void WaylandWarnings::showOnce( } } -} // namespace synergy::gui::core +} // namespace deskflow::gui::core diff --git a/src/lib/gui/core/WaylandWarnings.h b/src/lib/gui/core/WaylandWarnings.h index 473b59410..1aab82810 100644 --- a/src/lib/gui/core/WaylandWarnings.h +++ b/src/lib/gui/core/WaylandWarnings.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include "CoreProcess.h" #include "platform/wayland.h" -namespace synergy::gui::core { +namespace deskflow::gui::core { class WaylandWarnings { public: @@ -46,4 +46,4 @@ private: std::shared_ptr m_pDeps; }; -} // namespace synergy::gui::core +} // namespace deskflow::gui::core diff --git a/src/lib/gui/diagnostic.cpp b/src/lib/gui/diagnostic.cpp index 4dfff7f66..5b1e666f3 100644 --- a/src/lib/gui/diagnostic.cpp +++ b/src/lib/gui/diagnostic.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #include #include -namespace synergy::gui::diagnostic { +namespace deskflow::gui::diagnostic { void restart() { QString program = QCoreApplication::applicationFilePath(); @@ -64,4 +64,4 @@ void clearSettings(ConfigScopes &scopes, bool enableRestart) { } } -} // namespace synergy::gui::diagnostic +} // namespace deskflow::gui::diagnostic diff --git a/src/lib/gui/diagnostic.h b/src/lib/gui/diagnostic.h index 6ad338f4e..bd0902263 100644 --- a/src/lib/gui/diagnostic.h +++ b/src/lib/gui/diagnostic.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include "gui/config/ConfigScopes.h" -namespace synergy::gui::diagnostic { +namespace deskflow::gui::diagnostic { void clearSettings(ConfigScopes &scopes, bool enableRestart); diff --git a/src/lib/gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp index 59e2c925f..248e271ca 100644 --- a/src/lib/gui/dialogs/SettingsDialog.cpp +++ b/src/lib/gui/dialogs/SettingsDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -33,10 +33,10 @@ #include #include -using namespace synergy::license; -using namespace synergy::gui; +using namespace deskflow::license; +using namespace deskflow::gui; -const char *const kProProductName = "Synergy 1 Pro"; +const char *const kProProductName = "Deskflow"; SettingsDialog::SettingsDialog( QWidget *parent, IAppConfig &appConfig, const IServerConfig &serverConfig, @@ -274,7 +274,7 @@ void SettingsDialog::updateTlsControlsEnabled() { } bool SettingsDialog::isClientMode() const { - return m_coreProcess.mode() == synergy::gui::CoreProcess::Mode::Client; + return m_coreProcess.mode() == deskflow::gui::CoreProcess::Mode::Client; } void SettingsDialog::updateTlsRegenerateButton() { diff --git a/src/lib/gui/dialogs/SettingsDialog.h b/src/lib/gui/dialogs/SettingsDialog.h index 23e090d8e..45979b487 100644 --- a/src/lib/gui/dialogs/SettingsDialog.h +++ b/src/lib/gui/dialogs/SettingsDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -31,10 +31,10 @@ #include class SettingsDialog : public QDialog, public Ui::SettingsDialogBase { - using IAppConfig = synergy::gui::IAppConfig; - using IServerConfig = synergy::gui::IServerConfig; - using CoreProcess = synergy::gui::CoreProcess; - using License = synergy::license::License; + using IAppConfig = deskflow::gui::IAppConfig; + using IServerConfig = deskflow::gui::IServerConfig; + using CoreProcess = deskflow::gui::CoreProcess; + using License = deskflow::license::License; Q_OBJECT @@ -90,5 +90,5 @@ private: const IServerConfig &m_serverConfig; const License &m_license; const CoreProcess &m_coreProcess; - synergy::gui::TlsUtility m_tlsUtility; + deskflow::gui::TlsUtility m_tlsUtility; }; diff --git a/src/lib/gui/dialogs/SettingsDialogBase.ui b/src/lib/gui/dialogs/SettingsDialogBase.ui index ecf5a4996..d8108ced8 100644 --- a/src/lib/gui/dialogs/SettingsDialogBase.ui +++ b/src/lib/gui/dialogs/SettingsDialogBase.ui @@ -628,7 +628,7 @@ - Specify when the Synergy service should run at an elevated privilege level + Specify when the Deskflow service should run at an elevated privilege level 0 diff --git a/src/lib/gui/dialogs/UpgradeDialog.cpp b/src/lib/gui/dialogs/UpgradeDialog.cpp index 1c69255b2..ea0f7bf6a 100644 --- a/src/lib/gui/dialogs/UpgradeDialog.cpp +++ b/src/lib/gui/dialogs/UpgradeDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -33,7 +33,7 @@ void UpgradeDialog::showDialog(const QString &text) { exec(); if (clickedButton() == m_upgrade) { - const auto url = QUrl(synergy::gui::kUrlUpgrade); + const auto url = QUrl(deskflow::gui::kUrlUpgrade); if (QDesktopServices::openUrl(url)) { qDebug("opened url: %s", qUtf8Printable(url.toString())); } else { diff --git a/src/lib/gui/dialogs/UpgradeDialog.h b/src/lib/gui/dialogs/UpgradeDialog.h index 4292016e8..d8adcece7 100644 --- a/src/lib/gui/dialogs/UpgradeDialog.h +++ b/src/lib/gui/dialogs/UpgradeDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/dotenv.cpp b/src/lib/gui/dotenv.cpp index e986509df..7a9aa9286 100644 --- a/src/lib/gui/dotenv.cpp +++ b/src/lib/gui/dotenv.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { QPair getPair(const QString &line); @@ -114,4 +114,4 @@ QPair getPair(const QString &line) { return QPair(key.trimmed(), stripQuotes(value.trimmed())); } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/dotenv.h b/src/lib/gui/dotenv.h index b55a30295..7984b2cba 100644 --- a/src/lib/gui/dotenv.h +++ b/src/lib/gui/dotenv.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -namespace synergy::gui { +namespace deskflow::gui { const QString kDefaultEnvFilename = ".env"; @@ -30,4 +30,4 @@ const QString kDefaultEnvFilename = ".env"; */ void dotenv(const QString &filename = kDefaultEnvFilename); -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/ipc/IQIpcClient.cpp b/src/lib/gui/ipc/IQIpcClient.cpp index 26f4aa38b..bf1b3e0b9 100644 --- a/src/lib/gui/ipc/IQIpcClient.cpp +++ b/src/lib/gui/ipc/IQIpcClient.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/ipc/IQIpcClient.h b/src/lib/gui/ipc/IQIpcClient.h index e2bed875e..e9c0b1eac 100644 --- a/src/lib/gui/ipc/IQIpcClient.h +++ b/src/lib/gui/ipc/IQIpcClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include "gui/config/ElevateMode.h" -namespace synergy::gui::ipc { +namespace deskflow::gui::ipc { class IQIpcClient : public QObject { Q_OBJECT @@ -40,4 +40,4 @@ signals: void serviceReady(); }; -} // namespace synergy::gui::ipc +} // namespace deskflow::gui::ipc diff --git a/src/lib/gui/ipc/IpcReader.cpp b/src/lib/gui/ipc/IpcReader.cpp index f1f7018f9..e1b1ec343 100644 --- a/src/lib/gui/ipc/IpcReader.cpp +++ b/src/lib/gui/ipc/IpcReader.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ #include #include -using namespace synergy::gui; +using namespace deskflow::gui; IpcReader::IpcReader(QTcpSocket *socket) : m_Socket(socket) {} diff --git a/src/lib/gui/ipc/IpcReader.h b/src/lib/gui/ipc/IpcReader.h index dd68725d9..7ec4ed344 100644 --- a/src/lib/gui/ipc/IpcReader.h +++ b/src/lib/gui/ipc/IpcReader.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/ipc/QDataStreamProxy.h b/src/lib/gui/ipc/QDataStreamProxy.h index 25a4b4258..3004ef619 100644 --- a/src/lib/gui/ipc/QDataStreamProxy.h +++ b/src/lib/gui/ipc/QDataStreamProxy.h @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2024 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/lib/gui/ipc/QIpcClient.cpp b/src/lib/gui/ipc/QIpcClient.cpp index c7665aa31..8b05e7e45 100644 --- a/src/lib/gui/ipc/QIpcClient.cpp +++ b/src/lib/gui/ipc/QIpcClient.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ const auto kRetryInterval = 1000; const auto kConnectTimeout = 5000; -using namespace synergy::gui; +using namespace deskflow::gui; QIpcClient::QIpcClient(const StreamProvider &streamProvider) : m_streamProvider(streamProvider) { diff --git a/src/lib/gui/ipc/QIpcClient.h b/src/lib/gui/ipc/QIpcClient.h index d8b5bb6be..8268edebe 100644 --- a/src/lib/gui/ipc/QIpcClient.h +++ b/src/lib/gui/ipc/QIpcClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ class IpcReader; -class QIpcClient : public synergy::gui::ipc::IQIpcClient { +class QIpcClient : public deskflow::gui::ipc::IQIpcClient { Q_OBJECT public: diff --git a/src/lib/gui/license/LicenseHandler.cpp b/src/lib/gui/license/LicenseHandler.cpp index f1fe2df9b..b2248fd6f 100644 --- a/src/lib/gui/license/LicenseHandler.cpp +++ b/src/lib/gui/license/LicenseHandler.cpp @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2015 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,10 +27,10 @@ #include using namespace std::chrono; -using namespace synergy::gui::license; -using License = synergy::license::License; +using namespace deskflow::gui::license; +using License = deskflow::license::License; -const synergy::license::License &LicenseHandler::license() const { +const deskflow::license::License &LicenseHandler::license() const { return m_license; } diff --git a/src/lib/gui/license/LicenseHandler.h b/src/lib/gui/license/LicenseHandler.h index f68468069..0b8cbceef 100644 --- a/src/lib/gui/license/LicenseHandler.h +++ b/src/lib/gui/license/LicenseHandler.h @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2015 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,8 +29,8 @@ */ class LicenseHandler : public QObject { Q_OBJECT - using License = synergy::license::License; - using SerialKey = synergy::license::SerialKey; + using License = deskflow::license::License; + using SerialKey = deskflow::license::SerialKey; public: enum class ChangeSerialKeyResult { @@ -53,6 +53,6 @@ signals: void invalidLicense() const; private: - bool m_enabled = synergy::gui::license::isActivationEnabled(); + bool m_enabled = deskflow::gui::license::isActivationEnabled(); License m_license = License::invalid(); }; diff --git a/src/lib/gui/license/license_notices.cpp b/src/lib/gui/license/license_notices.cpp index c3b127f4f..e5f496835 100644 --- a/src/lib/gui/license/license_notices.cpp +++ b/src/lib/gui/license/license_notices.cpp @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2024 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,9 +21,9 @@ #include "license/License.h" #include "styles.h" -using License = synergy::license::License; +using License = deskflow::license::License; -namespace synergy::gui { +namespace deskflow::gui { QString trialLicenseNotice(const License &license); QString subscriptionLicenseNotice(const License &license); @@ -74,4 +74,4 @@ QString subscriptionLicenseNotice(const License &license) { } } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/license/license_notices.h b/src/lib/gui/license/license_notices.h index 153623b0e..3edc8aea6 100644 --- a/src/lib/gui/license/license_notices.h +++ b/src/lib/gui/license/license_notices.h @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2024 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,8 +21,8 @@ #include -namespace synergy::gui { +namespace deskflow::gui { -QString licenseNotice(const synergy::license::License &license); +QString licenseNotice(const deskflow::license::License &license); -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/license/license_utils.cpp b/src/lib/gui/license/license_utils.cpp index c1747a1cb..75a6fb950 100644 --- a/src/lib/gui/license/license_utils.cpp +++ b/src/lib/gui/license/license_utils.cpp @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2024 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,25 +23,25 @@ #include #include -namespace synergy::gui::license { +namespace deskflow::gui::license { -#ifdef SYNERGY_LICENSED_PRODUCT +#ifdef DESKFLOW_LICENSED_PRODUCT const bool kLicensedProduct = true; #else const bool kLicensedProduct = false; #endif -#ifdef SYNERGY_ENABLE_ACTIVATION -#ifndef SYNERGY_LICENSED_PRODUCT +#ifdef DESKFLOW_ENABLE_ACTIVATION +#ifndef DESKFLOW_LICENSED_PRODUCT #error "activation requires licensed product" #endif const bool kEnableActivation = true; #else const bool kEnableActivation = false; -#endif // SYNERGY_ENABLE_ACTIVATION +#endif // DESKFLOW_ENABLE_ACTIVATION bool isLicensedProduct() { - if (strToTrue(qEnvironmentVariable("SYNERGY_LICENSED_PRODUCT"))) { + if (strToTrue(qEnvironmentVariable("DESKFLOW_LICENSED_PRODUCT"))) { return true; } else { return kLicensedProduct; @@ -49,16 +49,16 @@ bool isLicensedProduct() { } bool isActivationEnabled() { - if (strToTrue(qEnvironmentVariable("SYNERGY_ENABLE_ACTIVATION"))) { + if (strToTrue(qEnvironmentVariable("DESKFLOW_ENABLE_ACTIVATION"))) { return true; } else { return kEnableActivation; } } -synergy::license::SerialKey parseSerialKey(const QString &hexString) { +deskflow::license::SerialKey parseSerialKey(const QString &hexString) { try { - return synergy::license::parseSerialKey(hexString.toStdString()); + return deskflow::license::parseSerialKey(hexString.toStdString()); } catch (const std::exception &e) { qFatal("failed to parse serial key: %s", e.what()); abort(); @@ -68,4 +68,4 @@ synergy::license::SerialKey parseSerialKey(const QString &hexString) { } } -} // namespace synergy::gui::license +} // namespace deskflow::gui::license diff --git a/src/lib/gui/license/license_utils.h b/src/lib/gui/license/license_utils.h index 40a76babe..a9bcc5cdc 100644 --- a/src/lib/gui/license/license_utils.h +++ b/src/lib/gui/license/license_utils.h @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2024 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,10 +21,10 @@ #include "license/SerialKey.h" -namespace synergy::gui::license { +namespace deskflow::gui::license { bool isLicensedProduct(); bool isActivationEnabled(); -synergy::license::SerialKey parseSerialKey(const QString &hexString); +deskflow::license::SerialKey parseSerialKey(const QString &hexString); -} // namespace synergy::gui::license +} // namespace deskflow::gui::license diff --git a/src/lib/gui/messages.cpp b/src/lib/gui/messages.cpp index 18938f430..97f05790b 100644 --- a/src/lib/gui/messages.cpp +++ b/src/lib/gui/messages.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -31,9 +31,9 @@ #include #include -using namespace synergy::gui::license; +using namespace deskflow::gui::license; -namespace synergy::gui::messages { +namespace deskflow::gui::messages { struct Errors { static std::unique_ptr s_criticalMessage; @@ -72,7 +72,7 @@ void showErrorDialog( .arg(kUrlBugReport, kColorSecondary); } - const QString version = QString::fromStdString(synergy::version()); + const QString version = QString::fromStdString(deskflow::version()); text += QString("
v%1\n%2\n%3
").arg(version, message, fileLine); if (type == QtFatalMsg) { @@ -138,8 +138,8 @@ void messageHandler( void showCloseReminder(QWidget *parent) { QString message = - "

Synergy will continue to run in the background and can be accessed " - "via the Synergy icon in your system notifications area. This setting " + "

Deskflow will continue to run in the background and can be accessed " + "via the Deskflow icon in your system notifications area. This setting " "can be disabled.

"; #if defined(Q_OS_LINUX) @@ -147,7 +147,7 @@ void showCloseReminder(QWidget *parent) { "notification area might be disabled. " "You may need to " R"(enable an extension)" - " to see the Synergy tray icon.

") + " to see the Deskflow tray icon.

") .arg(kUrlGnomeTrayFix, kStyleLink); #endif @@ -166,7 +166,7 @@ void showFirstServerStartMessage(QWidget *parent) { void showFirstConnectedMessage( QWidget *parent, bool closeToTray, bool enableService, bool isServer) { - auto message = QString("

Synergy is now connected!

"); + auto message = QString("

Deskflow is now connected!

"); if (isServer) { message += @@ -179,12 +179,12 @@ void showFirstConnectedMessage( if (!closeToTray && !enableService) { message += - "

As you do not have the setting enabled to keep Synergy running in " + "

As you do not have the setting enabled to keep Deskflow running in " "the background, you'll need to keep this window open or minimized to " - "keep Synergy running.

"; + "keep Deskflow running.

"; } else { message += - "

You can now close this window and Synergy will continue to run in " + "

You can now close this window and Deskflow will continue to run in " "the background. This setting can be disabled.

"; } @@ -272,7 +272,7 @@ bool showClearSettings(QWidget *parent) { const auto clear = message.addButton(QObject::tr("Clear settings"), QMessageBox::AcceptRole); message.setText( - "

Are you sure you want to clear all settings and restart Synergy?

" + "

Are you sure you want to clear all settings and restart Deskflow?

" "

This action cannot be undone.

"); message.exec(); @@ -303,7 +303,7 @@ void showWaylandLibraryError(QWidget *parent) { QMessageBox::critical( parent, "Library problem", QString( - "

Sorry, while this version of Synergy does support Wayland, " + "

Sorry, while this version of Deskflow does support Wayland, " "this build was not linked with one or more of the required " "libraries.

" "

Please either switch to X from your login screen or use a build " @@ -314,4 +314,4 @@ void showWaylandLibraryError(QWidget *parent) { .arg(kUrlBugReport, kColorSecondary)); } -} // namespace synergy::gui::messages +} // namespace deskflow::gui::messages diff --git a/src/lib/gui/messages.h b/src/lib/gui/messages.h index 46aa8b0f5..4fa8d0ae1 100644 --- a/src/lib/gui/messages.h +++ b/src/lib/gui/messages.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ class QWidget; -namespace synergy::gui::messages { +namespace deskflow::gui::messages { enum class ClientError { AlreadyConnected, HostnameError, GenericError }; @@ -56,4 +56,4 @@ void showWaylandExperimental(QWidget *parent); void showWaylandLibraryError(QWidget *parent); -} // namespace synergy::gui::messages +} // namespace deskflow::gui::messages diff --git a/src/lib/gui/paths.h b/src/lib/gui/paths.h index 796ba7eca..73612d201 100644 --- a/src/lib/gui/paths.h +++ b/src/lib/gui/paths.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,10 +23,10 @@ #include #include -const auto kCertificateFilename = "Synergy.pem"; +const auto kCertificateFilename = "Deskflow.pem"; const auto kSslDir = "SSL"; -namespace synergy::gui::paths { +namespace deskflow::gui::paths { /** * @brief Gets the org config dir (parent of app config dir). @@ -64,4 +64,4 @@ inline QString defaultTlsCertPath() { return sslDirPath.filePath(kCertificateFilename); } -} // namespace synergy::gui::paths +} // namespace deskflow::gui::paths diff --git a/src/lib/gui/proxy/QProcessProxy.cpp b/src/lib/gui/proxy/QProcessProxy.cpp index 339e6055d..e99da4c7d 100644 --- a/src/lib/gui/proxy/QProcessProxy.cpp +++ b/src/lib/gui/proxy/QProcessProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #include "QProcessProxy.h" -namespace synergy::gui::proxy { +namespace deskflow::gui::proxy { void QProcessProxy::create() { m_pProcess = std::make_unique(); @@ -60,4 +60,4 @@ QString QProcessProxy::readAllStandardError() { return m_pProcess->readAllStandardError(); } -} // namespace synergy::gui::proxy +} // namespace deskflow::gui::proxy diff --git a/src/lib/gui/proxy/QProcessProxy.h b/src/lib/gui/proxy/QProcessProxy.h index cb556b25b..8ef1170e5 100644 --- a/src/lib/gui/proxy/QProcessProxy.h +++ b/src/lib/gui/proxy/QProcessProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include #include -namespace synergy::gui::proxy { +namespace deskflow::gui::proxy { class QProcessProxy : public QObject { Q_OBJECT @@ -45,4 +45,4 @@ private: std::unique_ptr m_pProcess; }; -} // namespace synergy::gui::proxy +} // namespace deskflow::gui::proxy diff --git a/src/lib/gui/proxy/QSettingsProxy.cpp b/src/lib/gui/proxy/QSettingsProxy.cpp index f580f2f99..3fe3d580d 100644 --- a/src/lib/gui/proxy/QSettingsProxy.cpp +++ b/src/lib/gui/proxy/QSettingsProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ #include #include -namespace synergy::gui::proxy { +namespace deskflow::gui::proxy { const auto kLegacyOrgDomain = "http-symless-com"; const auto kLegacySystemConfigFilename = "SystemConfig.ini"; @@ -43,7 +43,7 @@ const auto kUnixSystemConfigPath = "/usr/local/etc/"; * @brief The base dir for the system settings file. * * Important: Qt will append the org name as a dir, and the app name as the - * settings filename, i.e.: `{base-dir}/Synergy/Synergy.ini` + * settings filename, i.e.: `{base-dir}/Deskflow/Deskflow.ini` */ QString getSystemSettingsBaseDir() { #if defined(Q_OS_WIN) @@ -129,7 +129,7 @@ void QSettingsProxy::loadUser() { m_pSettings = std::make_unique(); #if defined(Q_OS_MAC) - // on mac, we used to save settings to "com.http-symless-com.Synergy.plist" + // on mac, we used to save settings to "com.http-symless-com.Deskflow.plist" // because `setOrganizationName` was historically called using a url instead // of an actual domain (e.g. symless.com). migrateLegacyUserSettings(*m_pSettings); @@ -205,4 +205,4 @@ bool QSettingsProxy::contains(const QString &key) const { return m_pSettings->contains(key); } -} // namespace synergy::gui::proxy +} // namespace deskflow::gui::proxy diff --git a/src/lib/gui/proxy/QSettingsProxy.h b/src/lib/gui/proxy/QSettingsProxy.h index bd965cc84..e59060551 100644 --- a/src/lib/gui/proxy/QSettingsProxy.h +++ b/src/lib/gui/proxy/QSettingsProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -namespace synergy::gui::proxy { +namespace deskflow::gui::proxy { QString getSystemSettingBaseDir(); @@ -52,4 +52,4 @@ private: std::unique_ptr m_pSettings; }; -} // namespace synergy::gui::proxy +} // namespace deskflow::gui::proxy diff --git a/src/lib/gui/string_utils.h b/src/lib/gui/string_utils.h index a75a36852..5d6d52e77 100644 --- a/src/lib/gui/string_utils.h +++ b/src/lib/gui/string_utils.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/style_utils.h b/src/lib/gui/style_utils.h index 2c2b2441b..4d9c5407c 100644 --- a/src/lib/gui/style_utils.h +++ b/src/lib/gui/style_utils.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include #include -namespace synergy::gui { +namespace deskflow::gui { /** * @brief Detects dark mode depending on Qt version. @@ -39,4 +39,4 @@ inline bool isDarkMode() { #endif // QT_VERSION } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/styles.h b/src/lib/gui/styles.h index 7bd5e9339..27c610acf 100644 --- a/src/lib/gui/styles.h +++ b/src/lib/gui/styles.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -namespace synergy::gui { +namespace deskflow::gui { const auto kColorWhite = "#ffffff"; const auto kColorPrimary = "#ff7c00"; @@ -50,4 +50,4 @@ const auto kStyleNoticeLabel = // "background-color: %1; color: %2") .arg(kColorNotice, kColorWhite); -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/tls/TlsCertificate.cpp b/src/lib/gui/tls/TlsCertificate.cpp index fe14b528d..676add1eb 100644 --- a/src/lib/gui/tls/TlsCertificate.cpp +++ b/src/lib/gui/tls/TlsCertificate.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -27,21 +27,21 @@ static const char *const kCertificateKeyLength = "rsa:"; static const char *const kCertificateHashAlgorithm = "-sha256"; static const char *const kCertificateLifetime = "365"; -static const char *const kCertificateSubjectInfo = "/CN=Synergy"; +static const char *const kCertificateSubjectInfo = "/CN=Deskflow"; #if defined(Q_OS_WIN) static const char *const kWinOpenSslDir = "OpenSSL"; static const char *const kWinOpenSslBinary = "openssl.exe"; -static const char *const kConfigFile = "synergy.conf"; +static const char *const kConfigFile = "deskflow.conf"; #elif defined(Q_OS_UNIX) static const char *const kUnixOpenSslCommand = "openssl"; #endif -using namespace synergy::gui; +using namespace deskflow::gui; #if defined(Q_OS_WIN) -namespace synergy::gui { +namespace deskflow::gui { QString openSslWindowsDir() { @@ -81,9 +81,9 @@ QString openSslWindowsBinary() { return path; } -} // namespace synergy::gui +} // namespace deskflow::gui -using namespace synergy::gui; +using namespace deskflow::gui; #endif diff --git a/src/lib/gui/tls/TlsCertificate.h b/src/lib/gui/tls/TlsCertificate.h index 86823d5a0..27a0913c5 100644 --- a/src/lib/gui/tls/TlsCertificate.h +++ b/src/lib/gui/tls/TlsCertificate.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/tls/TlsFingerprint.cpp b/src/lib/gui/tls/TlsFingerprint.cpp index 19ce8c603..f306efab6 100644 --- a/src/lib/gui/tls/TlsFingerprint.cpp +++ b/src/lib/gui/tls/TlsFingerprint.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/tls/TlsFingerprint.h b/src/lib/gui/tls/TlsFingerprint.h index 7123b2fc4..6ca294966 100644 --- a/src/lib/gui/tls/TlsFingerprint.h +++ b/src/lib/gui/tls/TlsFingerprint.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/tls/TlsUtility.cpp b/src/lib/gui/tls/TlsUtility.cpp index 53e020fef..e21031564 100644 --- a/src/lib/gui/tls/TlsUtility.cpp +++ b/src/lib/gui/tls/TlsUtility.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,10 +23,10 @@ #include #include -using namespace synergy::license; -using namespace synergy::gui::license; +using namespace deskflow::license; +using namespace deskflow::gui::license; -namespace synergy::gui { +namespace deskflow::gui { TlsUtility::TlsUtility(const IAppConfig &appConfig, const ILicense &license) : m_appConfig(appConfig), @@ -67,4 +67,4 @@ bool TlsUtility::persistCertificate() { return generateCertificate(); } -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/tls/TlsUtility.h b/src/lib/gui/tls/TlsUtility.h index 3192fcf61..202a87939 100644 --- a/src/lib/gui/tls/TlsUtility.h +++ b/src/lib/gui/tls/TlsUtility.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -24,10 +24,10 @@ #include -namespace synergy::gui { +namespace deskflow::gui { class TlsUtility : public QObject { - using ILicense = synergy::license::ILicense; + using ILicense = deskflow::license::ILicense; Q_OBJECT public: @@ -56,4 +56,4 @@ private: TlsCertificate m_certificate; }; -} // namespace synergy::gui +} // namespace deskflow::gui diff --git a/src/lib/gui/validators/AliasValidator.cpp b/src/lib/gui/validators/AliasValidator.cpp index 62834e91f..1193e08a8 100644 --- a/src/lib/gui/validators/AliasValidator.cpp +++ b/src/lib/gui/validators/AliasValidator.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/AliasValidator.h b/src/lib/gui/validators/AliasValidator.h index 36fc0f327..c7323ba00 100644 --- a/src/lib/gui/validators/AliasValidator.h +++ b/src/lib/gui/validators/AliasValidator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/ComputerNameValidator.cpp b/src/lib/gui/validators/ComputerNameValidator.cpp index 15ab4d292..92a3a594b 100644 --- a/src/lib/gui/validators/ComputerNameValidator.cpp +++ b/src/lib/gui/validators/ComputerNameValidator.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/ComputerNameValidator.h b/src/lib/gui/validators/ComputerNameValidator.h index 3ddea8e54..6f38fc11a 100644 --- a/src/lib/gui/validators/ComputerNameValidator.h +++ b/src/lib/gui/validators/ComputerNameValidator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/EmptyStringValidator.cpp b/src/lib/gui/validators/EmptyStringValidator.cpp index bb43ae9b9..c84fbeea2 100644 --- a/src/lib/gui/validators/EmptyStringValidator.cpp +++ b/src/lib/gui/validators/EmptyStringValidator.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/EmptyStringValidator.h b/src/lib/gui/validators/EmptyStringValidator.h index cd44ff202..238588e36 100644 --- a/src/lib/gui/validators/EmptyStringValidator.h +++ b/src/lib/gui/validators/EmptyStringValidator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/IStringValidator.cpp b/src/lib/gui/validators/IStringValidator.cpp index 32f65e8bf..d98051fa7 100644 --- a/src/lib/gui/validators/IStringValidator.cpp +++ b/src/lib/gui/validators/IStringValidator.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/IStringValidator.h b/src/lib/gui/validators/IStringValidator.h index 2275dcd9d..3f35833ab 100644 --- a/src/lib/gui/validators/IStringValidator.h +++ b/src/lib/gui/validators/IStringValidator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/LineEditValidator.cpp b/src/lib/gui/validators/LineEditValidator.cpp index e52b46cbd..c8cf69eba 100644 --- a/src/lib/gui/validators/LineEditValidator.cpp +++ b/src/lib/gui/validators/LineEditValidator.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include -using namespace synergy::gui; +using namespace deskflow::gui; namespace validators { diff --git a/src/lib/gui/validators/LineEditValidator.h b/src/lib/gui/validators/LineEditValidator.h index 9e07b2d97..4d4c999bb 100644 --- a/src/lib/gui/validators/LineEditValidator.h +++ b/src/lib/gui/validators/LineEditValidator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/ScreenDuplicationsValidator.cpp b/src/lib/gui/validators/ScreenDuplicationsValidator.cpp index 168b33518..67d0ec350 100644 --- a/src/lib/gui/validators/ScreenDuplicationsValidator.cpp +++ b/src/lib/gui/validators/ScreenDuplicationsValidator.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/ScreenDuplicationsValidator.h b/src/lib/gui/validators/ScreenDuplicationsValidator.h index d54ce635d..e3d1867c6 100644 --- a/src/lib/gui/validators/ScreenDuplicationsValidator.h +++ b/src/lib/gui/validators/ScreenDuplicationsValidator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/ScreenNameValidator.cpp b/src/lib/gui/validators/ScreenNameValidator.cpp index 51c4f49a1..402a1c88d 100644 --- a/src/lib/gui/validators/ScreenNameValidator.cpp +++ b/src/lib/gui/validators/ScreenNameValidator.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/ScreenNameValidator.h b/src/lib/gui/validators/ScreenNameValidator.h index 0caffc77d..a0859aed0 100644 --- a/src/lib/gui/validators/ScreenNameValidator.h +++ b/src/lib/gui/validators/ScreenNameValidator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/SpacesValidator.cpp b/src/lib/gui/validators/SpacesValidator.cpp index c7d496fe0..080e113f1 100644 --- a/src/lib/gui/validators/SpacesValidator.cpp +++ b/src/lib/gui/validators/SpacesValidator.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/SpacesValidator.h b/src/lib/gui/validators/SpacesValidator.h index 57190a63c..ca3213141 100644 --- a/src/lib/gui/validators/SpacesValidator.h +++ b/src/lib/gui/validators/SpacesValidator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/validators/ValidationError.cpp b/src/lib/gui/validators/ValidationError.cpp index 5381989b0..9f3050dc6 100644 --- a/src/lib/gui/validators/ValidationError.cpp +++ b/src/lib/gui/validators/ValidationError.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include "gui/styles.h" -using namespace synergy::gui; +using namespace deskflow::gui; namespace validators { diff --git a/src/lib/gui/validators/ValidationError.h b/src/lib/gui/validators/ValidationError.h index 198921a04..fd65c04ed 100644 --- a/src/lib/gui/validators/ValidationError.h +++ b/src/lib/gui/validators/ValidationError.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/gui/widgets/ClientStateLabel.cpp b/src/lib/gui/widgets/ClientStateLabel.cpp index 611025e12..fc95d2245 100644 --- a/src/lib/gui/widgets/ClientStateLabel.cpp +++ b/src/lib/gui/widgets/ClientStateLabel.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #include "ClientStateLabel.h" -namespace synergy::gui::widgets { +namespace deskflow::gui::widgets { ClientStateLabel::ClientStateLabel(QWidget *parent) : QLabel(parent) { hide(); } @@ -31,4 +31,4 @@ void ClientStateLabel::updateClientState(const QString &line) { } } -} // namespace synergy::gui::widgets +} // namespace deskflow::gui::widgets diff --git a/src/lib/gui/widgets/ClientStateLabel.h b/src/lib/gui/widgets/ClientStateLabel.h index 170e4357c..b8082000d 100644 --- a/src/lib/gui/widgets/ClientStateLabel.h +++ b/src/lib/gui/widgets/ClientStateLabel.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -namespace synergy::gui::widgets { +namespace deskflow::gui::widgets { class ClientStateLabel : public QLabel { public: @@ -27,4 +27,4 @@ public: void updateClientState(const QString &line); }; -} // namespace synergy::gui::widgets +} // namespace deskflow::gui::widgets diff --git a/src/lib/gui/widgets/ServerStateLabel.cpp b/src/lib/gui/widgets/ServerStateLabel.cpp index eebb574d2..4ab2d0729 100644 --- a/src/lib/gui/widgets/ServerStateLabel.cpp +++ b/src/lib/gui/widgets/ServerStateLabel.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,9 +19,9 @@ #include "gui/core/ServerMessage.h" -using namespace synergy::gui; +using namespace deskflow::gui; -namespace synergy::gui::widgets { +namespace deskflow::gui::widgets { ServerStateLabel::ServerStateLabel(QWidget *parent) : QLabel(parent) {} @@ -50,4 +50,4 @@ void ServerStateLabel::updateServerState(const QString &line) { } } -} // namespace synergy::gui::widgets +} // namespace deskflow::gui::widgets diff --git a/src/lib/gui/widgets/ServerStateLabel.h b/src/lib/gui/widgets/ServerStateLabel.h index 810d48c7f..62bf492b7 100644 --- a/src/lib/gui/widgets/ServerStateLabel.h +++ b/src/lib/gui/widgets/ServerStateLabel.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include #include -namespace synergy::gui::widgets { +namespace deskflow::gui::widgets { class ServerStateLabel : public QLabel { public: @@ -33,4 +33,4 @@ private: void updateState(); }; -} // namespace synergy::gui::widgets +} // namespace deskflow::gui::widgets diff --git a/src/lib/io/CMakeLists.txt b/src/lib/io/CMakeLists.txt index 4093a970b..baedab0c6 100644 --- a/src/lib/io/CMakeLists.txt +++ b/src/lib/io/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # diff --git a/src/lib/io/IStream.h b/src/lib/io/IStream.h index a5289aa0e..51a303ffd 100644 --- a/src/lib/io/IStream.h +++ b/src/lib/io/IStream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -25,7 +25,7 @@ class IEventQueue; -namespace synergy { +namespace deskflow { //! Bidirectional stream interface /*! @@ -117,4 +117,4 @@ public: //@} }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/io/StreamBuffer.cpp b/src/lib/io/StreamBuffer.cpp index 2ba264e96..88c49360e 100644 --- a/src/lib/io/StreamBuffer.cpp +++ b/src/lib/io/StreamBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/io/StreamBuffer.h b/src/lib/io/StreamBuffer.h index 5d0478d8f..b58722778 100644 --- a/src/lib/io/StreamBuffer.h +++ b/src/lib/io/StreamBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/io/StreamFilter.cpp b/src/lib/io/StreamFilter.cpp index d17860eba..f57690779 100644 --- a/src/lib/io/StreamFilter.cpp +++ b/src/lib/io/StreamFilter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -25,7 +25,7 @@ // StreamFilter::StreamFilter( - IEventQueue *events, synergy::IStream *stream, bool adoptStream) + IEventQueue *events, deskflow::IStream *stream, bool adoptStream) : m_stream(stream), m_adopted(adoptStream), m_events(events) { @@ -68,7 +68,7 @@ bool StreamFilter::isReady() const { return getStream()->isReady(); } UInt32 StreamFilter::getSize() const { return getStream()->getSize(); } -synergy::IStream *StreamFilter::getStream() const { return m_stream; } +deskflow::IStream *StreamFilter::getStream() const { return m_stream; } void StreamFilter::filterEvent(const Event &event) { m_events->dispatchEvent( diff --git a/src/lib/io/StreamFilter.h b/src/lib/io/StreamFilter.h index 41342562b..8cc99491e 100644 --- a/src/lib/io/StreamFilter.h +++ b/src/lib/io/StreamFilter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -26,7 +26,7 @@ This class wraps a stream. Subclasses provide indirect access to the wrapped stream, typically performing some filtering. */ -class StreamFilter : public synergy::IStream { +class StreamFilter : public deskflow::IStream { public: /*! Create a wrapper around \c stream. Iff \c adoptStream is true then @@ -34,7 +34,7 @@ public: d'tor. */ StreamFilter( - IEventQueue *events, synergy::IStream *stream, bool adoptStream = true); + IEventQueue *events, deskflow::IStream *stream, bool adoptStream = true); StreamFilter(StreamFilter const &) = delete; StreamFilter(StreamFilter &&) = delete; virtual ~StreamFilter(); @@ -59,7 +59,7 @@ public: /*! Returns the stream passed to the c'tor. */ - synergy::IStream *getStream() const; + deskflow::IStream *getStream() const; protected: //! Handle events from source stream @@ -73,7 +73,7 @@ private: void handleUpstreamEvent(const Event &, void *); private: - synergy::IStream *m_stream; + deskflow::IStream *m_stream; bool m_adopted; IEventQueue *m_events; }; diff --git a/src/lib/io/XIO.cpp b/src/lib/io/XIO.cpp index 54edae83f..12b222e50 100644 --- a/src/lib/io/XIO.cpp +++ b/src/lib/io/XIO.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/io/XIO.h b/src/lib/io/XIO.h index 2d0656aae..77239628d 100644 --- a/src/lib/io/XIO.h +++ b/src/lib/io/XIO.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/ipc/CMakeLists.txt b/src/lib/ipc/CMakeLists.txt index 7bbf08ce1..8c4588785 100644 --- a/src/lib/ipc/CMakeLists.txt +++ b/src/lib/ipc/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -31,5 +31,5 @@ if(UNIX) mt io net - synlib) + app) endif() diff --git a/src/lib/ipc/IpcClient.cpp b/src/lib/ipc/IpcClient.cpp index f463330ba..b6cb13c78 100644 --- a/src/lib/ipc/IpcClient.cpp +++ b/src/lib/ipc/IpcClient.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/ipc/IpcClient.h b/src/lib/ipc/IpcClient.h index 2c89ac1e4..80be77a8c 100644 --- a/src/lib/ipc/IpcClient.h +++ b/src/lib/ipc/IpcClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcClientProxy.cpp b/src/lib/ipc/IpcClientProxy.cpp index 7d48684c9..35317cd99 100644 --- a/src/lib/ipc/IpcClientProxy.cpp +++ b/src/lib/ipc/IpcClientProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,16 +20,16 @@ #include "base/Log.h" #include "base/TMethodEventJob.h" #include "common/ipc.h" +#include "deskflow/ProtocolUtil.h" #include "io/IStream.h" #include "ipc/IpcMessage.h" #include "ipc/IpcSettingMessage.h" -#include "synergy/ProtocolUtil.h" // // IpcClientProxy // -IpcClientProxy::IpcClientProxy(synergy::IStream &stream, IEventQueue *events) +IpcClientProxy::IpcClientProxy(deskflow::IStream &stream, IEventQueue *events) : m_stream(stream), m_events(events) { m_events->adoptHandler( diff --git a/src/lib/ipc/IpcClientProxy.h b/src/lib/ipc/IpcClientProxy.h index b0260b203..94295585b 100644 --- a/src/lib/ipc/IpcClientProxy.h +++ b/src/lib/ipc/IpcClientProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #include "base/EventTypes.h" #include "common/ipc.h" -namespace synergy { +namespace deskflow { class IStream; } class IpcMessage; @@ -36,7 +36,7 @@ class IpcClientProxy { friend class IpcServer; public: - IpcClientProxy(synergy::IStream &stream, IEventQueue *events); + IpcClientProxy(deskflow::IStream &stream, IEventQueue *events); IpcClientProxy(IpcClientProxy const &) = delete; IpcClientProxy(IpcClientProxy &&) = delete; virtual ~IpcClientProxy(); @@ -55,7 +55,7 @@ private: void disconnect(); private: - synergy::IStream &m_stream; + deskflow::IStream &m_stream; IEventQueue *m_events; IpcClientType m_clientType = IpcClientType::Unknown; bool m_disconnecting = false; diff --git a/src/lib/ipc/IpcLogOutputter.cpp b/src/lib/ipc/IpcLogOutputter.cpp index 81f5536d3..a8a08c569 100644 --- a/src/lib/ipc/IpcLogOutputter.cpp +++ b/src/lib/ipc/IpcLogOutputter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcLogOutputter.h b/src/lib/ipc/IpcLogOutputter.h index 1bac53206..00242e8d3 100644 --- a/src/lib/ipc/IpcLogOutputter.h +++ b/src/lib/ipc/IpcLogOutputter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcMessage.cpp b/src/lib/ipc/IpcMessage.cpp index e953f8a47..4749925da 100644 --- a/src/lib/ipc/IpcMessage.cpp +++ b/src/lib/ipc/IpcMessage.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcMessage.h b/src/lib/ipc/IpcMessage.h index 587791061..8b4707b46 100644 --- a/src/lib/ipc/IpcMessage.h +++ b/src/lib/ipc/IpcMessage.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/ipc/IpcServer.cpp b/src/lib/ipc/IpcServer.cpp index 544b2ddae..de74a821c 100644 --- a/src/lib/ipc/IpcServer.cpp +++ b/src/lib/ipc/IpcServer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -86,7 +86,7 @@ IpcServer::~IpcServer() { void IpcServer::listen() { m_socket->bind(m_address); } void IpcServer::handleClientConnecting(const Event &, void *) { - synergy::IStream *stream = m_socket->accept(); + deskflow::IStream *stream = m_socket->accept(); if (stream == NULL) { return; } diff --git a/src/lib/ipc/IpcServer.h b/src/lib/ipc/IpcServer.h index 356caf30d..677691c36 100644 --- a/src/lib/ipc/IpcServer.h +++ b/src/lib/ipc/IpcServer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcServerProxy.cpp b/src/lib/ipc/IpcServerProxy.cpp index 1c889ae44..cd4e6968d 100644 --- a/src/lib/ipc/IpcServerProxy.cpp +++ b/src/lib/ipc/IpcServerProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -21,15 +21,15 @@ #include "base/Log.h" #include "base/TMethodEventJob.h" #include "common/ipc.h" +#include "deskflow/ProtocolUtil.h" #include "io/IStream.h" #include "ipc/IpcMessage.h" -#include "synergy/ProtocolUtil.h" // // IpcServerProxy // -IpcServerProxy::IpcServerProxy(synergy::IStream &stream, IEventQueue *events) +IpcServerProxy::IpcServerProxy(deskflow::IStream &stream, IEventQueue *events) : m_stream(stream), m_events(events) { m_events->adoptHandler( diff --git a/src/lib/ipc/IpcServerProxy.h b/src/lib/ipc/IpcServerProxy.h index 4fd96b0f7..47a07d3b1 100644 --- a/src/lib/ipc/IpcServerProxy.h +++ b/src/lib/ipc/IpcServerProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -21,7 +21,7 @@ #include "base/Event.h" #include "base/EventTypes.h" -namespace synergy { +namespace deskflow { class IStream; } class IpcMessage; @@ -32,7 +32,7 @@ class IpcServerProxy { friend class IpcClient; public: - IpcServerProxy(synergy::IStream &stream, IEventQueue *events); + IpcServerProxy(deskflow::IStream &stream, IEventQueue *events); IpcServerProxy(IpcServerProxy const &) = delete; virtual ~IpcServerProxy(); @@ -44,6 +44,6 @@ private: void disconnect(); private: - synergy::IStream &m_stream; + deskflow::IStream &m_stream; IEventQueue *m_events; }; diff --git a/src/lib/ipc/IpcSettingMessage.cpp b/src/lib/ipc/IpcSettingMessage.cpp index 3ba9a5310..83834db5c 100644 --- a/src/lib/ipc/IpcSettingMessage.cpp +++ b/src/lib/ipc/IpcSettingMessage.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcSettingMessage.h b/src/lib/ipc/IpcSettingMessage.h index 86937c80c..9956ec723 100644 --- a/src/lib/ipc/IpcSettingMessage.h +++ b/src/lib/ipc/IpcSettingMessage.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/license/CMakeLists.txt b/src/lib/license/CMakeLists.txt index 024ecda9e..79e8e7ebd 100644 --- a/src/lib/license/CMakeLists.txt +++ b/src/lib/license/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # diff --git a/src/lib/license/ILicense.h b/src/lib/license/ILicense.h index f6d699e9b..ee34c06dc 100644 --- a/src/lib/license/ILicense.h +++ b/src/lib/license/ILicense.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ class Server; class LicenseHandler; class LicenseTests; -namespace synergy::license { +namespace deskflow::license { class ILicense { public: @@ -29,4 +29,4 @@ public: virtual bool isTlsAvailable() const = 0; }; -} // namespace synergy::license +} // namespace deskflow::license diff --git a/src/lib/license/License.cpp b/src/lib/license/License.cpp index 273e495dd..3eceb7d4b 100644 --- a/src/lib/license/License.cpp +++ b/src/lib/license/License.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ using namespace std::chrono; -namespace synergy::license { +namespace deskflow::license { License::License(const std::string &hexString) : m_serialKey(parseSerialKey(hexString)) {} @@ -98,4 +98,4 @@ std::string License::productName() const { return name; } -} // namespace synergy::license +} // namespace deskflow::license diff --git a/src/lib/license/License.h b/src/lib/license/License.h index 83ce3f84d..05743ddee 100644 --- a/src/lib/license/License.h +++ b/src/lib/license/License.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ class Server; class LicenseHandler; class LicenseTests; -namespace synergy::license { +namespace deskflow::license { class License : public ILicense { friend class ::Server; @@ -93,4 +93,4 @@ private: NowFunc m_nowFunc = []() { return system_clock::now(); }; }; -} // namespace synergy::license +} // namespace deskflow::license diff --git a/src/lib/license/Product.cpp b/src/lib/license/Product.cpp index c4116de0e..a82e9f7df 100644 --- a/src/lib/license/Product.cpp +++ b/src/lib/license/Product.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ using SKE = Product::SerialKeyEditionID; -const char *const kLicensedProductName = "Synergy 1"; +const char *const kLicensedProductName = "Deskflow"; const std::string SKE::Pro = "pro"; const std::string SKE::Basic = "basic"; diff --git a/src/lib/license/Product.h b/src/lib/license/Product.h index 17183857d..39fe93cde 100644 --- a/src/lib/license/Product.h +++ b/src/lib/license/Product.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/license/ProductEdition.h b/src/lib/license/ProductEdition.h index 7ea23798f..a04aaeed9 100644 --- a/src/lib/license/ProductEdition.h +++ b/src/lib/license/ProductEdition.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/license/SerialKey.h b/src/lib/license/SerialKey.h index 55b6fdae4..290164399 100644 --- a/src/lib/license/SerialKey.h +++ b/src/lib/license/SerialKey.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #include #include -namespace synergy::license { +namespace deskflow::license { struct SerialKey { using time_point = std::chrono::system_clock::time_point; @@ -57,4 +57,4 @@ private: explicit SerialKey(Edition edition) : product(edition) {} }; -} // namespace synergy::license +} // namespace deskflow::license diff --git a/src/lib/license/SerialKeyType.cpp b/src/lib/license/SerialKeyType.cpp index 0e0834a37..c2432525c 100644 --- a/src/lib/license/SerialKeyType.cpp +++ b/src/lib/license/SerialKeyType.cpp @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2015 Synergy Ltd. + * Deskflow -- mouse and keyboard sharing utility + * Copyright (C) 2015 Symless Ltd. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/lib/license/SerialKeyType.h b/src/lib/license/SerialKeyType.h index a7057ef36..45454082d 100644 --- a/src/lib/license/SerialKeyType.h +++ b/src/lib/license/SerialKeyType.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/license/parse_serial_key.cpp b/src/lib/license/parse_serial_key.cpp index bd81fdbac..f1d60cc5b 100644 --- a/src/lib/license/parse_serial_key.cpp +++ b/src/lib/license/parse_serial_key.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -31,7 +31,7 @@ using Parts = std::vector; using system_clock = std::chrono::system_clock; using time_point = system_clock::time_point; -namespace synergy::license { +namespace deskflow::license { std::string decode(const std::string &hexString); Parts tokenize(const std::string &plainText); @@ -147,4 +147,4 @@ std::optional parseDate(const std::string &unixTimeString) { } } -} // namespace synergy::license +} // namespace deskflow::license diff --git a/src/lib/license/parse_serial_key.h b/src/lib/license/parse_serial_key.h index b34e21041..bbb95aee7 100644 --- a/src/lib/license/parse_serial_key.h +++ b/src/lib/license/parse_serial_key.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include #include -namespace synergy::license { +namespace deskflow::license { class SerialKeyParseError : public std::runtime_error { public: @@ -55,4 +55,4 @@ public: SerialKey parseSerialKey(const std::string &hexString); -} // namespace synergy::license +} // namespace deskflow::license diff --git a/src/lib/mt/CMakeLists.txt b/src/lib/mt/CMakeLists.txt index 671a2768b..e40a45d7b 100644 --- a/src/lib/mt/CMakeLists.txt +++ b/src/lib/mt/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # diff --git a/src/lib/mt/CondVar.cpp b/src/lib/mt/CondVar.cpp index 34f0e645b..152b62adc 100644 --- a/src/lib/mt/CondVar.cpp +++ b/src/lib/mt/CondVar.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/CondVar.h b/src/lib/mt/CondVar.h index 76dfaa183..2a897c816 100644 --- a/src/lib/mt/CondVar.h +++ b/src/lib/mt/CondVar.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Lock.cpp b/src/lib/mt/Lock.cpp index 4806742b1..eacc865eb 100644 --- a/src/lib/mt/Lock.cpp +++ b/src/lib/mt/Lock.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Lock.h b/src/lib/mt/Lock.h index 18efb0648..b8679bc25 100644 --- a/src/lib/mt/Lock.h +++ b/src/lib/mt/Lock.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Mutex.cpp b/src/lib/mt/Mutex.cpp index 79b65a159..55a4d855b 100644 --- a/src/lib/mt/Mutex.cpp +++ b/src/lib/mt/Mutex.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Mutex.h b/src/lib/mt/Mutex.h index dd93b259b..f592f64d5 100644 --- a/src/lib/mt/Mutex.h +++ b/src/lib/mt/Mutex.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Thread.cpp b/src/lib/mt/Thread.cpp index d0148aab7..0d1fbb2ad 100644 --- a/src/lib/mt/Thread.cpp +++ b/src/lib/mt/Thread.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -121,7 +121,7 @@ void *Thread::threadFunc(void *vjob) { result = e.m_result; LOG((CLOG_DEBUG1 "caught exit on thread 0x%08x, result %p", id, result)); } catch (XBase &e) { - LOG((CLOG_ERR "synergy exception on thread 0x%08x: %s", id, e.what())); + LOG((CLOG_ERR "deskflow exception on thread 0x%08x: %s", id, e.what())); delete job; throw; } catch (std::exception &e) { diff --git a/src/lib/mt/Thread.h b/src/lib/mt/Thread.h index c6eddbe7d..7f18e15cf 100644 --- a/src/lib/mt/Thread.h +++ b/src/lib/mt/Thread.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/XMT.cpp b/src/lib/mt/XMT.cpp index ad4b87541..3fd7d5e3d 100644 --- a/src/lib/mt/XMT.cpp +++ b/src/lib/mt/XMT.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/XMT.h b/src/lib/mt/XMT.h index 1c2c5e725..b1ce2ae5e 100644 --- a/src/lib/mt/XMT.h +++ b/src/lib/mt/XMT.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/XThread.h b/src/lib/mt/XThread.h index 18985ff87..ec5cbfb46 100644 --- a/src/lib/mt/XThread.h +++ b/src/lib/mt/XThread.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/CMakeLists.txt b/src/lib/net/CMakeLists.txt index d49645453..74282fd00 100644 --- a/src/lib/net/CMakeLists.txt +++ b/src/lib/net/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # diff --git a/src/lib/net/IDataSocket.cpp b/src/lib/net/IDataSocket.cpp index 51d3092b5..1d4f9f1ad 100644 --- a/src/lib/net/IDataSocket.cpp +++ b/src/lib/net/IDataSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/IDataSocket.h b/src/lib/net/IDataSocket.h index 5561796d9..46fd7c65a 100644 --- a/src/lib/net/IDataSocket.h +++ b/src/lib/net/IDataSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -28,7 +28,7 @@ This interface defines the methods common to all network sockets that represent a full-duplex data stream. */ -class IDataSocket : public ISocket, public synergy::IStream { +class IDataSocket : public ISocket, public deskflow::IStream { public: class ConnectionFailedInfo { public: diff --git a/src/lib/net/IListenSocket.h b/src/lib/net/IListenSocket.h index d64488bfd..b839879cc 100644 --- a/src/lib/net/IListenSocket.h +++ b/src/lib/net/IListenSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/ISocket.h b/src/lib/net/ISocket.h index 0c6f536d9..f23b23460 100644 --- a/src/lib/net/ISocket.h +++ b/src/lib/net/ISocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/ISocketFactory.h b/src/lib/net/ISocketFactory.h index 4e5f84d62..f8de4807d 100644 --- a/src/lib/net/ISocketFactory.h +++ b/src/lib/net/ISocketFactory.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/ISocketMultiplexerJob.h b/src/lib/net/ISocketMultiplexerJob.h index 601592141..dcb795318 100644 --- a/src/lib/net/ISocketMultiplexerJob.h +++ b/src/lib/net/ISocketMultiplexerJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/net/InverseSockets/AutoArchSocket.cpp b/src/lib/net/InverseSockets/AutoArchSocket.cpp index 2972b6adc..becfea65e 100644 --- a/src/lib/net/InverseSockets/AutoArchSocket.cpp +++ b/src/lib/net/InverseSockets/AutoArchSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2022 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/InverseSockets/AutoArchSocket.h b/src/lib/net/InverseSockets/AutoArchSocket.h index ab0db7028..7e99d3dbf 100644 --- a/src/lib/net/InverseSockets/AutoArchSocket.h +++ b/src/lib/net/InverseSockets/AutoArchSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2022 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/InverseSockets/InverseClientSocket.cpp b/src/lib/net/InverseSockets/InverseClientSocket.cpp index 9c2ca6a7a..a5dba7e53 100644 --- a/src/lib/net/InverseSockets/InverseClientSocket.cpp +++ b/src/lib/net/InverseSockets/InverseClientSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2022 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/InverseSockets/InverseClientSocket.h b/src/lib/net/InverseSockets/InverseClientSocket.h index 397279ec6..fd0383df9 100644 --- a/src/lib/net/InverseSockets/InverseClientSocket.h +++ b/src/lib/net/InverseSockets/InverseClientSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2022 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/InverseSockets/InverseServerSocket.cpp b/src/lib/net/InverseSockets/InverseServerSocket.cpp index bfbab395d..c4a447adf 100644 --- a/src/lib/net/InverseSockets/InverseServerSocket.cpp +++ b/src/lib/net/InverseSockets/InverseServerSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2022 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/InverseSockets/InverseServerSocket.h b/src/lib/net/InverseSockets/InverseServerSocket.h index bbbd630b5..f1eb7089f 100644 --- a/src/lib/net/InverseSockets/InverseServerSocket.h +++ b/src/lib/net/InverseSockets/InverseServerSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2022 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/InverseSockets/InverseSocketFactory.cpp b/src/lib/net/InverseSockets/InverseSocketFactory.cpp index 2694304a0..4c4331596 100644 --- a/src/lib/net/InverseSockets/InverseSocketFactory.cpp +++ b/src/lib/net/InverseSockets/InverseSocketFactory.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/InverseSockets/InverseSocketFactory.h b/src/lib/net/InverseSockets/InverseSocketFactory.h index 2fe67e145..d32df6f3f 100644 --- a/src/lib/net/InverseSockets/InverseSocketFactory.h +++ b/src/lib/net/InverseSockets/InverseSocketFactory.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/InverseSockets/SecureClientSocket.cpp b/src/lib/net/InverseSockets/SecureClientSocket.cpp index 10eb6c163..846dda90a 100644 --- a/src/lib/net/InverseSockets/SecureClientSocket.cpp +++ b/src/lib/net/InverseSockets/SecureClientSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/InverseSockets/SecureClientSocket.h b/src/lib/net/InverseSockets/SecureClientSocket.h index 7f6ff15d0..cd3b3a2c7 100644 --- a/src/lib/net/InverseSockets/SecureClientSocket.h +++ b/src/lib/net/InverseSockets/SecureClientSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -65,7 +65,7 @@ private: void handleTCPConnected(const Event &, void *); - synergy::ssl::SslApi m_ssl{false}; + deskflow::ssl::SslApi m_ssl{false}; bool m_secureReady = false; bool m_fatal = false; }; diff --git a/src/lib/net/InverseSockets/SecureServerSocket.cpp b/src/lib/net/InverseSockets/SecureServerSocket.cpp index 49f393d58..4cc253371 100644 --- a/src/lib/net/InverseSockets/SecureServerSocket.cpp +++ b/src/lib/net/InverseSockets/SecureServerSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,10 +18,10 @@ #include "SecureServerSocket.h" #include +#include +#include #include #include -#include -#include // // SecureServerSocket @@ -70,8 +70,8 @@ std::string SecureServerSocket::getCertificateFileName() const { if (certificateFilename.empty()) { // default location of the TLS cert file in users dir - certificateFilename = synergy::string::sprintf( - "%s/SSL/Synergy.pem", ARCH->getProfileDirectory().c_str()); + certificateFilename = deskflow::string::sprintf( + "%s/SSL/Deskflow.pem", ARCH->getProfileDirectory().c_str()); } return certificateFilename; diff --git a/src/lib/net/InverseSockets/SecureServerSocket.h b/src/lib/net/InverseSockets/SecureServerSocket.h index bc150dc9c..e70c90ab1 100644 --- a/src/lib/net/InverseSockets/SecureServerSocket.h +++ b/src/lib/net/InverseSockets/SecureServerSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/InverseSockets/SslApi.cpp b/src/lib/net/InverseSockets/SslApi.cpp index e2e122fac..1d2a56efb 100644 --- a/src/lib/net/InverseSockets/SslApi.cpp +++ b/src/lib/net/InverseSockets/SslApi.cpp @@ -8,7 +8,7 @@ #include #include -namespace synergy { +namespace deskflow { namespace ssl { using AutoX509 = std::unique_ptr; @@ -159,13 +159,13 @@ std::string SslApi::getFingerprint() const { } bool SslApi::isTrustedFingerprint(const std::string &fingerprint) const { - auto trustedServersFilename = synergy::string::sprintf( + auto trustedServersFilename = deskflow::string::sprintf( "%s/SSL/Fingerprints/TrustedServers.txt", ARCH->getProfileDirectory().c_str()); // check if this fingerprint exist std::ifstream file; - file.open(synergy::filesystem::path(trustedServersFilename)); + file.open(deskflow::filesystem::path(trustedServersFilename)); bool isValid = false; if (file.is_open()) { @@ -217,9 +217,9 @@ int SslApi::getErrorCode(int status) const { void SslApi::formatFingerprint(std::string &fingerprint) const { // to hexidecimal - synergy::string::toHex(fingerprint, 2); + deskflow::string::toHex(fingerprint, 2); // all uppercase - synergy::string::uppercase(fingerprint); + deskflow::string::uppercase(fingerprint); // add colon to separate each 2 charactors size_t separators = fingerprint.size() / 2; for (size_t i = 1; i < separators; i++) { @@ -231,7 +231,7 @@ bool SslApi::isCertificateExists(const std::string &filename) const { bool result = (!filename.empty()); if (result) { - std::ifstream file(synergy::filesystem::path(filename)); + std::ifstream file(deskflow::filesystem::path(filename)); result = file.good(); if (!result) { @@ -247,4 +247,4 @@ bool SslApi::isCertificateExists(const std::string &filename) const { } } // namespace ssl -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/net/InverseSockets/SslApi.h b/src/lib/net/InverseSockets/SslApi.h index 8a8e82266..c28a84a2e 100644 --- a/src/lib/net/InverseSockets/SslApi.h +++ b/src/lib/net/InverseSockets/SslApi.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ #include #include -namespace synergy { +namespace deskflow { namespace ssl { class SslApi { @@ -52,4 +52,4 @@ private: }; } // namespace ssl -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/net/InverseSockets/SslLogger.cpp b/src/lib/net/InverseSockets/SslLogger.cpp index dcb3d7ea3..47c406639 100644 --- a/src/lib/net/InverseSockets/SslLogger.cpp +++ b/src/lib/net/InverseSockets/SslLogger.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/InverseSockets/SslLogger.h b/src/lib/net/InverseSockets/SslLogger.h index a5fb2466e..d698b63e7 100644 --- a/src/lib/net/InverseSockets/SslLogger.h +++ b/src/lib/net/InverseSockets/SslLogger.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/NetworkAddress.cpp b/src/lib/net/NetworkAddress.cpp index dc6627333..e96debb6f 100644 --- a/src/lib/net/NetworkAddress.cpp +++ b/src/lib/net/NetworkAddress.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/NetworkAddress.h b/src/lib/net/NetworkAddress.h index 708c77bdd..ad6d15b79 100644 --- a/src/lib/net/NetworkAddress.h +++ b/src/lib/net/NetworkAddress.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/SecureListenSocket.cpp b/src/lib/net/SecureListenSocket.cpp index c38676d39..a0ef2c103 100644 --- a/src/lib/net/SecureListenSocket.cpp +++ b/src/lib/net/SecureListenSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,14 +19,14 @@ #include "SecureSocket.h" #include "arch/XArch.h" +#include "deskflow/ArgParser.h" +#include "deskflow/ArgsBase.h" #include "net/NetworkAddress.h" #include "net/SocketMultiplexer.h" #include "net/TSocketMultiplexerMethodJob.h" -#include "synergy/ArgParser.h" -#include "synergy/ArgsBase.h" static const char s_certificateDir[] = {"SSL"}; -static const char s_certificateFilename[] = {"Synergy.pem"}; +static const char s_certificateFilename[] = {"Deskflow.pem"}; // // SecureListenSocket @@ -49,7 +49,7 @@ IDataSocket *SecureListenSocket::accept() { } // default location of the TLS cert file in users dir - String certificateFilename = synergy::string::sprintf( + String certificateFilename = deskflow::string::sprintf( "%s/%s/%s", ARCH->getProfileDirectory().c_str(), s_certificateDir, s_certificateFilename); diff --git a/src/lib/net/SecureListenSocket.h b/src/lib/net/SecureListenSocket.h index 986393a6a..de15a103e 100644 --- a/src/lib/net/SecureListenSocket.h +++ b/src/lib/net/SecureListenSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp index 2873b595d..739841f14 100644 --- a/src/lib/net/SecureSocket.cpp +++ b/src/lib/net/SecureSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -276,7 +276,7 @@ bool SecureSocket::loadCertificates(String &filename) { SslLogger::logError("tls certificate is not specified"); return false; } else { - std::ifstream file(synergy::filesystem::path(filename)); + std::ifstream file(deskflow::filesystem::path(filename)); bool exist = file.good(); file.close(); @@ -580,11 +580,11 @@ void SecureSocket::formatFingerprint( String &fingerprint, bool hex, bool separator) { if (hex) { // to hexidecimal - synergy::string::toHex(fingerprint, 2); + deskflow::string::toHex(fingerprint, 2); } // all uppercase - synergy::string::uppercase(fingerprint); + deskflow::string::uppercase(fingerprint); if (separator) { // add colon to separate each 2 charactors @@ -620,14 +620,14 @@ bool SecureSocket::verifyCertFingerprint() { LOG((CLOG_NOTE "server fingerprint: %s", fingerprint.c_str())); String trustedServersFilename; - trustedServersFilename = synergy::string::sprintf( + trustedServersFilename = deskflow::string::sprintf( "%s/%s/%s", ARCH->getProfileDirectory().c_str(), kFingerprintDirName, kFingerprintTrustedServersFilename); // check if this fingerprint exist String fileLine; std::ifstream file; - file.open(synergy::filesystem::path(trustedServersFilename)); + file.open(deskflow::filesystem::path(trustedServersFilename)); bool isValid = false; if (file.is_open()) { diff --git a/src/lib/net/SecureSocket.h b/src/lib/net/SecureSocket.h index 75999f077..82d3094c4 100644 --- a/src/lib/net/SecureSocket.h +++ b/src/lib/net/SecureSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/SocketMultiplexer.cpp b/src/lib/net/SocketMultiplexer.cpp index df9125b0f..384854d35 100644 --- a/src/lib/net/SocketMultiplexer.cpp +++ b/src/lib/net/SocketMultiplexer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/net/SocketMultiplexer.h b/src/lib/net/SocketMultiplexer.h index 70f8d291b..ff1d663e8 100644 --- a/src/lib/net/SocketMultiplexer.h +++ b/src/lib/net/SocketMultiplexer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/net/TCPListenSocket.cpp b/src/lib/net/TCPListenSocket.cpp index da389d1c6..9ee35df94 100644 --- a/src/lib/net/TCPListenSocket.cpp +++ b/src/lib/net/TCPListenSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TCPListenSocket.h b/src/lib/net/TCPListenSocket.h index 8a6045098..bf6965596 100644 --- a/src/lib/net/TCPListenSocket.h +++ b/src/lib/net/TCPListenSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TCPSocket.cpp b/src/lib/net/TCPSocket.cpp index 1c0c733c7..f3f4d7494 100644 --- a/src/lib/net/TCPSocket.cpp +++ b/src/lib/net/TCPSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -439,16 +439,16 @@ ISocketMultiplexerJob *TCPSocket::serviceConnecting( // non-blocking stream socket that fails to connect immediately is // reported by select as being writable (i.e. connected) even when // the connection has failed. this is easily demonstrated on OS X - // 10.3.4 by starting a synergy client and telling to connect to - // another system that's not running a synergy server. it will + // 10.3.4 by starting a deskflow client and telling to connect to + // another system that's not running a deskflow server. it will // claim to have connected then quickly disconnect (i guess because - // read returns 0 bytes). unfortunately, synergy attempts to + // read returns 0 bytes). unfortunately, deskflow attempts to // reconnect immediately, the process repeats and we end up // spinning the CPU. luckily, OS X does set SO_ERROR on the // socket correctly when the connection has failed so checking for // errors works. (curiously, sometimes OS X doesn't report // connection refused. when that happens it at least doesn't - // report the socket as being writable so synergy is able to time + // report the socket as being writable so deskflow is able to time // out the attempt.) if (error || true) { try { diff --git a/src/lib/net/TCPSocket.h b/src/lib/net/TCPSocket.h index dca6994d9..a78baa675 100644 --- a/src/lib/net/TCPSocket.h +++ b/src/lib/net/TCPSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TCPSocketFactory.cpp b/src/lib/net/TCPSocketFactory.cpp index 28c265c5b..20afebfa4 100644 --- a/src/lib/net/TCPSocketFactory.cpp +++ b/src/lib/net/TCPSocketFactory.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TCPSocketFactory.h b/src/lib/net/TCPSocketFactory.h index 53287a1b4..05e229b11 100644 --- a/src/lib/net/TCPSocketFactory.h +++ b/src/lib/net/TCPSocketFactory.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TSocketMultiplexerMethodJob.h b/src/lib/net/TSocketMultiplexerMethodJob.h index 7b3eb1ae1..20adb8168 100644 --- a/src/lib/net/TSocketMultiplexerMethodJob.h +++ b/src/lib/net/TSocketMultiplexerMethodJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/net/XSocket.cpp b/src/lib/net/XSocket.cpp index 85ab64787..c68de4aa8 100644 --- a/src/lib/net/XSocket.cpp +++ b/src/lib/net/XSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -50,7 +50,7 @@ String XSocketAddress::getWhat() const throw() { }; return format( s_errorID[m_error], s_errorMsg[m_error], m_hostname.c_str(), - synergy::string::sprintf("%d", m_port).c_str()); + deskflow::string::sprintf("%d", m_port).c_str()); } // diff --git a/src/lib/net/XSocket.h b/src/lib/net/XSocket.h index 5d5c2147c..28c4cc977 100644 --- a/src/lib/net/XSocket.h +++ b/src/lib/net/XSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index 9be8318d0..f90c3682e 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -86,7 +86,7 @@ if(UNIX) io net ipc - synlib + app client ${libs}) diff --git a/src/lib/platform/EiEventQueueBuffer.cpp b/src/lib/platform/EiEventQueueBuffer.cpp index dc5d84939..c3f3d6f09 100644 --- a/src/lib/platform/EiEventQueueBuffer.cpp +++ b/src/lib/platform/EiEventQueueBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -32,7 +32,7 @@ class EventQueueTimer {}; -namespace synergy { +namespace deskflow { EiEventQueueBuffer::EiEventQueueBuffer( EiScreen *screen, ei *ei, IEventQueue *events) @@ -153,4 +153,4 @@ void EiEventQueueBuffer::deleteTimer(EventQueueTimer *timer) const { delete timer; } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/platform/EiEventQueueBuffer.h b/src/lib/platform/EiEventQueueBuffer.h index af4e35024..bef8eea60 100644 --- a/src/lib/platform/EiEventQueueBuffer.h +++ b/src/lib/platform/EiEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -21,16 +21,16 @@ #include "config.h" #include "base/IEventQueueBuffer.h" +#include "deskflow/IScreen.h" #include "mt/Thread.h" #include "platform/EiScreen.h" -#include "synergy/IScreen.h" #include #include #include #include -namespace synergy { +namespace deskflow { //! Event queue buffer for Ei class EiEventQueueBuffer : public IEventQueueBuffer { @@ -56,4 +56,4 @@ private: mutable std::mutex mutex_; }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/platform/EiKeyState.cpp b/src/lib/platform/EiKeyState.cpp index 16013271a..2d4d55d4f 100644 --- a/src/lib/platform/EiKeyState.cpp +++ b/src/lib/platform/EiKeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -19,9 +19,9 @@ #include "platform/EiKeyState.h" #include "base/Log.h" +#include "deskflow/AppUtil.h" +#include "deskflow/ClientApp.h" #include "platform/XWindowsUtil.h" -#include "synergy/AppUtil.h" -#include "synergy/ClientApp.h" #include #include @@ -29,7 +29,7 @@ #include #include -namespace synergy { +namespace deskflow { EiKeyState::EiKeyState(EiScreen *screen, IEventQueue *events) : KeyState( @@ -148,7 +148,7 @@ std::uint32_t EiKeyState::convert_mod_mask(std::uint32_t xkb_mask) const { // check if a modifier changed state and then release it again. // Luckily xkbcommon allows us to do this in a separate state. void EiKeyState::assign_generated_modifiers( - std::uint32_t keycode, synergy::KeyMap::KeyItem &item) { + std::uint32_t keycode, deskflow::KeyMap::KeyItem &item) { std::uint32_t mods_generates = 0; auto state = xkb_state_new(xkb_keymap_); enum xkb_state_component changed = @@ -170,7 +170,7 @@ void EiKeyState::assign_generated_modifiers( item.m_generates = convert_mod_mask(mods_generates); } -void EiKeyState::getKeyMap(synergy::KeyMap &keyMap) { +void EiKeyState::getKeyMap(deskflow::KeyMap &keyMap) { auto min_keycode = xkb_keymap_min_keycode(xkb_keymap_); auto max_keycode = xkb_keymap_max_keycode(xkb_keymap_); @@ -201,7 +201,7 @@ void EiKeyState::getKeyMap(synergy::KeyMap &keyMap) { "multiple keysyms per keycode are not supported, keycode %d", keycode); - synergy::KeyMap::KeyItem item{}; + deskflow::KeyMap::KeyItem item{}; xkb_keysym_t keysym = syms[0]; KeySym sym = static_cast(keysym); item.m_id = XWindowsUtil::mapKeySymToKeyID(sym); @@ -279,4 +279,4 @@ void EiKeyState::update_xkb_state(uint32_t keyval, bool is_pressed) { xkb_state_, keyval, is_pressed ? XKB_KEY_DOWN : XKB_KEY_UP); } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/platform/EiKeyState.h b/src/lib/platform/EiKeyState.h index 9cd651cf4..d894456dc 100644 --- a/src/lib/platform/EiKeyState.h +++ b/src/lib/platform/EiKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -18,14 +18,14 @@ #pragma once +#include "deskflow/KeyState.h" #include "platform/EiScreen.h" -#include "synergy/KeyState.h" struct xkb_context; struct xkb_keymap; struct xkb_state; -namespace synergy { +namespace deskflow { /// A key state for Ei class EiKeyState : public KeyState { @@ -60,4 +60,4 @@ private: xkb_state *xkb_state_ = nullptr; }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/platform/EiScreen.cpp b/src/lib/platform/EiScreen.cpp index acd972000..ac7eb029f 100644 --- a/src/lib/platform/EiScreen.cpp +++ b/src/lib/platform/EiScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -24,11 +24,11 @@ #include "base/Log.h" #include "base/Stopwatch.h" #include "base/TMethodEventJob.h" +#include "deskflow/Clipboard.h" +#include "deskflow/KeyMap.h" +#include "deskflow/XScreen.h" #include "platform/EiEventQueueBuffer.h" #include "platform/EiKeyState.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/XScreen.h" #if WINAPI_LIBPORTAL #include "platform/PortalInputCapture.h" @@ -46,7 +46,7 @@ struct ScrollRemainder { double x, y; // scroll remainder in pixels }; -namespace synergy { +namespace deskflow { EiScreen::EiScreen(bool is_primary, IEventQueue *events, bool use_portal) : PlatformScreen(events), @@ -141,7 +141,7 @@ void EiScreen::init_ei() { ei_set_user_data(ei_, this); ei_log_set_priority(ei_, EI_LOG_PRIORITY_DEBUG); ei_log_set_handler(ei_, cb_handle_ei_log_event); - ei_configure_name(ei_, "synergy client"); + ei_configure_name(ei_, "deskflow client"); // install the platform event queue events_->adoptBuffer(nullptr); @@ -296,7 +296,7 @@ void EiScreen::fakeMouseWheel(int32_t xDelta, int32_t yDelta) const { if (!ei_pointer_) return; - // libei and synergy seem to use opposite directions, so we have + // libei and deskflow seem to use opposite directions, so we have // to send EI the opposite of the value received if we want to remain // compatible with other platforms (including X11). ei_device_scroll_discrete(ei_pointer_, -xDelta, -yDelta); @@ -615,7 +615,7 @@ void EiScreen::on_pointer_scroll_event(ei_event *event) { assert(!std::isnan(x) && !std::isinf(x)); assert(!std::isnan(y) && !std::isinf(y)); - // libei and synergy seem to use opposite directions, so we have + // libei and deskflow seem to use opposite directions, so we have // to send the opposite of the value reported by EI if we want to // remain compatible with other platforms (including X11). if (x != 0 || y != 0) @@ -630,7 +630,7 @@ void EiScreen::on_pointer_scroll_event(ei_event *event) { } void EiScreen::on_pointer_scroll_discrete_event(ei_event *event) { - // both libei and synergy use multiples of 120 to represent + // both libei and deskflow use multiples of 120 to represent // one scroll wheel click event so we can just forward things // as-is. @@ -641,7 +641,7 @@ void EiScreen::on_pointer_scroll_discrete_event(ei_event *event) { LOG_DEBUG1("event: scroll discrete (%d, %d)", dx, dy); - // libei and synergy seem to use opposite directions, so we have + // libei and deskflow seem to use opposite directions, so we have // to send the opposite of the value reported by EI if we want to // remain compatible with other platforms (including X11). sendEvent(events_->forIPrimaryScreen().wheel(), WheelInfo::alloc(-dx, -dy)); @@ -847,4 +847,4 @@ std::uint32_t EiScreen::HotKeySet::find_by_mask(std::uint32_t mask) const { return 0; } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/platform/EiScreen.h b/src/lib/platform/EiScreen.h index 973b16f2d..82ecaab92 100644 --- a/src/lib/platform/EiScreen.h +++ b/src/lib/platform/EiScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -19,8 +19,8 @@ #pragma once #include "config.h" -#include "synergy/KeyMap.h" -#include "synergy/PlatformScreen.h" +#include "deskflow/KeyMap.h" +#include "deskflow/PlatformScreen.h" #include #include @@ -32,7 +32,7 @@ struct ei_event; struct ei_seat; struct ei_device; -namespace synergy { +namespace deskflow { class EiClipboard; class EiKeyState; @@ -198,4 +198,4 @@ private: HotKeyMap hotkeys_; }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/platform/IMSWindowsClipboardFacade.h b/src/lib/platform/IMSWindowsClipboardFacade.h index f815af811..667836b56 100644 --- a/src/lib/platform/IMSWindowsClipboardFacade.h +++ b/src/lib/platform/IMSWindowsClipboardFacade.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/IOSXKeyResource.cpp b/src/lib/platform/IOSXKeyResource.cpp index 1e010b35d..9b7eb0975 100644 --- a/src/lib/platform/IOSXKeyResource.cpp +++ b/src/lib/platform/IOSXKeyResource.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/IOSXKeyResource.h b/src/lib/platform/IOSXKeyResource.h index 6f0a07159..2d6db36e0 100644 --- a/src/lib/platform/IOSXKeyResource.h +++ b/src/lib/platform/IOSXKeyResource.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "deskflow/KeyState.h" class IOSXKeyResource : public IInterface { public: diff --git a/src/lib/platform/MSWindowsClipboard.cpp b/src/lib/platform/MSWindowsClipboard.cpp index eff22a1c6..96031002e 100644 --- a/src/lib/platform/MSWindowsClipboard.cpp +++ b/src/lib/platform/MSWindowsClipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -78,7 +78,7 @@ bool MSWindowsClipboard::empty() { return false; } - // mark clipboard as being owned by synergy + // mark clipboard as being owned by deskflow HGLOBAL data = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, 1); if (NULL == SetClipboardData(getOwnershipFormat(), data)) { LOG((CLOG_DEBUG "failed to set clipboard data")); @@ -194,10 +194,10 @@ void MSWindowsClipboard::clearConverters() { m_converters.clear(); } -bool MSWindowsClipboard::isOwnedBySynergy() { +bool MSWindowsClipboard::isOwnedByDeskflow() { // create ownership format if we haven't yet if (s_ownershipFormat == 0) { - s_ownershipFormat = RegisterClipboardFormat(TEXT("SynergyOwnership")); + s_ownershipFormat = RegisterClipboardFormat(TEXT("DeskflowOwnership")); } return (IsClipboardFormatAvailable(getOwnershipFormat()) != 0); } @@ -205,7 +205,7 @@ bool MSWindowsClipboard::isOwnedBySynergy() { UINT MSWindowsClipboard::getOwnershipFormat() { // create ownership format if we haven't yet if (s_ownershipFormat == 0) { - s_ownershipFormat = RegisterClipboardFormat(TEXT("SynergyOwnership")); + s_ownershipFormat = RegisterClipboardFormat(TEXT("DeskflowOwnership")); } // return the format diff --git a/src/lib/platform/MSWindowsClipboard.h b/src/lib/platform/MSWindowsClipboard.h index b96716cd8..fd5ce9844 100644 --- a/src/lib/platform/MSWindowsClipboard.h +++ b/src/lib/platform/MSWindowsClipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,8 +19,8 @@ #pragma once #include "common/stdvector.h" +#include "deskflow/IClipboard.h" #include "platform/MSWindowsClipboardFacade.h" -#include "synergy/IClipboard.h" #define WIN32_LEAN_AND_MEAN #include @@ -41,17 +41,17 @@ public: This must be called between a successful open() and close(). Return false if the clipboard ownership could not be taken; the clipboard should not be emptied in this case. Unlike - empty(), isOwnedBySynergy() will return false when emptied - this way. This is useful when synergy wants to put data on + empty(), isOwnedByDeskflow() will return false when emptied + this way. This is useful when deskflow wants to put data on clipboard but pretend (to itself) that some other app did it. - When using empty(), synergy assumes the data came from the + When using empty(), deskflow assumes the data came from the server and doesn't need to be sent back. emptyUnowned() - makes synergy send the data to the server. + makes deskflow send the data to the server. */ bool emptyUnowned(); - //! Test if clipboard is owned by synergy - static bool isOwnedBySynergy(); + //! Test if clipboard is owned by deskflow + static bool isOwnedByDeskflow(); // IClipboard overrides virtual bool empty(); diff --git a/src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp b/src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp index 8d5d77065..65c6bdd47 100644 --- a/src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp +++ b/src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardAnyTextConverter.h b/src/lib/platform/MSWindowsClipboardAnyTextConverter.h index 6fccd01f0..af854adb7 100644 --- a/src/lib/platform/MSWindowsClipboardAnyTextConverter.h +++ b/src/lib/platform/MSWindowsClipboardAnyTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp b/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp index 54d8c2c2f..bfac10b22 100644 --- a/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp +++ b/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardBitmapConverter.h b/src/lib/platform/MSWindowsClipboardBitmapConverter.h index 4863bfba3..d32cc47fe 100644 --- a/src/lib/platform/MSWindowsClipboardBitmapConverter.h +++ b/src/lib/platform/MSWindowsClipboardBitmapConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardFacade.cpp b/src/lib/platform/MSWindowsClipboardFacade.cpp index f57d65691..e1a048f4b 100644 --- a/src/lib/platform/MSWindowsClipboardFacade.cpp +++ b/src/lib/platform/MSWindowsClipboardFacade.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardFacade.h b/src/lib/platform/MSWindowsClipboardFacade.h index 82a517328..274ce08f4 100644 --- a/src/lib/platform/MSWindowsClipboardFacade.h +++ b/src/lib/platform/MSWindowsClipboardFacade.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -20,7 +20,7 @@ #include "platform/IMSWindowsClipboardFacade.h" -#include "synergy/IClipboard.h" +#include "deskflow/IClipboard.h" class MSWindowsClipboardFacade : public IMSWindowsClipboardFacade { public: diff --git a/src/lib/platform/MSWindowsClipboardHTMLConverter.cpp b/src/lib/platform/MSWindowsClipboardHTMLConverter.cpp index 221d2f49b..fe1c81d4f 100644 --- a/src/lib/platform/MSWindowsClipboardHTMLConverter.cpp +++ b/src/lib/platform/MSWindowsClipboardHTMLConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -57,13 +57,13 @@ MSWindowsClipboardHTMLConverter::doFromIClipboard(const String &data) const { prefix.replace( prefix.find("XXXXXXXXXX"), 10, - synergy::string::sprintf("%010u", StartFragment)); + deskflow::string::sprintf("%010u", StartFragment)); prefix.replace( prefix.find("YYYYYYYYYY"), 10, - synergy::string::sprintf("%010u", EndFragment)); + deskflow::string::sprintf("%010u", EndFragment)); prefix.replace( prefix.find("ZZZZZZZZZZ"), 10, - synergy::string::sprintf("%010u", EndHTML)); + deskflow::string::sprintf("%010u", EndHTML)); // concatenate prefix += data; diff --git a/src/lib/platform/MSWindowsClipboardHTMLConverter.h b/src/lib/platform/MSWindowsClipboardHTMLConverter.h index 75b5a343e..71406acf4 100644 --- a/src/lib/platform/MSWindowsClipboardHTMLConverter.h +++ b/src/lib/platform/MSWindowsClipboardHTMLConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardTextConverter.cpp b/src/lib/platform/MSWindowsClipboardTextConverter.cpp index 0d04692a1..4d5f4f864 100644 --- a/src/lib/platform/MSWindowsClipboardTextConverter.cpp +++ b/src/lib/platform/MSWindowsClipboardTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardTextConverter.h b/src/lib/platform/MSWindowsClipboardTextConverter.h index 6b1e9dd0d..0f98a2bdf 100644 --- a/src/lib/platform/MSWindowsClipboardTextConverter.h +++ b/src/lib/platform/MSWindowsClipboardTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp b/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp index b41f9bc17..388287ea8 100644 --- a/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp +++ b/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardUTF16Converter.h b/src/lib/platform/MSWindowsClipboardUTF16Converter.h index f80e733a1..8407bb724 100644 --- a/src/lib/platform/MSWindowsClipboardUTF16Converter.h +++ b/src/lib/platform/MSWindowsClipboardUTF16Converter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsDebugOutputter.cpp b/src/lib/platform/MSWindowsDebugOutputter.cpp index f5730e8ab..e8b7a8dfd 100644 --- a/src/lib/platform/MSWindowsDebugOutputter.cpp +++ b/src/lib/platform/MSWindowsDebugOutputter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/platform/MSWindowsDebugOutputter.h b/src/lib/platform/MSWindowsDebugOutputter.h index 84a94b140..ac0d197d1 100644 --- a/src/lib/platform/MSWindowsDebugOutputter.h +++ b/src/lib/platform/MSWindowsDebugOutputter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp index 28a63592a..7f5fadf80 100644 --- a/src/lib/platform/MSWindowsDesks.cpp +++ b/src/lib/platform/MSWindowsDesks.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -24,13 +24,13 @@ #include "base/Log.h" #include "base/TMethodEventJob.h" #include "base/TMethodJob.h" +#include "deskflow/IScreenSaver.h" +#include "deskflow/XScreen.h" +#include "deskflow/win32/AppUtilWindows.h" #include "mt/Lock.h" #include "mt/Thread.h" #include "platform/MSWindowsScreen.h" -#include "platform/synwinhk.h" -#include "synergy/IScreenSaver.h" -#include "synergy/XScreen.h" -#include "synergy/win32/AppUtilWindows.h" +#include "platform/dfwhook.h" #include @@ -64,29 +64,29 @@ #endif // ; -#define SYNERGY_MSG_SWITCH SYNERGY_HOOK_LAST_MSG + 1 +#define DESKFLOW_MSG_SWITCH DESKFLOW_HOOK_LAST_MSG + 1 // ; -#define SYNERGY_MSG_ENTER SYNERGY_HOOK_LAST_MSG + 2 +#define DESKFLOW_MSG_ENTER DESKFLOW_HOOK_LAST_MSG + 2 // ; -#define SYNERGY_MSG_LEAVE SYNERGY_HOOK_LAST_MSG + 3 +#define DESKFLOW_MSG_LEAVE DESKFLOW_HOOK_LAST_MSG + 3 // wParam = flags, HIBYTE(lParam) = virtual key, LOBYTE(lParam) = scan code -#define SYNERGY_MSG_FAKE_KEY SYNERGY_HOOK_LAST_MSG + 4 +#define DESKFLOW_MSG_FAKE_KEY DESKFLOW_HOOK_LAST_MSG + 4 // flags, XBUTTON id -#define SYNERGY_MSG_FAKE_BUTTON SYNERGY_HOOK_LAST_MSG + 5 +#define DESKFLOW_MSG_FAKE_BUTTON DESKFLOW_HOOK_LAST_MSG + 5 // x; y -#define SYNERGY_MSG_FAKE_MOVE SYNERGY_HOOK_LAST_MSG + 6 +#define DESKFLOW_MSG_FAKE_MOVE DESKFLOW_HOOK_LAST_MSG + 6 // xDelta; yDelta -#define SYNERGY_MSG_FAKE_WHEEL SYNERGY_HOOK_LAST_MSG + 7 +#define DESKFLOW_MSG_FAKE_WHEEL DESKFLOW_HOOK_LAST_MSG + 7 // POINT*; -#define SYNERGY_MSG_CURSOR_POS SYNERGY_HOOK_LAST_MSG + 8 +#define DESKFLOW_MSG_CURSOR_POS DESKFLOW_HOOK_LAST_MSG + 8 // IKeyState*; -#define SYNERGY_MSG_SYNC_KEYS SYNERGY_HOOK_LAST_MSG + 9 +#define DESKFLOW_MSG_SYNC_KEYS DESKFLOW_HOOK_LAST_MSG + 9 // install; -#define SYNERGY_MSG_SCREENSAVER SYNERGY_HOOK_LAST_MSG + 10 +#define DESKFLOW_MSG_SCREENSAVER DESKFLOW_HOOK_LAST_MSG + 10 // dx; dy -#define SYNERGY_MSG_FAKE_REL_MOVE SYNERGY_HOOK_LAST_MSG + 11 +#define DESKFLOW_MSG_FAKE_REL_MOVE DESKFLOW_HOOK_LAST_MSG + 11 // enable; -#define SYNERGY_MSG_FAKE_INPUT SYNERGY_HOOK_LAST_MSG + 12 +#define DESKFLOW_MSG_FAKE_INPUT DESKFLOW_HOOK_LAST_MSG + 12 static void send_keyboard_input(WORD wVk, WORD wScan, DWORD dwFlags) { INPUT inp; @@ -186,10 +186,10 @@ void MSWindowsDesks::disable() { m_isOnScreen = m_isPrimary; } -void MSWindowsDesks::enter() { sendMessage(SYNERGY_MSG_ENTER, 0, 0); } +void MSWindowsDesks::enter() { sendMessage(DESKFLOW_MSG_ENTER, 0, 0); } void MSWindowsDesks::leave(HKL keyLayout) { - sendMessage(SYNERGY_MSG_LEAVE, (WPARAM)keyLayout, 0); + sendMessage(DESKFLOW_MSG_LEAVE, (WPARAM)keyLayout, 0); } void MSWindowsDesks::resetOptions() { m_leaveForegroundOption = false; } @@ -205,7 +205,7 @@ void MSWindowsDesks::setOptions(const OptionsList &options) { } } -void MSWindowsDesks::updateKeys() { sendMessage(SYNERGY_MSG_SYNC_KEYS, 0, 0); } +void MSWindowsDesks::updateKeys() { sendMessage(DESKFLOW_MSG_SYNC_KEYS, 0, 0); } void MSWindowsDesks::setShape( SInt32 x, SInt32 y, SInt32 width, SInt32 height, SInt32 xCenter, @@ -222,28 +222,28 @@ void MSWindowsDesks::setShape( void MSWindowsDesks::installScreensaverHooks(bool install) { if (m_isPrimary && m_screensaverNotify != install) { m_screensaverNotify = install; - sendMessage(SYNERGY_MSG_SCREENSAVER, install, 0); + sendMessage(DESKFLOW_MSG_SCREENSAVER, install, 0); } } void MSWindowsDesks::fakeInputBegin() { - sendMessage(SYNERGY_MSG_FAKE_INPUT, 1, 0); + sendMessage(DESKFLOW_MSG_FAKE_INPUT, 1, 0); } void MSWindowsDesks::fakeInputEnd() { - sendMessage(SYNERGY_MSG_FAKE_INPUT, 0, 0); + sendMessage(DESKFLOW_MSG_FAKE_INPUT, 0, 0); } void MSWindowsDesks::getCursorPos(SInt32 &x, SInt32 &y) const { POINT pos; - sendMessage(SYNERGY_MSG_CURSOR_POS, reinterpret_cast(&pos), 0); + sendMessage(DESKFLOW_MSG_CURSOR_POS, reinterpret_cast(&pos), 0); x = pos.x; y = pos.y; } void MSWindowsDesks::fakeKeyEvent( WORD virtualKey, WORD scanCode, DWORD flags, bool /*isAutoRepeat*/) const { - sendMessage(SYNERGY_MSG_FAKE_KEY, flags, MAKELPARAM(scanCode, virtualKey)); + sendMessage(DESKFLOW_MSG_FAKE_KEY, flags, MAKELPARAM(scanCode, virtualKey)); } void MSWindowsDesks::fakeMouseButton(ButtonID button, bool press) { @@ -294,22 +294,22 @@ void MSWindowsDesks::fakeMouseButton(ButtonID button, bool press) { } // do it - sendMessage(SYNERGY_MSG_FAKE_BUTTON, flags, data); + sendMessage(DESKFLOW_MSG_FAKE_BUTTON, flags, data); } void MSWindowsDesks::fakeMouseMove(SInt32 x, SInt32 y) const { sendMessage( - SYNERGY_MSG_FAKE_MOVE, static_cast(x), static_cast(y)); + DESKFLOW_MSG_FAKE_MOVE, static_cast(x), static_cast(y)); } void MSWindowsDesks::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const { sendMessage( - SYNERGY_MSG_FAKE_REL_MOVE, static_cast(dx), + DESKFLOW_MSG_FAKE_REL_MOVE, static_cast(dx), static_cast(dy)); } void MSWindowsDesks::fakeMouseWheel(SInt32 xDelta, SInt32 yDelta) const { - sendMessage(SYNERGY_MSG_FAKE_WHEEL, xDelta, yDelta); + sendMessage(DESKFLOW_MSG_FAKE_WHEEL, xDelta, yDelta); } void MSWindowsDesks::sendMessage(UINT msg, WPARAM wParam, LPARAM lParam) const { @@ -354,7 +354,7 @@ ATOM MSWindowsDesks::createDeskWindowClass(bool isPrimary) const { classInfo.hCursor = m_cursor; classInfo.hbrBackground = NULL; classInfo.lpszMenuName = NULL; - classInfo.lpszClassName = "SynergyDesk"; + classInfo.lpszClassName = "DeskflowDesk"; classInfo.hIconSm = NULL; return RegisterClassEx(&classInfo); } @@ -430,7 +430,7 @@ void MSWindowsDesks::deskMouseRelativeMove(SInt32 dx, SInt32 dy) const { // restore acceleration. there's a slight chance we'll end up in // the wrong place if the user moves the cursor using this system's // mouse while simultaneously moving the mouse on the server - // system. that defeats the purpose of synergy so we'll assume + // system. that defeats the purpose of deskflow so we'll assume // that won't happen. even if it does, the next mouse move will // correct the position. @@ -513,7 +513,7 @@ void MSWindowsDesks::deskLeave(Desk *desk, HKL keyLayout) { // if not using low-level hooks we have to also activate the // window to ensure we don't lose keyboard focus. // FIXME -- see if this can be avoided. if so then always - // disable the window (see handling of SYNERGY_MSG_SWITCH). + // disable the window (see handling of DESKFLOW_MSG_SWITCH). if (!desk->m_lowLevel) { SetActiveWindow(desk->m_window); } @@ -573,7 +573,7 @@ void MSWindowsDesks::deskThread(void *vdesk) { // create a window. we use this window to hide the cursor. try { - desk->m_window = createWindow(m_deskClass, "SynergyDesk"); + desk->m_window = createWindow(m_deskClass, "DeskflowDesk"); LOG( (CLOG_DEBUG "desk %s window is 0x%08x", desk->m_name.c_str(), desk->m_window)); @@ -597,7 +597,7 @@ void MSWindowsDesks::deskThread(void *vdesk) { DispatchMessage(&msg); continue; - case SYNERGY_MSG_SWITCH: + case DESKFLOW_MSG_SWITCH: if (!m_noHooks) { MSWindowsHook::uninstall(); if (m_screensaverNotify) { @@ -626,47 +626,47 @@ void MSWindowsDesks::deskThread(void *vdesk) { } break; - case SYNERGY_MSG_ENTER: + case DESKFLOW_MSG_ENTER: m_isOnScreen = true; deskEnter(desk); break; - case SYNERGY_MSG_LEAVE: + case DESKFLOW_MSG_LEAVE: m_isOnScreen = false; m_keyLayout = (HKL)msg.wParam; deskLeave(desk, m_keyLayout); break; - case SYNERGY_MSG_FAKE_KEY: + case DESKFLOW_MSG_FAKE_KEY: // Note, this is intended to be HI/LOWORD and not HI/LOBYTE send_keyboard_input( HIWORD(msg.lParam), LOWORD(msg.lParam), (DWORD)msg.wParam); break; - case SYNERGY_MSG_FAKE_BUTTON: + case DESKFLOW_MSG_FAKE_BUTTON: if (msg.wParam != 0) { send_mouse_input((DWORD)msg.wParam, 0, 0, (DWORD)msg.lParam); } break; - case SYNERGY_MSG_FAKE_MOVE: + case DESKFLOW_MSG_FAKE_MOVE: deskMouseMove( static_cast(msg.wParam), static_cast(msg.lParam)); break; - case SYNERGY_MSG_FAKE_REL_MOVE: + case DESKFLOW_MSG_FAKE_REL_MOVE: deskMouseRelativeMove( static_cast(msg.wParam), static_cast(msg.lParam)); break; - case SYNERGY_MSG_FAKE_WHEEL: + case DESKFLOW_MSG_FAKE_WHEEL: // XXX -- add support for x-axis scrolling if (msg.lParam != 0) { send_mouse_input(MOUSEEVENTF_WHEEL, 0, 0, (DWORD)msg.lParam); } break; - case SYNERGY_MSG_CURSOR_POS: { + case DESKFLOW_MSG_CURSOR_POS: { POINT *pos = reinterpret_cast(msg.wParam); if (!GetCursorPos(pos)) { pos->x = m_xCenter; @@ -675,11 +675,11 @@ void MSWindowsDesks::deskThread(void *vdesk) { break; } - case SYNERGY_MSG_SYNC_KEYS: + case DESKFLOW_MSG_SYNC_KEYS: m_updateKeys->run(); break; - case SYNERGY_MSG_SCREENSAVER: + case DESKFLOW_MSG_SCREENSAVER: if (!m_noHooks) { if (msg.wParam != 0) { MSWindowsHook::installScreenSaver(); @@ -689,10 +689,10 @@ void MSWindowsDesks::deskThread(void *vdesk) { } break; - case SYNERGY_MSG_FAKE_INPUT: + case DESKFLOW_MSG_FAKE_INPUT: send_keyboard_input( - SYNERGY_HOOK_FAKE_INPUT_VIRTUAL_KEY, SYNERGY_HOOK_FAKE_INPUT_SCANCODE, - msg.wParam ? 0 : KEYEVENTF_KEYUP); + DESKFLOW_HOOK_FAKE_INPUT_VIRTUAL_KEY, + DESKFLOW_HOOK_FAKE_INPUT_SCANCODE, msg.wParam ? 0 : KEYEVENTF_KEYUP); break; } @@ -772,7 +772,7 @@ void MSWindowsDesks::checkDesk() { // show cursor on previous desk bool wasOnScreen = m_isOnScreen; if (!wasOnScreen) { - sendMessage(SYNERGY_MSG_ENTER, 0, 0); + sendMessage(DESKFLOW_MSG_ENTER, 0, 0); } // check for desk accessibility change. we don't get events @@ -794,11 +794,11 @@ void MSWindowsDesks::checkDesk() { // switch desk m_activeDesk = desk; m_activeDeskName = name; - sendMessage(SYNERGY_MSG_SWITCH, 0, 0); + sendMessage(DESKFLOW_MSG_SWITCH, 0, 0); // hide cursor on new desk if (!wasOnScreen) { - sendMessage(SYNERGY_MSG_LEAVE, (WPARAM)m_keyLayout, 0); + sendMessage(DESKFLOW_MSG_LEAVE, (WPARAM)m_keyLayout, 0); } // update keys if necessary @@ -807,7 +807,7 @@ void MSWindowsDesks::checkDesk() { } } else if (name != m_activeDeskName) { // screen saver might have started - PostThreadMessage(m_threadID, SYNERGY_MSG_SCREEN_SAVER, TRUE, 0); + PostThreadMessage(m_threadID, DESKFLOW_MSG_SCREEN_SAVER, TRUE, 0); } } @@ -833,7 +833,7 @@ void MSWindowsDesks::handleCheckDesk(const Event &, void *) { if (m_isPrimary) { BOOL running; SystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0, &running, FALSE); - PostThreadMessage(m_threadID, SYNERGY_MSG_SCREEN_SAVER, running, 0); + PostThreadMessage(m_threadID, DESKFLOW_MSG_SCREEN_SAVER, running, 0); } } diff --git a/src/lib/platform/MSWindowsDesks.h b/src/lib/platform/MSWindowsDesks.h index cce464bef..edadfa072 100644 --- a/src/lib/platform/MSWindowsDesks.h +++ b/src/lib/platform/MSWindowsDesks.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -20,12 +20,12 @@ #include "base/String.h" #include "common/stdmap.h" +#include "deskflow/key_types.h" +#include "deskflow/mouse_types.h" +#include "deskflow/option_types.h" #include "mt/CondVar.h" #include "mt/Mutex.h" -#include "platform/synwinhk.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/option_types.h" +#include "platform/dfwhook.h" #define WIN32_LEAN_AND_MEAN #include @@ -46,9 +46,9 @@ desk at a time, you can't switch desks if the thread has any hooks installed or owns any windows, windows cannot exist on multiple desks at once, etc. Basically, they're useless except for running the login window or the screensaver, which is what they're used -for. Synergy must deal with them mainly because of the login +for. Deskflow must deal with them mainly because of the login window and screensaver but users can create their own desks and -synergy should work on those too. +deskflow should work on those too. This class encapsulates all the desk nastiness. Clients of this object don't have to know anything about desks. diff --git a/src/lib/platform/MSWindowsDropTarget.cpp b/src/lib/platform/MSWindowsDropTarget.cpp index 2f5c16bce..60abc9f31 100644 --- a/src/lib/platform/MSWindowsDropTarget.cpp +++ b/src/lib/platform/MSWindowsDropTarget.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/MSWindowsDropTarget.h b/src/lib/platform/MSWindowsDropTarget.h index 8acf8cc2a..c12c6faf7 100644 --- a/src/lib/platform/MSWindowsDropTarget.h +++ b/src/lib/platform/MSWindowsDropTarget.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/MSWindowsEventQueueBuffer.cpp b/src/lib/platform/MSWindowsEventQueueBuffer.cpp index 332b34d42..86fcf344b 100644 --- a/src/lib/platform/MSWindowsEventQueueBuffer.cpp +++ b/src/lib/platform/MSWindowsEventQueueBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -38,7 +38,7 @@ MSWindowsEventQueueBuffer::MSWindowsEventQueueBuffer(IEventQueue *events) m_thread = GetCurrentThreadId(); // create a message type for custom events - m_userEvent = RegisterWindowMessage("SYNERGY_USER_EVENT"); + m_userEvent = RegisterWindowMessage("DESKFLOW_USER_EVENT"); // get message type for daemon quit m_daemonQuit = ArchMiscWindows::getDaemonQuitMessage(); diff --git a/src/lib/platform/MSWindowsEventQueueBuffer.h b/src/lib/platform/MSWindowsEventQueueBuffer.h index e87c81271..d340e8934 100644 --- a/src/lib/platform/MSWindowsEventQueueBuffer.h +++ b/src/lib/platform/MSWindowsEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsHook.cpp b/src/lib/platform/MSWindowsHook.cpp index faa75b3c2..5d92ab715 100644 --- a/src/lib/platform/MSWindowsHook.cpp +++ b/src/lib/platform/MSWindowsHook.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * @@ -18,10 +18,10 @@ #include "platform/MSWindowsHook.h" #include "base/Log.h" -#include "synergy/XScreen.h" -#include "synergy/protocol_types.h" +#include "deskflow/XScreen.h" +#include "deskflow/protocol_types.h" -static const char *g_name = "synwinhk"; +static const char *g_name = "dfwhook"; static DWORD g_processID = 0; static DWORD g_threadID = 0; @@ -209,12 +209,12 @@ static bool keyboardHookHandler(WPARAM wParam, LPARAM lParam) { // passing events through and not report them to the server. this // is used to allow the server to synthesize events locally but // not pick them up as user events. - if (wParam == SYNERGY_HOOK_FAKE_INPUT_VIRTUAL_KEY && - ((lParam >> 16) & 0xffu) == SYNERGY_HOOK_FAKE_INPUT_SCANCODE) { + if (wParam == DESKFLOW_HOOK_FAKE_INPUT_VIRTUAL_KEY && + ((lParam >> 16) & 0xffu) == DESKFLOW_HOOK_FAKE_INPUT_SCANCODE) { // update flag g_fakeServerInput = ((lParam & 0x80000000u) == 0); PostThreadMessage( - g_threadID, SYNERGY_MSG_DEBUG, 0xff000000u | wParam, lParam); + g_threadID, DESKFLOW_MSG_DEBUG, 0xff000000u | wParam, lParam); // discard event return true; @@ -224,7 +224,7 @@ static bool keyboardHookHandler(WPARAM wParam, LPARAM lParam) { // and do not forward to the server if (g_fakeServerInput) { PostThreadMessage( - g_threadID, SYNERGY_MSG_DEBUG, 0xfe000000u | wParam, lParam); + g_threadID, DESKFLOW_MSG_DEBUG, 0xfe000000u | wParam, lParam); return false; } @@ -235,14 +235,14 @@ static bool keyboardHookHandler(WPARAM wParam, LPARAM lParam) { } // tell server about event - PostThreadMessage(g_threadID, SYNERGY_MSG_DEBUG, wParam, lParam); + PostThreadMessage(g_threadID, DESKFLOW_MSG_DEBUG, wParam, lParam); // ignore dead key release if ((g_deadVirtKey == wParam || g_deadRelease == wParam) && (lParam & 0x80000000u) != 0) { g_deadRelease = 0; PostThreadMessage( - g_threadID, SYNERGY_MSG_DEBUG, wParam | 0x04000000, lParam); + g_threadID, DESKFLOW_MSG_DEBUG, wParam | 0x04000000, lParam); return false; } @@ -304,14 +304,14 @@ static bool keyboardHookHandler(WPARAM wParam, LPARAM lParam) { // if mapping failed and ctrl and alt are pressed then try again // with both not pressed. this handles the case where ctrl and // alt are being used as individual modifiers rather than AltGr. - // we note that's the case in the message sent back to synergy + // we note that's the case in the message sent back to deskflow // because there's no simple way to deduce it after the fact. // we have to put the dead key back first, if there was one. bool noAltGr = false; if (n == 0 && (control & 0x80) != 0 && (menu & 0x80) != 0) { noAltGr = true; PostThreadMessage( - g_threadID, SYNERGY_MSG_DEBUG, wParam | 0x05000000, lParam); + g_threadID, DESKFLOW_MSG_DEBUG, wParam | 0x05000000, lParam); setDeadKey(wc, 2, flags); BYTE keys2[256]; @@ -328,7 +328,7 @@ static bool keyboardHookHandler(WPARAM wParam, LPARAM lParam) { } PostThreadMessage( - g_threadID, SYNERGY_MSG_DEBUG, + g_threadID, DESKFLOW_MSG_DEBUG, (wc[0] & 0xffff) | ((wParam & 0xff) << 16) | ((n & 0xf) << 24) | 0x60000000, lParam); @@ -370,10 +370,10 @@ static bool keyboardHookHandler(WPARAM wParam, LPARAM lParam) { // and release for the dead key to our window. WPARAM deadCharAndVirtKey = makeKeyMsg((UINT)g_deadVirtKey, wc[0], noAltGr); PostThreadMessage( - g_threadID, SYNERGY_MSG_KEY, deadCharAndVirtKey, + g_threadID, DESKFLOW_MSG_KEY, deadCharAndVirtKey, g_deadLParam & 0x7fffffffu); PostThreadMessage( - g_threadID, SYNERGY_MSG_KEY, deadCharAndVirtKey, + g_threadID, DESKFLOW_MSG_KEY, deadCharAndVirtKey, g_deadLParam | 0x80000000u); // use uncomposed character @@ -404,8 +404,8 @@ static bool keyboardHookHandler(WPARAM wParam, LPARAM lParam) { // forwarding. if (charAndVirtKey != 0) { PostThreadMessage( - g_threadID, SYNERGY_MSG_DEBUG, charAndVirtKey | 0x07000000, lParam); - PostThreadMessage(g_threadID, SYNERGY_MSG_KEY, charAndVirtKey, lParam); + g_threadID, DESKFLOW_MSG_DEBUG, charAndVirtKey | 0x07000000, lParam); + PostThreadMessage(g_threadID, DESKFLOW_MSG_KEY, charAndVirtKey, lParam); } if (g_mode == kHOOK_RELAY_EVENTS) { @@ -505,13 +505,13 @@ static bool mouseHookHandler(WPARAM wParam, SInt32 x, SInt32 y, SInt32 data) { case WM_NCRBUTTONUP: case WM_NCXBUTTONUP: // always relay the event. eat it if relaying. - PostThreadMessage(g_threadID, SYNERGY_MSG_MOUSE_BUTTON, wParam, data); + PostThreadMessage(g_threadID, DESKFLOW_MSG_MOUSE_BUTTON, wParam, data); return (g_mode == kHOOK_RELAY_EVENTS); case WM_MOUSEWHEEL: if (g_mode == kHOOK_RELAY_EVENTS) { // relay event - PostThreadMessage(g_threadID, SYNERGY_MSG_MOUSE_WHEEL, data, 0); + PostThreadMessage(g_threadID, DESKFLOW_MSG_MOUSE_WHEEL, data, 0); } return (g_mode == kHOOK_RELAY_EVENTS); @@ -519,7 +519,7 @@ static bool mouseHookHandler(WPARAM wParam, SInt32 x, SInt32 y, SInt32 data) { case WM_MOUSEMOVE: if (g_mode == kHOOK_RELAY_EVENTS) { // relay and eat event - PostThreadMessage(g_threadID, SYNERGY_MSG_MOUSE_MOVE, x, y); + PostThreadMessage(g_threadID, DESKFLOW_MSG_MOUSE_MOVE, x, y); return true; } else if (g_mode == kHOOK_WATCH_JUMP_ZONE) { // low level hooks can report bogus mouse positions that are @@ -563,7 +563,7 @@ static bool mouseHookHandler(WPARAM wParam, SInt32 x, SInt32 y, SInt32 data) { } // relay the event - PostThreadMessage(g_threadID, SYNERGY_MSG_MOUSE_MOVE, x, y); + PostThreadMessage(g_threadID, DESKFLOW_MSG_MOUSE_MOVE, x, y); // if inside and not bogus then eat the event return inside && !bogus; @@ -674,7 +674,7 @@ static LRESULT CALLBACK getMessageHook(int code, WPARAM wParam, LPARAM lParam) { MSG *msg = reinterpret_cast(lParam); if (msg->message == WM_SYSCOMMAND && msg->wParam == SC_SCREENSAVE) { // broadcast screen saver started message - PostThreadMessage(g_threadID, SYNERGY_MSG_SCREEN_SAVER, TRUE, 0); + PostThreadMessage(g_threadID, DESKFLOW_MSG_SCREEN_SAVER, TRUE, 0); } } } diff --git a/src/lib/platform/MSWindowsHook.h b/src/lib/platform/MSWindowsHook.h index 36d1aa262..0a9bb0b48 100644 --- a/src/lib/platform/MSWindowsHook.h +++ b/src/lib/platform/MSWindowsHook.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "platform/synwinhk.h" +#include "platform/dfwhook.h" #define WIN32_LEAN_AND_MEAN #include diff --git a/src/lib/platform/MSWindowsKeyState.cpp b/src/lib/platform/MSWindowsKeyState.cpp index b925165cb..5d56b2460 100644 --- a/src/lib/platform/MSWindowsKeyState.cpp +++ b/src/lib/platform/MSWindowsKeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -37,7 +37,7 @@ // MSWindowsKeyState // -// map virtual keys to synergy key enumeration +// map virtual keys to deskflow key enumeration const KeyID MSWindowsKeyState::s_virtualKey[] = { /* 0x000 */ {kKeyNone}, // reserved /* 0x001 */ {kKeyNone}, // VK_LBUTTON @@ -586,7 +586,7 @@ MSWindowsKeyState::MSWindowsKeyState( MSWindowsKeyState::MSWindowsKeyState( MSWindowsDesks *desks, void *eventTarget, IEventQueue *events, - synergy::KeyMap &keyMap, std::vector layouts, + deskflow::KeyMap &keyMap, std::vector layouts, bool isLangSyncEnabled) : KeyState(events, keyMap, std::move(layouts), isLangSyncEnabled), m_eventTarget(eventTarget), @@ -852,7 +852,7 @@ void MSWindowsKeyState::pollPressedKeys(KeyButtonSet &pressedKeys) const { } } -void MSWindowsKeyState::getKeyMap(synergy::KeyMap &keyMap) { +void MSWindowsKeyState::getKeyMap(deskflow::KeyMap &keyMap) { // update keyboard groups if (getGroups(m_groups)) { m_groupMap.clear(); @@ -867,7 +867,7 @@ void MSWindowsKeyState::getKeyMap(synergy::KeyMap &keyMap) { memset(m_virtualKeyToButton, 0, sizeof(m_virtualKeyToButton)); m_keyToVKMap.clear(); - synergy::KeyMap::KeyItem item; + deskflow::KeyMap::KeyItem item; SInt32 numGroups = (SInt32)m_groups.size(); for (SInt32 g = 0; g < numGroups; ++g) { item.m_group = g; @@ -1052,7 +1052,7 @@ void MSWindowsKeyState::getKeyMap(synergy::KeyMap &keyMap) { item.m_client = m_buttonToVK[i]; // get flags for modifier keys - synergy::KeyMap::initModifierKey(item); + deskflow::KeyMap::initModifierKey(item); if (item.m_id == 0) { // translate virtual key to a character with and without @@ -1286,7 +1286,7 @@ UINT MSWindowsKeyState::mapButtonToVirtualKey(KeyButton button) const { } KeyID MSWindowsKeyState::getIDForKey( - synergy::KeyMap::KeyItem &item, KeyButton button, UINT virtualKey, + deskflow::KeyMap::KeyItem &item, KeyButton button, UINT virtualKey, PBYTE keyState, HKL hkl) const { WCHAR unicode[2]; int n = m_ToUnicodeEx( @@ -1308,7 +1308,7 @@ KeyID MSWindowsKeyState::getIDForKey( // as an alternative, we could use the returned // buffer in unicode to look at the dead key character // and not rely on getDeadKey to provide the mapping - return synergy::KeyMap::getDeadKey(id); + return deskflow::KeyMap::getDeadKey(id); } default: case 0: @@ -1327,7 +1327,7 @@ KeyID MSWindowsKeyState::getIDForKey( } void MSWindowsKeyState::addKeyEntry( - synergy::KeyMap &keyMap, synergy::KeyMap::KeyItem &item) { + deskflow::KeyMap &keyMap, deskflow::KeyMap::KeyItem &item) { keyMap.addKeyEntry(item); if (item.m_group == 0) { m_keyToVKMap[item.m_id] = static_cast(item.m_client); diff --git a/src/lib/platform/MSWindowsKeyState.h b/src/lib/platform/MSWindowsKeyState.h index 7dbdd5e4c..7dadc5af1 100644 --- a/src/lib/platform/MSWindowsKeyState.h +++ b/src/lib/platform/MSWindowsKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -20,7 +20,7 @@ #include "base/String.h" #include "common/stdvector.h" -#include "synergy/KeyState.h" +#include "deskflow/KeyState.h" #define WIN32_LEAN_AND_MEAN #include @@ -41,7 +41,7 @@ public: std::vector layouts, bool isLangSyncEnabled); MSWindowsKeyState( MSWindowsDesks *desks, void *eventTarget, IEventQueue *events, - synergy::KeyMap &keyMap, std::vector layouts, + deskflow::KeyMap &keyMap, std::vector layouts, bool isLangSyncEnabled); virtual ~MSWindowsKeyState(); @@ -164,7 +164,7 @@ public: protected: // KeyState overrides - virtual void getKeyMap(synergy::KeyMap &keyMap); + virtual void getKeyMap(deskflow::KeyMap &keyMap); virtual void fakeKey(const Keystroke &keystroke); virtual KeyModifierMask &getActiveModifiersRValue(); @@ -178,10 +178,10 @@ private: void setWindowGroup(SInt32 group); KeyID getIDForKey( - synergy::KeyMap::KeyItem &item, KeyButton button, UINT virtualKey, + deskflow::KeyMap::KeyItem &item, KeyButton button, UINT virtualKey, PBYTE keyState, HKL hkl) const; - void addKeyEntry(synergy::KeyMap &keyMap, synergy::KeyMap::KeyItem &item); + void addKeyEntry(deskflow::KeyMap &keyMap, deskflow::KeyMap::KeyItem &item); void init(); diff --git a/src/lib/platform/MSWindowsPowerManager.cpp b/src/lib/platform/MSWindowsPowerManager.cpp index dee434d78..02ab7fc8f 100644 --- a/src/lib/platform/MSWindowsPowerManager.cpp +++ b/src/lib/platform/MSWindowsPowerManager.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2021 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/lib/platform/MSWindowsPowerManager.h b/src/lib/platform/MSWindowsPowerManager.h index fcc843b39..75df747f7 100644 --- a/src/lib/platform/MSWindowsPowerManager.h +++ b/src/lib/platform/MSWindowsPowerManager.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2021 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp index b6c77ff00..6a2228fb0 100644 --- a/src/lib/platform/MSWindowsScreen.cpp +++ b/src/lib/platform/MSWindowsScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -26,6 +26,12 @@ #include "base/TMethodEventJob.h" #include "base/TMethodJob.h" #include "client/Client.h" +#include "deskflow/App.h" +#include "deskflow/ArgsBase.h" +#include "deskflow/ClientApp.h" +#include "deskflow/Clipboard.h" +#include "deskflow/KeyMap.h" +#include "deskflow/XScreen.h" #include "mt/Thread.h" #include "platform/MSWindowsClipboard.h" #include "platform/MSWindowsDesks.h" @@ -33,12 +39,6 @@ #include "platform/MSWindowsEventQueueBuffer.h" #include "platform/MSWindowsKeyState.h" #include "platform/MSWindowsScreenSaver.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" -#include "synergy/ClientApp.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/XScreen.h" #include #include @@ -93,7 +93,7 @@ MSWindowsScreen *MSWindowsScreen::s_screen = NULL; MSWindowsScreen::MSWindowsScreen( bool isPrimary, bool noHooks, bool stopOnDeskSwitch, IEventQueue *events, - bool enableLangSync, synergy::ClientScrollDirection scrollDirection) + bool enableLangSync, deskflow::ClientScrollDirection scrollDirection) : PlatformScreen(events, scrollDirection), m_isPrimary(isPrimary), m_noHooks(noHooks), @@ -146,7 +146,7 @@ MSWindowsScreen::MSWindowsScreen( updateScreenShape(); m_class = createWindowClass(); - m_window = createWindow(m_class, "Synergy"); + m_window = createWindow(m_class, "Deskflow"); forceShowCursor(); LOG( (CLOG_DEBUG "screen shape: %d,%d %dx%d %s", m_x, m_y, m_w, m_h, @@ -313,8 +313,8 @@ bool MSWindowsScreen::leave() { if (!getThisCursorPos(&pos)) { LOG((CLOG_DEBUG "unable to leave screen as windows security has disabled " "critical functions")); - // unable to get position this means synergy will break if the cursor leaves - // the screen + // unable to get position this means deskflow will break if the cursor + // leaves the screen return false; } // get keyboard layout of foreground window. we'll use this @@ -418,7 +418,7 @@ void MSWindowsScreen::checkClipboards() { // next reboot we do this double check. clipboard ownership // won't be reflected on other screens until we leave but at // least the clipboard itself will work. - if (m_ownClipboard && !MSWindowsClipboard::isOwnedBySynergy()) { + if (m_ownClipboard && !MSWindowsClipboard::isOwnedByDeskflow()) { LOG((CLOG_DEBUG "clipboard changed: lost ownership and no notification received")); m_ownClipboard = false; @@ -571,7 +571,8 @@ void MSWindowsScreen::warpCursor(SInt32 x, SInt32 y) { // remove all input events before and including warp MSG msg; while (PeekMessage( - &msg, NULL, SYNERGY_MSG_INPUT_FIRST, SYNERGY_MSG_INPUT_LAST, PM_REMOVE)) { + &msg, NULL, DESKFLOW_MSG_INPUT_FIRST, DESKFLOW_MSG_INPUT_LAST, + PM_REMOVE)) { // do nothing } @@ -652,13 +653,13 @@ UInt32 MSWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask) { m_hotKeys.erase(id); LOG( (CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", - synergy::KeyMap::formatKey(key, mask).c_str(), key, mask)); + deskflow::KeyMap::formatKey(key, mask).c_str(), key, mask)); return 0; } LOG( (CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", - synergy::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); + deskflow::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); return id; } @@ -822,7 +823,7 @@ ATOM MSWindowsScreen::createWindowClass() const { classInfo.hCursor = NULL; classInfo.hbrBackground = NULL; classInfo.lpszMenuName = NULL; - classInfo.lpszClassName = "Synergy"; + classInfo.lpszClassName = "Deskflow"; classInfo.hIconSm = NULL; return RegisterClassEx(&classInfo); } @@ -913,10 +914,10 @@ bool MSWindowsScreen::onPreDispatch( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { // handle event switch (message) { - case SYNERGY_MSG_SCREEN_SAVER: + case DESKFLOW_MSG_SCREEN_SAVER: return onScreensaver(wParam != 0); - case SYNERGY_MSG_DEBUG: + case DESKFLOW_MSG_DEBUG: LOG((CLOG_DEBUG1 "hook: 0x%08x 0x%08x", wParam, lParam)); return true; } @@ -934,24 +935,24 @@ bool MSWindowsScreen::onPreDispatchPrimary( // handle event switch (message) { - case SYNERGY_MSG_MARK: + case DESKFLOW_MSG_MARK: return onMark(static_cast(wParam)); - case SYNERGY_MSG_KEY: + case DESKFLOW_MSG_KEY: return onKey(wParam, lParam); - case SYNERGY_MSG_MOUSE_BUTTON: + case DESKFLOW_MSG_MOUSE_BUTTON: return onMouseButton(wParam, lParam); - case SYNERGY_MSG_MOUSE_MOVE: + case DESKFLOW_MSG_MOUSE_MOVE: return onMouseMove( static_cast(wParam), static_cast(lParam)); - case SYNERGY_MSG_MOUSE_WHEEL: + case DESKFLOW_MSG_MOUSE_WHEEL: // XXX -- support x-axis scrolling return onMouseWheel(0, static_cast(wParam)); - case SYNERGY_MSG_PRE_WARP: { + case DESKFLOW_MSG_PRE_WARP: { // save position to compute delta of next motion saveMousePosition(static_cast(wParam), static_cast(lParam)); @@ -962,12 +963,12 @@ bool MSWindowsScreen::onPreDispatchPrimary( // event. MSG msg; do { - GetMessage(&msg, NULL, SYNERGY_MSG_MOUSE_MOVE, SYNERGY_MSG_POST_WARP); - } while (msg.message != SYNERGY_MSG_POST_WARP); + GetMessage(&msg, NULL, DESKFLOW_MSG_MOUSE_MOVE, DESKFLOW_MSG_POST_WARP); + } while (msg.message != DESKFLOW_MSG_POST_WARP); } return true; - case SYNERGY_MSG_POST_WARP: + case DESKFLOW_MSG_POST_WARP: LOG((CLOG_WARN "unmatched post warp")); return true; @@ -1271,7 +1272,7 @@ bool MSWindowsScreen::onMouseButton(WPARAM wParam, LPARAM lParam) { } // here's how mouse movements are sent across the network to a client: -// 1. synergy checks the mouse position on server screen +// 1. deskflow checks the mouse position on server screen // 2. records the delta (current x,y minus last x,y) // 3. records the current x,y as "last" (so we can calc delta next time) // 4. on the server, puts the cursor back to the center of the screen @@ -1364,14 +1365,14 @@ bool MSWindowsScreen::onScreensaver(bool activated) { // the screen saver is disabled! MSG msg; if (PeekMessage( - &msg, NULL, SYNERGY_MSG_SCREEN_SAVER, SYNERGY_MSG_SCREEN_SAVER, + &msg, NULL, DESKFLOW_MSG_SCREEN_SAVER, DESKFLOW_MSG_SCREEN_SAVER, PM_NOREMOVE)) { return true; } if (activated) { if (!m_screensaverActive && - m_screensaver->checkStarted(SYNERGY_MSG_SCREEN_SAVER, FALSE, 0)) { + m_screensaver->checkStarted(DESKFLOW_MSG_SCREEN_SAVER, FALSE, 0)) { m_screensaverActive = true; sendEvent(m_events->forIPrimaryScreen().screensaverActivated()); } @@ -1424,7 +1425,7 @@ bool MSWindowsScreen::onDisplayChange() { bool MSWindowsScreen::onClipboardChange() { // now notify client that somebody changed the clipboard (unless // we're the owner). - if (!MSWindowsClipboard::isOwnedBySynergy()) { + if (!MSWindowsClipboard::isOwnedByDeskflow()) { if (m_ownClipboard) { LOG((CLOG_DEBUG "clipboard changed: lost ownership")); m_ownClipboard = false; @@ -1434,7 +1435,7 @@ bool MSWindowsScreen::onClipboardChange() { m_events->forClipboard().clipboardGrabbed(), kClipboardSelection); } } else if (!m_ownClipboard) { - LOG((CLOG_DEBUG "clipboard changed: synergy owned")); + LOG((CLOG_DEBUG "clipboard changed: deskflow owned")); m_ownClipboard = true; } @@ -1443,7 +1444,7 @@ bool MSWindowsScreen::onClipboardChange() { void MSWindowsScreen::warpCursorNoFlush(SInt32 x, SInt32 y) { // send an event that we can recognize before the mouse warp - PostThreadMessage(GetCurrentThreadId(), SYNERGY_MSG_PRE_WARP, x, y); + PostThreadMessage(GetCurrentThreadId(), DESKFLOW_MSG_PRE_WARP, x, y); // warp mouse. hopefully this inserts a mouse motion event // between the previous message and the following message. @@ -1493,7 +1494,7 @@ void MSWindowsScreen::warpCursorNoFlush(SInt32 x, SInt32 y) { ARCH->sleep(0.0); // send an event that we can recognize after the mouse warp - PostThreadMessage(GetCurrentThreadId(), SYNERGY_MSG_POST_WARP, 0, 0); + PostThreadMessage(GetCurrentThreadId(), DESKFLOW_MSG_POST_WARP, 0, 0); } void MSWindowsScreen::nextMark() { @@ -1501,7 +1502,7 @@ void MSWindowsScreen::nextMark() { ++m_mark; // mark point in message queue where the mark was changed - PostThreadMessage(GetCurrentThreadId(), SYNERGY_MSG_MARK, m_mark, 0); + PostThreadMessage(GetCurrentThreadId(), DESKFLOW_MSG_MARK, m_mark, 0); } bool MSWindowsScreen::ignore() const { return (m_mark != m_markReceived); } diff --git a/src/lib/platform/MSWindowsScreen.h b/src/lib/platform/MSWindowsScreen.h index 0996151cb..a9421f2ba 100644 --- a/src/lib/platform/MSWindowsScreen.h +++ b/src/lib/platform/MSWindowsScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,14 +19,14 @@ #pragma once #include "base/String.h" +#include "deskflow/ClientArgs.h" +#include "deskflow/DragInformation.h" +#include "deskflow/PlatformScreen.h" #include "mt/CondVar.h" #include "mt/Mutex.h" #include "platform/MSWindowsHook.h" #include "platform/MSWindowsPowerManager.h" -#include "platform/synwinhk.h" -#include "synergy/ClientArgs.h" -#include "synergy/DragInformation.h" -#include "synergy/PlatformScreen.h" +#include "platform/dfwhook.h" #define WIN32_LEAN_AND_MEAN #include @@ -44,8 +44,8 @@ public: MSWindowsScreen( bool isPrimary, bool noHooks, bool stopOnDeskSwitch, IEventQueue *events, bool enableLangSync = false, - synergy::ClientScrollDirection scrollDirection = - synergy::ClientScrollDirection::SERVER); + deskflow::ClientScrollDirection scrollDirection = + deskflow::ClientScrollDirection::SERVER); virtual ~MSWindowsScreen(); //! @name manipulators diff --git a/src/lib/platform/MSWindowsScreenSaver.cpp b/src/lib/platform/MSWindowsScreenSaver.cpp index bdd255215..94f91f7bf 100644 --- a/src/lib/platform/MSWindowsScreenSaver.cpp +++ b/src/lib/platform/MSWindowsScreenSaver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsScreenSaver.h b/src/lib/platform/MSWindowsScreenSaver.h index 825c4b184..6483dc545 100644 --- a/src/lib/platform/MSWindowsScreenSaver.h +++ b/src/lib/platform/MSWindowsScreenSaver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,7 +19,7 @@ #pragma once #include "base/String.h" -#include "synergy/IScreenSaver.h" +#include "deskflow/IScreenSaver.h" #define WIN32_LEAN_AND_MEAN #include diff --git a/src/lib/platform/MSWindowsSession.cpp b/src/lib/platform/MSWindowsSession.cpp index a00ff4ce5..894654350 100644 --- a/src/lib/platform/MSWindowsSession.cpp +++ b/src/lib/platform/MSWindowsSession.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include "arch/win32/XArchWindows.h" #include "base/Log.h" -#include "synergy/XSynergy.h" +#include "deskflow/XDeskflow.h" #include diff --git a/src/lib/platform/MSWindowsSession.h b/src/lib/platform/MSWindowsSession.h index 03a86d343..0f3056598 100644 --- a/src/lib/platform/MSWindowsSession.h +++ b/src/lib/platform/MSWindowsSession.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/MSWindowsUtil.cpp b/src/lib/platform/MSWindowsUtil.cpp index 1518241ae..bf0c0f420 100644 --- a/src/lib/platform/MSWindowsUtil.cpp +++ b/src/lib/platform/MSWindowsUtil.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -45,8 +45,8 @@ MSWindowsUtil::getErrorString(HINSTANCE hinstance, DWORD error, DWORD id) { FORMAT_MESSAGE_FROM_SYSTEM, 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&buffer, 0, NULL) == 0) { - String errorString = synergy::string::sprintf("%d", error); - return synergy::string::format( + String errorString = deskflow::string::sprintf("%d", error); + return deskflow::string::format( getString(hinstance, id).c_str(), errorString.c_str()); } else { String result(buffer); diff --git a/src/lib/platform/MSWindowsUtil.h b/src/lib/platform/MSWindowsUtil.h index 986913fe9..39156d138 100644 --- a/src/lib/platform/MSWindowsUtil.h +++ b/src/lib/platform/MSWindowsUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp index 6e3d7e1dc..a773a6598 100644 --- a/src/lib/platform/MSWindowsWatchdog.cpp +++ b/src/lib/platform/MSWindowsWatchdog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2009 Chris Schoeneman * @@ -24,12 +24,12 @@ #include "base/TMethodJob.h" #include "base/log_outputters.h" #include "common/ipc.h" +#include "deskflow/App.h" +#include "deskflow/ArgsBase.h" #include "ipc/IpcLogOutputter.h" #include "ipc/IpcMessage.h" #include "ipc/IpcServer.h" #include "mt/Thread.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" #include #include @@ -161,7 +161,7 @@ HANDLE MSWindowsWatchdog::getUserToken(LPSECURITY_ATTRIBUTES security) { // always elevate if we are at the vista/7 login screen. we could also // elevate for the uac dialog (consent.exe) but this would be pointless, - // since synergy would re-launch as non-elevated after the desk switch, + // since deskflow would re-launch as non-elevated after the desk switch, // and so would be unusable with the new elevated process taking focus. if (m_elevateProcess || m_autoElevated || m_session.isProcessInSession("logonui.exe", NULL)) { @@ -526,9 +526,9 @@ void MSWindowsWatchdog::shutdownProcess(HANDLE handle, DWORD pid, int timeout) { double elapsed = (ARCH->time() - start); if (elapsed > timeout) { // if timeout reached, kill forcefully. - // calling TerminateProcess on synergy is very bad! + // calling TerminateProcess on deskflow is very bad! // it causes the hook DLL to stay loaded in some apps, - // making it impossible to start synergy again. + // making it impossible to start deskflow again. LOG( (CLOG_WARN "shutdown timed out after %d secs, forcefully terminating", @@ -571,9 +571,9 @@ void MSWindowsWatchdog::shutdownExistingProcesses() { // make sure we're not checking the system process if (entry.th32ProcessID != 0) { - if (_stricmp(entry.szExeFile, "synergyc.exe") == 0 || - _stricmp(entry.szExeFile, "synergys.exe") == 0 || - _stricmp(entry.szExeFile, "synergy-core.exe") == 0) { + if (_stricmp(entry.szExeFile, "deskflowc.exe") == 0 || + _stricmp(entry.szExeFile, "deskflows.exe") == 0 || + _stricmp(entry.szExeFile, "deskflow-core.exe") == 0) { HANDLE handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID); @@ -604,13 +604,13 @@ void MSWindowsWatchdog::shutdownExistingProcesses() { void MSWindowsWatchdog::getActiveDesktop(LPSECURITY_ATTRIBUTES security) { String installedDir = ARCH->getInstalledDirectory(); if (!installedDir.empty()) { - String syntoolCommand; - syntoolCommand.append("\"") - .append(installedDir) - .append("\\") - .append("syntool") - .append("\""); - syntoolCommand.append(" --get-active-desktop"); + String deskflow - legacyCommand; + deskflow - legacyCommand.append("\"") + .append(installedDir) + .append("\\") + .append("deskflow-legacy") + .append("\""); + deskflow - legacyCommand.append(" --get-active-desktop"); m_session.updateActiveSession(); bool elevateProcess = m_elevateProcess; @@ -618,13 +618,14 @@ void MSWindowsWatchdog::getActiveDesktop(LPSECURITY_ATTRIBUTES security) { HANDLE userToken = getUserToken(security); m_elevateProcess = elevateProcess; - BOOL createRet = startProcessAsUser(syntoolCommand, userToken, security); + BOOL createRet = + startProcessAsUser(deskflow - legacyCommand, userToken, security); auto pid = m_processInfo.dwProcessId; if (!createRet) { DWORD rc = GetLastError(); RevertToSelf(); } else { - LOG((CLOG_DEBUG "launched syntool to check active desktop")); + LOG((CLOG_DEBUG "launched deskflow-legacy to check active desktop")); } ARCH->lockMutex(m_mutex); diff --git a/src/lib/platform/MSWindowsWatchdog.h b/src/lib/platform/MSWindowsWatchdog.h index 4e4bfa60e..698ffbaca 100644 --- a/src/lib/platform/MSWindowsWatchdog.h +++ b/src/lib/platform/MSWindowsWatchdog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2009 Chris Schoeneman * @@ -19,8 +19,8 @@ #pragma once #include "arch/IArchMultithread.h" +#include "deskflow/XDeskflow.h" #include "platform/MSWindowsSession.h" -#include "synergy/XSynergy.h" #include #include @@ -110,9 +110,9 @@ private: /*! An error occured in the process watchdog. */ -class XMSWindowsWatchdogError : public XSynergy { +class XMSWindowsWatchdogError : public XDeskflow { public: - XMSWindowsWatchdogError(const String &msg) : XSynergy(msg) {} + XMSWindowsWatchdogError(const String &msg) : XDeskflow(msg) {} // XBase overrides virtual String getWhat() const throw() { return what(); } diff --git a/src/lib/platform/OSXAutoTypes.h b/src/lib/platform/OSXAutoTypes.h index 2868e6ec6..1499ccb70 100644 --- a/src/lib/platform/OSXAutoTypes.h +++ b/src/lib/platform/OSXAutoTypes.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXClipboard.cpp b/src/lib/platform/OSXClipboard.cpp index 5802ef609..81dba2530 100644 --- a/src/lib/platform/OSXClipboard.cpp +++ b/src/lib/platform/OSXClipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -20,12 +20,12 @@ #include "arch/XArch.h" #include "base/Log.h" +#include "deskflow/Clipboard.h" #include "platform/OSXClipboardBMPConverter.h" #include "platform/OSXClipboardHTMLConverter.h" #include "platform/OSXClipboardTextConverter.h" #include "platform/OSXClipboardUTF16Converter.h" #include "platform/OSXClipboardUTF8Converter.h" -#include "synergy/Clipboard.h" // // OSXClipboard diff --git a/src/lib/platform/OSXClipboard.h b/src/lib/platform/OSXClipboard.h index 4833f3c6a..b3c8f4980 100644 --- a/src/lib/platform/OSXClipboard.h +++ b/src/lib/platform/OSXClipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IClipboard.h" +#include "deskflow/IClipboard.h" #include #include @@ -31,8 +31,8 @@ public: OSXClipboard(); virtual ~OSXClipboard(); - //! Test if clipboard is owned by synergy - static bool isOwnedBySynergy(); + //! Test if clipboard is owned by deskflow + static bool isOwnedByDeskflow(); // IClipboard overrides virtual bool empty(); diff --git a/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp b/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp index e21f9c07b..8a9e11fdf 100644 --- a/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp +++ b/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardAnyBitmapConverter.h b/src/lib/platform/OSXClipboardAnyBitmapConverter.h index 79c611b34..c2bec9518 100644 --- a/src/lib/platform/OSXClipboardAnyBitmapConverter.h +++ b/src/lib/platform/OSXClipboardAnyBitmapConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardAnyTextConverter.cpp b/src/lib/platform/OSXClipboardAnyTextConverter.cpp index 74538e0df..7a91c5110 100644 --- a/src/lib/platform/OSXClipboardAnyTextConverter.cpp +++ b/src/lib/platform/OSXClipboardAnyTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardAnyTextConverter.h b/src/lib/platform/OSXClipboardAnyTextConverter.h index b4ea04402..918395747 100644 --- a/src/lib/platform/OSXClipboardAnyTextConverter.h +++ b/src/lib/platform/OSXClipboardAnyTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardBMPConverter.cpp b/src/lib/platform/OSXClipboardBMPConverter.cpp index 6a8409c29..d4cdd5a4a 100644 --- a/src/lib/platform/OSXClipboardBMPConverter.cpp +++ b/src/lib/platform/OSXClipboardBMPConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardBMPConverter.h b/src/lib/platform/OSXClipboardBMPConverter.h index e559a401a..ece5db86a 100644 --- a/src/lib/platform/OSXClipboardBMPConverter.h +++ b/src/lib/platform/OSXClipboardBMPConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardHTMLConverter.cpp b/src/lib/platform/OSXClipboardHTMLConverter.cpp index 8b07f7720..bac81e6d7 100644 --- a/src/lib/platform/OSXClipboardHTMLConverter.cpp +++ b/src/lib/platform/OSXClipboardHTMLConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardHTMLConverter.h b/src/lib/platform/OSXClipboardHTMLConverter.h index fed24defb..e57596467 100644 --- a/src/lib/platform/OSXClipboardHTMLConverter.h +++ b/src/lib/platform/OSXClipboardHTMLConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardTextConverter.cpp b/src/lib/platform/OSXClipboardTextConverter.cpp index f3d1e5518..ba36c214e 100644 --- a/src/lib/platform/OSXClipboardTextConverter.cpp +++ b/src/lib/platform/OSXClipboardTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardTextConverter.h b/src/lib/platform/OSXClipboardTextConverter.h index 2227e9e69..abaaa4920 100644 --- a/src/lib/platform/OSXClipboardTextConverter.h +++ b/src/lib/platform/OSXClipboardTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardUTF16Converter.cpp b/src/lib/platform/OSXClipboardUTF16Converter.cpp index cce024d08..d44d32818 100644 --- a/src/lib/platform/OSXClipboardUTF16Converter.cpp +++ b/src/lib/platform/OSXClipboardUTF16Converter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardUTF16Converter.h b/src/lib/platform/OSXClipboardUTF16Converter.h index 63810fc1b..0cc054a34 100644 --- a/src/lib/platform/OSXClipboardUTF16Converter.h +++ b/src/lib/platform/OSXClipboardUTF16Converter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardUTF8Converter.h b/src/lib/platform/OSXClipboardUTF8Converter.h index cc3373178..3e55378af 100644 --- a/src/lib/platform/OSXClipboardUTF8Converter.h +++ b/src/lib/platform/OSXClipboardUTF8Converter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXDragSimulator.h b/src/lib/platform/OSXDragSimulator.h index 71b001ebe..310a9cd94 100644 --- a/src/lib/platform/OSXDragSimulator.h +++ b/src/lib/platform/OSXDragSimulator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXDragSimulator.m b/src/lib/platform/OSXDragSimulator.m index aba20f6cc..5ed352d92 100644 --- a/src/lib/platform/OSXDragSimulator.m +++ b/src/lib/platform/OSXDragSimulator.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXDragView.h b/src/lib/platform/OSXDragView.h index 15c073d74..7cc512f74 100644 --- a/src/lib/platform/OSXDragView.h +++ b/src/lib/platform/OSXDragView.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXDragView.m b/src/lib/platform/OSXDragView.m index f6bf2168b..44da99ceb 100644 --- a/src/lib/platform/OSXDragView.m +++ b/src/lib/platform/OSXDragView.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXEventQueueBuffer.cpp b/src/lib/platform/OSXEventQueueBuffer.cpp index 33501030d..fb6af3a65 100644 --- a/src/lib/platform/OSXEventQueueBuffer.cpp +++ b/src/lib/platform/OSXEventQueueBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXEventQueueBuffer.h b/src/lib/platform/OSXEventQueueBuffer.h index b0ea0d796..07b14485e 100644 --- a/src/lib/platform/OSXEventQueueBuffer.h +++ b/src/lib/platform/OSXEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp index 0c31fd2f9..e4bc50b23 100644 --- a/src/lib/platform/OSXKeyState.cpp +++ b/src/lib/platform/OSXKeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -194,7 +194,7 @@ OSXKeyState::OSXKeyState( } OSXKeyState::OSXKeyState( - IEventQueue *events, synergy::KeyMap &keyMap, std::vector layouts, + IEventQueue *events, deskflow::KeyMap &keyMap, std::vector layouts, bool isLangSyncEnabled) : KeyState(events, keyMap, std::move(layouts), isLangSyncEnabled) { init(); @@ -460,7 +460,7 @@ void OSXKeyState::pollPressedKeys(KeyButtonSet &pressedKeys) const { } } -void OSXKeyState::getKeyMap(synergy::KeyMap &keyMap) { +void OSXKeyState::getKeyMap(deskflow::KeyMap &keyMap) { // update keyboard groups SInt32 numGroups{0}; if (getGroups(m_groups)) { @@ -640,9 +640,9 @@ void OSXKeyState::fakeKey(const Keystroke &keystroke) { } void OSXKeyState::getKeyMapForSpecialKeys( - synergy::KeyMap &keyMap, SInt32 group) const { + deskflow::KeyMap &keyMap, SInt32 group) const { // special keys are insensitive to modifers and none are dead keys - synergy::KeyMap::KeyItem item; + deskflow::KeyMap::KeyItem item; for (size_t i = 0; i < sizeof(s_controlKeys) / sizeof(s_controlKeys[0]); ++i) { const KeyEntry &entry = s_controlKeys[i]; @@ -653,7 +653,7 @@ void OSXKeyState::getKeyMapForSpecialKeys( item.m_sensitive = 0; item.m_dead = false; item.m_client = 0; - synergy::KeyMap::initModifierKey(item); + deskflow::KeyMap::initModifierKey(item); keyMap.addKeyEntry(item); if (item.m_lock) { @@ -670,7 +670,7 @@ void OSXKeyState::getKeyMapForSpecialKeys( } bool OSXKeyState::getKeyMap( - synergy::KeyMap &keyMap, SInt32 group, const IOSXKeyResource &r) const { + deskflow::KeyMap &keyMap, SInt32 group, const IOSXKeyResource &r) const { if (!r.isValid()) { return false; } @@ -682,7 +682,7 @@ bool OSXKeyState::getKeyMap( std::vector> buttonKeys(r.getNumTables()); // iterate over each button - synergy::KeyMap::KeyItem item; + deskflow::KeyMap::KeyItem item; for (UInt32 i = 0; i < r.getNumButtons(); ++i) { item.m_button = mapVirtualKeyToKeyButton(i); @@ -692,7 +692,7 @@ bool OSXKeyState::getKeyMap( // convert the entry in each table for this button to a KeyID for (UInt32 j = 0; j < r.getNumTables(); ++j) { buttonKeys[j].first = r.getKey(j, i); - buttonKeys[j].second = synergy::KeyMap::isDeadKey(buttonKeys[j].first); + buttonKeys[j].second = deskflow::KeyMap::isDeadKey(buttonKeys[j].first); } // iterate over each character table @@ -715,7 +715,7 @@ bool OSXKeyState::getKeyMap( item.m_group = group; item.m_dead = buttonKeys[j].second; item.m_client = buttonKeys[j].second ? 1 : 0; - synergy::KeyMap::initModifierKey(item); + deskflow::KeyMap::initModifierKey(item); if (item.m_lock) { // all locking keys are half duplex on OS X keyMap.addHalfDuplexButton(i); @@ -783,7 +783,7 @@ bool OSXKeyState::getKeyMap( return true; } -bool OSXKeyState::mapSynergyHotKeyToMac( +bool OSXKeyState::mapDeskflowHotKeyToMac( KeyID key, KeyModifierMask mask, UInt32 &macVirtualKey, UInt32 &macModifierMask) const { // look up button for key diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h index 4dc0aecd5..28f25df31 100644 --- a/src/lib/platform/OSXKeyState.h +++ b/src/lib/platform/OSXKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -22,7 +22,7 @@ #include "common/stdmap.h" #include "common/stdset.h" #include "common/stdvector.h" -#include "synergy/KeyState.h" +#include "deskflow/KeyState.h" #include @@ -39,8 +39,8 @@ public: OSXKeyState( IEventQueue *events, std::vector layouts, bool isLangSyncEnabled); OSXKeyState( - IEventQueue *events, synergy::KeyMap &keyMap, std::vector layouts, - bool isLangSyncEnabled); + IEventQueue *events, deskflow::KeyMap &keyMap, + std::vector layouts, bool isLangSyncEnabled); virtual ~OSXKeyState(); //! @name modifiers @@ -58,9 +58,9 @@ public: //! @name accessors //@{ - //! Convert OS X modifier mask to synergy mask + //! Convert OS X modifier mask to deskflow mask /*! - Returns the synergy modifier mask corresponding to the OS X modifier + Returns the deskflow modifier mask corresponding to the OS X modifier mask in \p mask. */ KeyModifierMask mapModifiersFromOSX(UInt32 mask) const; @@ -87,7 +87,7 @@ public: Calculates mac virtual key and mask for a key \p key and modifiers \p mask. Returns \c true if the key can be mapped, \c false otherwise. */ - bool mapSynergyHotKeyToMac( + bool mapDeskflowHotKeyToMac( KeyID key, KeyModifierMask mask, UInt32 &macVirtualKey, UInt32 &macModifierMask) const; @@ -104,18 +104,18 @@ public: protected: // KeyState overrides - virtual void getKeyMap(synergy::KeyMap &keyMap); + virtual void getKeyMap(deskflow::KeyMap &keyMap); virtual void fakeKey(const Keystroke &keystroke); private: class KeyResource; - // Add hard coded special keys to a synergy::KeyMap. - void getKeyMapForSpecialKeys(synergy::KeyMap &keyMap, SInt32 group) const; + // Add hard coded special keys to a deskflow::KeyMap. + void getKeyMapForSpecialKeys(deskflow::KeyMap &keyMap, SInt32 group) const; // Convert keyboard resource to a key map bool getKeyMap( - synergy::KeyMap &keyMap, SInt32 group, const IOSXKeyResource &r) const; + deskflow::KeyMap &keyMap, SInt32 group, const IOSXKeyResource &r) const; // Get the available keyboard groups bool getGroups(AutoCFArray &) const; @@ -161,7 +161,7 @@ private: void postKeyboardKey(CGKeyCode virtualKey, bool keyDown); private: - // OS X uses a physical key if 0 for the 'A' key. synergy reserves + // OS X uses a physical key if 0 for the 'A' key. deskflow reserves // KeyButton 0 so we offset all OS X physical key ids by this much // when used as a KeyButton and by minus this much to map a KeyButton // to a physical button. diff --git a/src/lib/platform/OSXMediaKeySupport.h b/src/lib/platform/OSXMediaKeySupport.h index 808ee991a..d6a699c09 100644 --- a/src/lib/platform/OSXMediaKeySupport.h +++ b/src/lib/platform/OSXMediaKeySupport.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #import #import -#include "synergy/key_types.h" +#include "deskflow/key_types.h" #if defined(__cplusplus) extern "C" { diff --git a/src/lib/platform/OSXMediaKeySupport.m b/src/lib/platform/OSXMediaKeySupport.m index 62b86b8df..55920fa62 100644 --- a/src/lib/platform/OSXMediaKeySupport.m +++ b/src/lib/platform/OSXMediaKeySupport.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXPasteboardPeeker.h b/src/lib/platform/OSXPasteboardPeeker.h index c7971b09b..7c67d4ed0 100644 --- a/src/lib/platform/OSXPasteboardPeeker.h +++ b/src/lib/platform/OSXPasteboardPeeker.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXPasteboardPeeker.m b/src/lib/platform/OSXPasteboardPeeker.m index 56a5b78c8..203612dcd 100644 --- a/src/lib/platform/OSXPasteboardPeeker.m +++ b/src/lib/platform/OSXPasteboardPeeker.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXPowerManager.cpp b/src/lib/platform/OSXPowerManager.cpp index c17a3b722..f8f5ddfb4 100644 --- a/src/lib/platform/OSXPowerManager.cpp +++ b/src/lib/platform/OSXPowerManager.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2021 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -25,7 +25,7 @@ OSXPowerManager::~OSXPowerManager() { enableSleep(); } void OSXPowerManager::disableSleep() { if (!m_sleepPreventionAssertionID) { - CFStringRef reasonForActivity = CFSTR("Synergy application"); + CFStringRef reasonForActivity = CFSTR("Deskflow application"); IOReturn result = IOPMAssertionCreateWithName( kIOPMAssertPreventUserIdleDisplaySleep, kIOPMAssertionLevelOn, reasonForActivity, &m_sleepPreventionAssertionID); diff --git a/src/lib/platform/OSXPowerManager.h b/src/lib/platform/OSXPowerManager.h index c1168f8fe..60b2c2289 100644 --- a/src/lib/platform/OSXPowerManager.h +++ b/src/lib/platform/OSXPowerManager.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2021 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/lib/platform/OSXScreen.h b/src/lib/platform/OSXScreen.h index a93035386..5da3b651c 100644 --- a/src/lib/platform/OSXScreen.h +++ b/src/lib/platform/OSXScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -21,10 +21,10 @@ #include "base/EventTypes.h" #include "common/stdmap.h" #include "common/stdvector.h" +#include "deskflow/DragInformation.h" +#include "deskflow/PlatformScreen.h" #include "platform/OSXClipboard.h" #include "platform/OSXPowerManager.h" -#include "synergy/DragInformation.h" -#include "synergy/PlatformScreen.h" #include #include @@ -56,8 +56,8 @@ class OSXScreen : public PlatformScreen { public: OSXScreen( IEventQueue *events, bool isPrimary, bool enableLangSync = false, - synergy::ClientScrollDirection scrollDirection = - synergy::ClientScrollDirection::SERVER); + deskflow::ClientScrollDirection scrollDirection = + deskflow::ClientScrollDirection::SERVER); virtual ~OSXScreen(); @@ -144,17 +144,17 @@ private: void showCursor(); void hideCursor(); - // map synergy mouse button to mac buttons - ButtonID mapSynergyButtonToMac(UInt16) const; + // map deskflow mouse button to mac buttons + ButtonID mapDeskflowButtonToMac(UInt16) const; - // map mac mouse button to synergy buttons - ButtonID mapMacButtonToSynergy(UInt16) const; + // map mac mouse button to deskflow buttons + ButtonID mapMacButtonToDeskflow(UInt16) const; - // map mac scroll wheel value to a synergy scroll wheel value - SInt32 mapScrollWheelToSynergy(SInt32) const; + // map mac scroll wheel value to a deskflow scroll wheel value + SInt32 mapScrollWheelToDeskflow(SInt32) const; - // map synergy scroll wheel value to a mac scroll wheel value - SInt32 mapScrollWheelFromSynergy(SInt32) const; + // map deskflow scroll wheel value to a mac scroll wheel value + SInt32 mapScrollWheelFromDeskflow(SInt32) const; // get the current scroll wheel speed double getScrollSpeed() const; diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm index 1da5c65c1..840724cc5 100644 --- a/src/lib/platform/OSXScreen.mm +++ b/src/lib/platform/OSXScreen.mm @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -27,9 +27,9 @@ #include "platform/OSXDragSimulator.h" #include "platform/OSXMediaKeySupport.h" #include "platform/OSXPasteboardPeeker.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/ClientApp.h" +#include "deskflow/Clipboard.h" +#include "deskflow/KeyMap.h" +#include "deskflow/ClientApp.h" #include "mt/CondVar.h" #include "mt/Lock.h" #include "mt/Mutex.h" @@ -39,7 +39,7 @@ #include "base/IEventQueue.h" #include "base/TMethodEventJob.h" #include "base/TMethodJob.h" -#include "synergy/DisplayInvalidException.h" +#include "deskflow/DisplayInvalidException.h" #include #include @@ -61,9 +61,9 @@ static const char magic_section[] = ""; // This isn't in any Apple SDK that I know of as of yet. enum { - kSynergyEventMouseScroll = 11, - kSynergyMouseScrollAxisX = 'saxx', - kSynergyMouseScrollAxisY = 'saxy' + kDeskflowEventMouseScroll = 11, + kDeskflowMouseScrollAxisX = 'saxx', + kDeskflowMouseScrollAxisY = 'saxy' }; enum { @@ -89,7 +89,7 @@ bool OSXScreen::s_hasGHOM = false; OSXScreen::OSXScreen(IEventQueue* events, bool isPrimary, bool enableLangSync, - synergy::ClientScrollDirection scrollDirection) : + deskflow::ClientScrollDirection scrollDirection) : PlatformScreen(events, scrollDirection), m_isPrimary(isPrimary), m_isOnScreen(m_isPrimary), @@ -347,9 +347,9 @@ OSXScreen::getCursorCenter(SInt32& x, SInt32& y) const UInt32 OSXScreen::registerHotKey(KeyID key, KeyModifierMask mask) { - // get mac virtual key and modifier mask matching synergy key and mask + // get mac virtual key and modifier mask matching deskflow key and mask UInt32 macKey, macMask; - if (!m_keyState->mapSynergyHotKeyToMac(key, mask, macKey, macMask)) { + if (!m_keyState->mapDeskflowHotKeyToMac(key, mask, macKey, macMask)) { LOG((CLOG_DEBUG "could not map hotkey id=%04x mask=%04x", key, mask)); return 0; } @@ -389,13 +389,13 @@ OSXScreen::registerHotKey(KeyID key, KeyModifierMask mask) if (!okay) { m_oldHotKeyIDs.push_back(id); m_hotKeyToIDMap.erase(HotKeyItem(macKey, macMask)); - LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask)); + LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", deskflow::KeyMap::formatKey(key, mask).c_str(), key, mask)); return 0; } m_hotKeys.insert(std::make_pair(id, HotKeyItem(ref, macKey, macMask))); - LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); + LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", deskflow::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); return id; } @@ -538,7 +538,7 @@ void OSXScreen::fakeMouseButton(ButtonID id, bool press) { // Buttons are indexed from one, but the button down array is indexed from zero - UInt32 index = mapSynergyButtonToMac(id) - kButtonLeft; + UInt32 index = mapDeskflowButtonToMac(id) - kButtonLeft; if (index >= NumButtonIDs) { return; } @@ -702,8 +702,8 @@ OSXScreen::fakeMouseWheel(SInt32 xDelta, SInt32 yDelta) const // is the right choice here over kCGScrollEventUnitPixel CGEventRef scrollEvent = CGEventCreateScrollWheelEvent( NULL, kCGScrollEventUnitLine, 2, - mapScrollWheelFromSynergy(yDelta), - mapScrollWheelFromSynergy(xDelta)); + mapScrollWheelFromDeskflow(yDelta), + mapScrollWheelFromDeskflow(xDelta)); // Fix for sticky keys CGEventFlags modifiers = m_keyState->getModifierStateAsOSXFlags(); @@ -1023,7 +1023,7 @@ OSXScreen::handleSystemEvent(const Event& event, void*) switch (eventClass) { case kEventClassMouse: switch (GetEventKind(*carbonEvent)) { - case kSynergyEventMouseScroll: + case kDeskflowEventMouseScroll: { OSStatus r; long xScroll; @@ -1031,7 +1031,7 @@ OSXScreen::handleSystemEvent(const Event& event, void*) // get scroll amount r = GetEventParameter(*carbonEvent, - kSynergyMouseScrollAxisX, + kDeskflowMouseScrollAxisX, typeSInt32, NULL, sizeof(xScroll), @@ -1041,7 +1041,7 @@ OSXScreen::handleSystemEvent(const Event& event, void*) xScroll = 0; } r = GetEventParameter(*carbonEvent, - kSynergyMouseScrollAxisY, + kDeskflowMouseScrollAxisY, typeSInt32, NULL, sizeof(yScroll), @@ -1052,8 +1052,8 @@ OSXScreen::handleSystemEvent(const Event& event, void*) } if (xScroll != 0 || yScroll != 0) { - onMouseWheel(-mapScrollWheelToSynergy(xScroll), - mapScrollWheelToSynergy(yScroll)); + onMouseWheel(-mapScrollWheelToDeskflow(xScroll), + mapScrollWheelToDeskflow(yScroll)); } } } @@ -1167,7 +1167,7 @@ bool OSXScreen::onMouseButton(bool pressed, UInt16 macButton) { // Buttons 2 and 3 are inverted on the mac - ButtonID button = mapMacButtonToSynergy(macButton); + ButtonID button = mapMacButtonToDeskflow(macButton); if (pressed) { LOG((CLOG_DEBUG1 "event: button press button=%d", button)); @@ -1423,7 +1423,7 @@ OSXScreen::onHotKey(EventRef event) const } ButtonID -OSXScreen::mapSynergyButtonToMac(UInt16 button) const +OSXScreen::mapDeskflowButtonToMac(UInt16 button) const { switch (button) { case 1: @@ -1438,7 +1438,7 @@ OSXScreen::mapSynergyButtonToMac(UInt16 button) const } ButtonID -OSXScreen::mapMacButtonToSynergy(UInt16 macButton) const +OSXScreen::mapMacButtonToDeskflow(UInt16 macButton) const { switch (macButton) { case 1: @@ -1455,7 +1455,7 @@ OSXScreen::mapMacButtonToSynergy(UInt16 macButton) const } SInt32 -OSXScreen::mapScrollWheelToSynergy(SInt32 x) const +OSXScreen::mapScrollWheelToDeskflow(SInt32 x) const { // return accelerated scrolling double d = (1.0 + getScrollSpeed()) * x; @@ -1463,7 +1463,7 @@ OSXScreen::mapScrollWheelToSynergy(SInt32 x) const } SInt32 -OSXScreen::mapScrollWheelFromSynergy(SInt32 x) const +OSXScreen::mapScrollWheelFromDeskflow(SInt32 x) const { // use server's acceleration with a little boost since other platforms // take one wheel step as a larger step than the mac does. @@ -1914,7 +1914,7 @@ OSXScreen::HotKeyItem::operator<(const HotKeyItem& x) const } // Quartz event tap support for the secondary display. This makes sure that we -// will show the cursor if a local event comes in while synergy has the cursor +// will show the cursor if a local event comes in while deskflow has the cursor // off the screen. CGEventRef OSXScreen::handleCGInputEventSecondary( @@ -1976,9 +1976,9 @@ OSXScreen::handleCGInputEvent(CGEventTapProxy proxy, return event; break; case kCGEventScrollWheel: - screen->onMouseWheel(screen->mapScrollWheelToSynergy( + screen->onMouseWheel(screen->mapScrollWheelToDeskflow( CGEventGetIntegerValueField(event, kCGScrollWheelEventDeltaAxis2)), - screen->mapScrollWheelToSynergy( + screen->mapScrollWheelToDeskflow( CGEventGetIntegerValueField(event, kCGScrollWheelEventDeltaAxis1))); break; case kCGEventKeyDown: diff --git a/src/lib/platform/OSXScreenSaver.cpp b/src/lib/platform/OSXScreenSaver.cpp index 3377c4845..b2b34558c 100644 --- a/src/lib/platform/OSXScreenSaver.cpp +++ b/src/lib/platform/OSXScreenSaver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -20,8 +20,8 @@ #import "base/IEventQueue.h" #import "base/Log.h" +#import "deskflow/IPrimaryScreen.h" #import "platform/OSXScreenSaverUtil.h" -#import "synergy/IPrimaryScreen.h" #import #import diff --git a/src/lib/platform/OSXScreenSaver.h b/src/lib/platform/OSXScreenSaver.h index 518e9e120..803d0e2d4 100644 --- a/src/lib/platform/OSXScreenSaver.h +++ b/src/lib/platform/OSXScreenSaver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IScreenSaver.h" +#include "deskflow/IScreenSaver.h" #include diff --git a/src/lib/platform/OSXScreenSaverControl.h b/src/lib/platform/OSXScreenSaverControl.h index f9dd6a0a0..7034fa6ee 100644 --- a/src/lib/platform/OSXScreenSaverControl.h +++ b/src/lib/platform/OSXScreenSaverControl.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2009 Chris Schoeneman * diff --git a/src/lib/platform/OSXScreenSaverUtil.h b/src/lib/platform/OSXScreenSaverUtil.h index 10aed7c9f..d842b53d5 100644 --- a/src/lib/platform/OSXScreenSaverUtil.h +++ b/src/lib/platform/OSXScreenSaverUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/OSXScreenSaverUtil.m b/src/lib/platform/OSXScreenSaverUtil.m index dfc59a9a1..b18652322 100644 --- a/src/lib/platform/OSXScreenSaverUtil.m +++ b/src/lib/platform/OSXScreenSaverUtil.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXUchrKeyResource.cpp b/src/lib/platform/OSXUchrKeyResource.cpp index 5f8ad7497..94297b07e 100644 --- a/src/lib/platform/OSXUchrKeyResource.cpp +++ b/src/lib/platform/OSXUchrKeyResource.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -180,7 +180,7 @@ bool OSXUchrKeyResource::getDeadKey(KeySequence &keys, UInt16 index) const { // convert keys to their dead counterparts for (KeySequence::iterator i = keys.begin(); i != keys.end(); ++i) { - *i = synergy::KeyMap::getDeadKey(*i); + *i = deskflow::KeyMap::getDeadKey(*i); } return true; diff --git a/src/lib/platform/OSXUchrKeyResource.h b/src/lib/platform/OSXUchrKeyResource.h index 677e7d8bd..01c5aeac0 100644 --- a/src/lib/platform/OSXUchrKeyResource.h +++ b/src/lib/platform/OSXUchrKeyResource.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,8 +17,8 @@ #pragma once +#include "deskflow/KeyState.h" #include "platform/IOSXKeyResource.h" -#include "synergy/KeyState.h" #include diff --git a/src/lib/platform/PortalInputCapture.cpp b/src/lib/platform/PortalInputCapture.cpp index 494fcb306..ae664143f 100644 --- a/src/lib/platform/PortalInputCapture.cpp +++ b/src/lib/platform/PortalInputCapture.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -28,7 +28,7 @@ #include // for EIS fd hack, remove #include // for EIS fd hack, remove -namespace synergy { +namespace deskflow { enum signals { SESSION_CLOSED, @@ -404,6 +404,6 @@ void PortalInputCapture::glib_thread(void *) { LOG_DEBUG("shutting down glib thread"); } -} // namespace synergy +} // namespace deskflow #endif diff --git a/src/lib/platform/PortalInputCapture.h b/src/lib/platform/PortalInputCapture.h index 5f190f565..3e9301faf 100644 --- a/src/lib/platform/PortalInputCapture.h +++ b/src/lib/platform/PortalInputCapture.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -30,7 +30,7 @@ #include #include -namespace synergy { +namespace deskflow { class PortalInputCapture { public: @@ -104,6 +104,6 @@ private: std::vector barriers_; }; -} // namespace synergy +} // namespace deskflow #endif // HAVE_LIBPORTAL_INPUTCAPTURE diff --git a/src/lib/platform/PortalRemoteDesktop.cpp b/src/lib/platform/PortalRemoteDesktop.cpp index 17ce32456..d178ca87e 100755 --- a/src/lib/platform/PortalRemoteDesktop.cpp +++ b/src/lib/platform/PortalRemoteDesktop.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -23,7 +23,7 @@ #include // for EIS fd hack, remove #include // for EIS fd hack, remove -namespace synergy { +namespace deskflow { PortalRemoteDesktop::PortalRemoteDesktop(EiScreen *screen, IEventQueue *events) : screen_(screen), @@ -203,4 +203,4 @@ void PortalRemoteDesktop::glib_thread(void *) { } } -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/platform/PortalRemoteDesktop.h b/src/lib/platform/PortalRemoteDesktop.h index fef0aa773..3d314e4af 100644 --- a/src/lib/platform/PortalRemoteDesktop.h +++ b/src/lib/platform/PortalRemoteDesktop.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2022 Red Hat, Inc. * Copyright (C) 2024 Symless Ltd. * @@ -32,7 +32,7 @@ #define XDP_OUTPUT_NONE (XdpOutputType)0 #endif -namespace synergy { +namespace deskflow { class PortalRemoteDesktop { public: @@ -72,4 +72,4 @@ private: guint session_iteration_ = 0; }; -} // namespace synergy +} // namespace deskflow diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp index 8c1ad4ac6..1793988d3 100644 --- a/src/lib/platform/XWindowsClipboard.cpp +++ b/src/lib/platform/XWindowsClipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h index ea88c905a..cf58ec54a 100644 --- a/src/lib/platform/XWindowsClipboard.h +++ b/src/lib/platform/XWindowsClipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -21,11 +21,11 @@ #include "common/stdlist.h" #include "common/stdmap.h" #include "common/stdvector.h" -#include "synergy/IClipboard.h" -#include "synergy/clipboard_types.h" +#include "deskflow/IClipboard.h" +#include "deskflow/clipboard_types.h" #if X_DISPLAY_MISSING -#error X11 is required to build synergy +#error X11 is required to build deskflow #else #include #endif diff --git a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp index f2c91df5f..cb23783a7 100644 --- a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp +++ b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h index 84da45688..6f44a3654 100644 --- a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h +++ b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardBMPConverter.cpp b/src/lib/platform/XWindowsClipboardBMPConverter.cpp index 844875788..c30d4f763 100644 --- a/src/lib/platform/XWindowsClipboardBMPConverter.cpp +++ b/src/lib/platform/XWindowsClipboardBMPConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardBMPConverter.h b/src/lib/platform/XWindowsClipboardBMPConverter.h index 37f8555a1..afe093f6e 100644 --- a/src/lib/platform/XWindowsClipboardBMPConverter.h +++ b/src/lib/platform/XWindowsClipboardBMPConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardHTMLConverter.cpp b/src/lib/platform/XWindowsClipboardHTMLConverter.cpp index 0393e65ff..a5be4b277 100644 --- a/src/lib/platform/XWindowsClipboardHTMLConverter.cpp +++ b/src/lib/platform/XWindowsClipboardHTMLConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardHTMLConverter.h b/src/lib/platform/XWindowsClipboardHTMLConverter.h index 93ae704b0..ca8dd8e4b 100644 --- a/src/lib/platform/XWindowsClipboardHTMLConverter.h +++ b/src/lib/platform/XWindowsClipboardHTMLConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardTextConverter.cpp b/src/lib/platform/XWindowsClipboardTextConverter.cpp index ebeb28861..4cff76c24 100644 --- a/src/lib/platform/XWindowsClipboardTextConverter.cpp +++ b/src/lib/platform/XWindowsClipboardTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardTextConverter.h b/src/lib/platform/XWindowsClipboardTextConverter.h index 6c7b789b0..1de8a78dd 100644 --- a/src/lib/platform/XWindowsClipboardTextConverter.h +++ b/src/lib/platform/XWindowsClipboardTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardUCS2Converter.cpp b/src/lib/platform/XWindowsClipboardUCS2Converter.cpp index 236122480..93e68dc7c 100644 --- a/src/lib/platform/XWindowsClipboardUCS2Converter.cpp +++ b/src/lib/platform/XWindowsClipboardUCS2Converter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardUCS2Converter.h b/src/lib/platform/XWindowsClipboardUCS2Converter.h index 7d7b77be9..e5283b53f 100644 --- a/src/lib/platform/XWindowsClipboardUCS2Converter.h +++ b/src/lib/platform/XWindowsClipboardUCS2Converter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardUTF8Converter.cpp b/src/lib/platform/XWindowsClipboardUTF8Converter.cpp index 3d6c6ce94..e06628f86 100644 --- a/src/lib/platform/XWindowsClipboardUTF8Converter.cpp +++ b/src/lib/platform/XWindowsClipboardUTF8Converter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardUTF8Converter.h b/src/lib/platform/XWindowsClipboardUTF8Converter.h index 922907943..63ad5cac2 100644 --- a/src/lib/platform/XWindowsClipboardUTF8Converter.h +++ b/src/lib/platform/XWindowsClipboardUTF8Converter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsEventQueueBuffer.cpp b/src/lib/platform/XWindowsEventQueueBuffer.cpp index 9c36772eb..b16fb1931 100644 --- a/src/lib/platform/XWindowsEventQueueBuffer.cpp +++ b/src/lib/platform/XWindowsEventQueueBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -49,7 +49,7 @@ XWindowsEventQueueBuffer::XWindowsEventQueueBuffer( assert(m_display != NULL); assert(m_window != None); - m_userEvent = XInternAtom(m_display, "SYNERGY_USER_EVENT", False); + m_userEvent = XInternAtom(m_display, "DESKFLOW_USER_EVENT", False); // set up for pipe hack int result = pipe2(m_pipefd, O_NONBLOCK); assert(result == 0); diff --git a/src/lib/platform/XWindowsEventQueueBuffer.h b/src/lib/platform/XWindowsEventQueueBuffer.h index b3d093145..ae3f3bf97 100644 --- a/src/lib/platform/XWindowsEventQueueBuffer.h +++ b/src/lib/platform/XWindowsEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -23,7 +23,7 @@ #include "mt/Mutex.h" #if X_DISPLAY_MISSING -#error X11 is required to build synergy +#error X11 is required to build deskflow #else #include #endif diff --git a/src/lib/platform/XWindowsKeyState.cpp b/src/lib/platform/XWindowsKeyState.cpp index c896ca5ff..79ac1f0d8 100644 --- a/src/lib/platform/XWindowsKeyState.cpp +++ b/src/lib/platform/XWindowsKeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -25,15 +25,15 @@ #include "base/Log.h" #include "base/String.h" #include "common/stdmap.h" +#include "deskflow/AppUtil.h" +#include "deskflow/ClientApp.h" +#include "deskflow/ClientArgs.h" #include "platform/XWindowsUtil.h" -#include "synergy/AppUtil.h" -#include "synergy/ClientApp.h" -#include "synergy/ClientArgs.h" #include #include #if X_DISPLAY_MISSING -#error X11 is required to build synergy +#error X11 is required to build deskflow #else #include #include @@ -58,7 +58,8 @@ XWindowsKeyState::XWindowsKeyState( } XWindowsKeyState::XWindowsKeyState( - Display *display, bool useXKB, IEventQueue *events, synergy::KeyMap &keyMap) + Display *display, bool useXKB, IEventQueue *events, + deskflow::KeyMap &keyMap) : KeyState( events, keyMap, AppUtil::instance().getKeyboardLayoutList(), ClientApp::instance().args().m_enableLangSync), @@ -207,9 +208,9 @@ void XWindowsKeyState::pollPressedKeys(KeyButtonSet &pressedKeys) const { } } -void XWindowsKeyState::getKeyMap(synergy::KeyMap &keyMap) { +void XWindowsKeyState::getKeyMap(deskflow::KeyMap &keyMap) { // get autorepeat info. we must use the global_auto_repeat told to - // us because it may have modified by synergy. + // us because it may have modified by deskflow. int oldGlobalAutoRepeat = m_keyboardState.global_auto_repeat; XGetKeyboardControl(m_display, &m_keyboardState); m_keyboardState.global_auto_repeat = oldGlobalAutoRepeat; @@ -344,7 +345,7 @@ void XWindowsKeyState::fakeKey(const Keystroke &keystroke) { XFlush(m_display); } -void XWindowsKeyState::updateKeysymMap(synergy::KeyMap &keyMap) { +void XWindowsKeyState::updateKeysymMap(deskflow::KeyMap &keyMap) { // there are up to 4 keysyms per keycode static const int maxKeysyms = 4; @@ -434,7 +435,7 @@ void XWindowsKeyState::updateKeysymMap(synergy::KeyMap &keyMap) { } // add entries for each keycode - synergy::KeyMap::KeyItem item; + deskflow::KeyMap::KeyItem item; for (int i = 0; i < numKeycodes; ++i) { KeySym *keysyms = allKeysyms + maxKeysyms * i; KeyCode keycode = static_cast(i + minKeycode); @@ -533,7 +534,7 @@ void XWindowsKeyState::updateKeysymMap(synergy::KeyMap &keyMap) { item.m_lock = false; if (modifierButtons.count(keycode) > 0) { // get flags for modifier keys - synergy::KeyMap::initModifierKey(item); + deskflow::KeyMap::initModifierKey(item); // add mapping from X (unless we already have) if (item.m_generates != 0) { @@ -579,7 +580,7 @@ void XWindowsKeyState::updateKeysymMap(synergy::KeyMap &keyMap) { } #if HAVE_XKB_EXTENSION -void XWindowsKeyState::updateKeysymMapXKB(synergy::KeyMap &keyMap) { +void XWindowsKeyState::updateKeysymMapXKB(deskflow::KeyMap &keyMap) { static const XkbKTMapEntryRec defMapEntry = { True, // active 0, // level @@ -623,7 +624,7 @@ void XWindowsKeyState::updateKeysymMapXKB(synergy::KeyMap &keyMap) { // check every button. on this pass we save all modifiers as native // X modifier masks. - synergy::KeyMap::KeyItem item; + deskflow::KeyMap::KeyItem item; for (int i = m_xkb->min_key_code; i <= m_xkb->max_key_code; ++i) { KeyCode keycode = static_cast(i); item.m_button = static_cast(keycode); @@ -800,7 +801,7 @@ void XWindowsKeyState::updateKeysymMapXKB(synergy::KeyMap &keyMap) { } } - // change all modifier masks to synergy masks from X masks + // change all modifier masks to deskflow masks from X masks keyMap.foreachKey(&XWindowsKeyState::remapKeyModifiers, this); // allow composition across groups @@ -809,7 +810,7 @@ void XWindowsKeyState::updateKeysymMapXKB(synergy::KeyMap &keyMap) { #endif void XWindowsKeyState::remapKeyModifiers( - KeyID id, SInt32 group, synergy::KeyMap::KeyItem &item, void *vself) { + KeyID id, SInt32 group, deskflow::KeyMap::KeyItem &item, void *vself) { XWindowsKeyState *self = static_cast(vself); item.m_required = self->mapModifiersFromX(XkbBuildCoreState(item.m_required, group)); diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h index 1b4d77d4c..2fb4602da 100644 --- a/src/lib/platform/XWindowsKeyState.h +++ b/src/lib/platform/XWindowsKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -20,16 +20,16 @@ #include "common/stdmap.h" #include "common/stdvector.h" -#include "synergy/KeyState.h" +#include "deskflow/KeyState.h" #if X_DISPLAY_MISSING -#error X11 is required to build synergy +#error X11 is required to build deskflow #else #include #if HAVE_X11_EXTENSIONS_XTEST_H #include #else -#error The XTest extension is required to build synergy +#error The XTest extension is required to build deskflow #endif #if HAVE_XKB_EXTENSION #include @@ -49,7 +49,7 @@ public: XWindowsKeyState(Display *, bool useXKB, IEventQueue *events); XWindowsKeyState( - Display *, bool useXKB, IEventQueue *events, synergy::KeyMap &keyMap); + Display *, bool useXKB, IEventQueue *events, deskflow::KeyMap &keyMap); ~XWindowsKeyState(); //! @name modifiers @@ -75,24 +75,24 @@ public: //! @name accessors //@{ - //! Convert X modifier mask to synergy mask + //! Convert X modifier mask to deskflow mask /*! - Returns the synergy modifier mask corresponding to the X modifier + Returns the deskflow modifier mask corresponding to the X modifier mask in \p state. */ KeyModifierMask mapModifiersFromX(unsigned int state) const; - //! Convert synergy modifier mask to X mask + //! Convert deskflow modifier mask to X mask /*! - Converts the synergy modifier mask to the corresponding X modifier + Converts the deskflow modifier mask to the corresponding X modifier mask. Returns \c true if successful and \c false if any modifier could not be converted. */ bool mapModifiersToX(KeyModifierMask, unsigned int &) const; - //! Convert synergy key to all corresponding X keycodes + //! Convert deskflow key to all corresponding X keycodes /*! - Converts the synergy key \p key to all of the keycodes that map to + Converts the deskflow key \p key to all of the keycodes that map to that key. */ void mapKeyToKeycodes(KeyID key, KeycodeList &keycodes) const; @@ -107,13 +107,13 @@ public: protected: // KeyState overrides - virtual void getKeyMap(synergy::KeyMap &keyMap); + virtual void getKeyMap(deskflow::KeyMap &keyMap); virtual void fakeKey(const Keystroke &keystroke); private: void init(Display *display, bool useXKB); - void updateKeysymMap(synergy::KeyMap &); - void updateKeysymMapXKB(synergy::KeyMap &); + void updateKeysymMap(deskflow::KeyMap &); + void updateKeysymMapXKB(deskflow::KeyMap &); bool hasModifiersXKB() const; int getEffectiveGroup(KeyCode, int group) const; UInt32 getGroupFromState(unsigned int state) const; @@ -125,7 +125,7 @@ private: bool setCurrentLanguageWithDBus(SInt32 group) const; static void - remapKeyModifiers(KeyID, SInt32, synergy::KeyMap::KeyItem &, void *); + remapKeyModifiers(KeyID, SInt32, deskflow::KeyMap::KeyItem &, void *); private: struct XKBModifierInfo { @@ -154,10 +154,10 @@ private: XKBModifierMap m_lastGoodXKBModifiers; NonXKBModifierMap m_lastGoodNonXKBModifiers; - // X modifier (bit number) to synergy modifier (mask) mapping + // X modifier (bit number) to deskflow modifier (mask) mapping KeyModifierMaskList m_modifierFromX; - // synergy modifier (mask) to X modifier (mask) + // deskflow modifier (mask) to X modifier (mask) KeyModifierToXMask m_modifierToX; // map KeyID to all keycodes that can synthesize that KeyID diff --git a/src/lib/platform/XWindowsPowerManager.cpp b/src/lib/platform/XWindowsPowerManager.cpp index 01d9808c2..2f82a8664 100644 --- a/src/lib/platform/XWindowsPowerManager.cpp +++ b/src/lib/platform/XWindowsPowerManager.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsPowerManager.h b/src/lib/platform/XWindowsPowerManager.h index 17bfdb198..be2f23966 100644 --- a/src/lib/platform/XWindowsPowerManager.h +++ b/src/lib/platform/XWindowsPowerManager.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp index 2ad5e31b4..595a59751 100644 --- a/src/lib/platform/XWindowsScreen.cpp +++ b/src/lib/platform/XWindowsScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -25,24 +25,24 @@ #include "base/Stopwatch.h" #include "base/String.h" #include "base/TMethodEventJob.h" +#include "deskflow/App.h" +#include "deskflow/ArgsBase.h" +#include "deskflow/ClientApp.h" +#include "deskflow/ClientArgs.h" +#include "deskflow/Clipboard.h" +#include "deskflow/KeyMap.h" +#include "deskflow/XScreen.h" #include "platform/XWindowsClipboard.h" #include "platform/XWindowsEventQueueBuffer.h" #include "platform/XWindowsKeyState.h" #include "platform/XWindowsScreenSaver.h" #include "platform/XWindowsUtil.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" -#include "synergy/ClientApp.h" -#include "synergy/ClientArgs.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/XScreen.h" #include #include #include #if X_DISPLAY_MISSING -#error X11 is required to build synergy +#error X11 is required to build deskflow #else #include #include @@ -57,7 +57,7 @@ extern "C" { #if HAVE_X11_EXTENSIONS_XTEST_H #include #else -#error The XTest extension is required to build synergy +#error The XTest extension is required to build deskflow #endif #if HAVE_X11_EXTENSIONS_XINERAMA_H // Xinerama.h may lack extern "C" for inclusion by C++ @@ -98,7 +98,7 @@ XWindowsScreen *XWindowsScreen::s_screen = NULL; XWindowsScreen::XWindowsScreen( const char *displayName, bool isPrimary, bool disableXInitThreads, int mouseScrollDelta, IEventQueue *events, - synergy::ClientScrollDirection scrollDirection) + deskflow::ClientScrollDirection scrollDirection) : PlatformScreen(events, scrollDirection), m_isPrimary(isPrimary), m_mouseScrollDelta(mouseScrollDelta), @@ -710,13 +710,13 @@ UInt32 XWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask) { m_hotKeys.erase(id); LOG( (CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", - synergy::KeyMap::formatKey(key, mask).c_str(), key, mask)); + deskflow::KeyMap::formatKey(key, mask).c_str(), key, mask)); return 0; } LOG( (CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", - synergy::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); + deskflow::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); return id; } @@ -933,7 +933,7 @@ void XWindowsScreen::saveShape() { // 0,0 to Wm,Hm where Wm (Hm) is the minimum width (height) over // all physical screens. this warp only seems to happen if the // pointer wasn't in that region before the XWarpPointer(). the - // second (unexpected) warp causes synergy to think the pointer + // second (unexpected) warp causes deskflow to think the pointer // has been moved when it hasn't. to work around the problem, // we warp the pointer to the center of the first physical // screen instead of the logical screen. @@ -978,7 +978,7 @@ void XWindowsScreen::setShape(SInt32 width, SInt32 height) { // 0,0 to Wm,Hm where Wm (Hm) is the minimum width (height) over // all physical screens. this warp only seems to happen if the // pointer wasn't in that region before the XWarpPointer(). the - // second (unexpected) warp causes synergy to think the pointer + // second (unexpected) warp causes deskflow to think the pointer // has been moved when it hasn't. to work around the problem, // we warp the pointer to the center of the first physical // screen instead of the logical screen. @@ -1056,7 +1056,7 @@ void XWindowsScreen::openIM() { return; } - // find the appropriate style. synergy supports XIMPreeditNothing + // find the appropriate style. deskflow supports XIMPreeditNothing // only at the moment. XIMStyles *styles; if (XGetIMValues(im, XNQueryInputStyle, &styles, NULL) != NULL || diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h index 8deb64540..bd29d99da 100644 --- a/src/lib/platform/XWindowsScreen.h +++ b/src/lib/platform/XWindowsScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -21,13 +21,13 @@ #include "arch/Arch.h" #include "common/stdset.h" #include "common/stdvector.h" +#include "deskflow/ClientArgs.h" +#include "deskflow/KeyMap.h" +#include "deskflow/PlatformScreen.h" #include "platform/XWindowsPowerManager.h" -#include "synergy/ClientArgs.h" -#include "synergy/KeyMap.h" -#include "synergy/PlatformScreen.h" #if X_DISPLAY_MISSING -#error X11 is required to build synergy +#error X11 is required to build deskflow #else #include #endif @@ -42,8 +42,8 @@ public: XWindowsScreen( const char *displayName, bool isPrimary, bool disableXInitThreads, int mouseScrollDelta, IEventQueue *events, - synergy::ClientScrollDirection m_clientScrollDirection = - synergy::ClientScrollDirection::SERVER); + deskflow::ClientScrollDirection m_clientScrollDirection = + deskflow::ClientScrollDirection::SERVER); virtual ~XWindowsScreen() override; //! @name manipulators @@ -250,7 +250,7 @@ private: int m_xrandrEventBase; IEventQueue *m_events; - synergy::KeyMap m_keyMap; + deskflow::KeyMap m_keyMap; // pointer to (singleton) screen. this is only needed by // ioErrorHandler(). diff --git a/src/lib/platform/XWindowsScreenSaver.cpp b/src/lib/platform/XWindowsScreenSaver.cpp index 3680b6d76..12e3f5761 100644 --- a/src/lib/platform/XWindowsScreenSaver.cpp +++ b/src/lib/platform/XWindowsScreenSaver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -22,14 +22,14 @@ #include "base/IEventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/IPlatformScreen.h" #include "platform/XWindowsUtil.h" -#include "synergy/IPlatformScreen.h" #include #if HAVE_X11_EXTENSIONS_XTEST_H #include #else -#error The XTest extension is required to build synergy +#error The XTest extension is required to build deskflow #endif #if HAVE_X11_EXTENSIONS_DPMS_H extern "C" { diff --git a/src/lib/platform/XWindowsScreenSaver.h b/src/lib/platform/XWindowsScreenSaver.h index e39e19d14..624513ad9 100644 --- a/src/lib/platform/XWindowsScreenSaver.h +++ b/src/lib/platform/XWindowsScreenSaver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -20,10 +20,10 @@ #include "base/IEventQueue.h" #include "common/stdmap.h" -#include "synergy/IScreenSaver.h" +#include "deskflow/IScreenSaver.h" #if X_DISPLAY_MISSING -#error X11 is required to build synergy +#error X11 is required to build deskflow #else #include #endif diff --git a/src/lib/platform/XWindowsUtil.cpp b/src/lib/platform/XWindowsUtil.cpp index d4e09b726..66564d76f 100644 --- a/src/lib/platform/XWindowsUtil.cpp +++ b/src/lib/platform/XWindowsUtil.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -20,8 +20,8 @@ #include "base/Log.h" #include "base/String.h" +#include "deskflow/key_types.h" #include "mt/Thread.h" -#include "synergy/key_types.h" #include #define XK_APL @@ -1849,9 +1849,9 @@ String XWindowsUtil::atomToString(Display *display, Atom atom) { XWindowsUtil::ErrorLock lock(display, &error); char *name = XGetAtomName(display, atom); if (error) { - return synergy::string::sprintf(" (%d)", (int)atom); + return deskflow::string::sprintf(" (%d)", (int)atom); } else { - String msg = synergy::string::sprintf("%s (%d)", name, (int)atom); + String msg = deskflow::string::sprintf("%s (%d)", name, (int)atom); XFree(name); return msg; } @@ -1866,11 +1866,11 @@ XWindowsUtil::atomsToString(Display *display, const Atom *atom, UInt32 num) { String msg; if (error) { for (UInt32 i = 0; i < num; ++i) { - msg += synergy::string::sprintf(" (%d), ", (int)atom[i]); + msg += deskflow::string::sprintf(" (%d), ", (int)atom[i]); } } else { for (UInt32 i = 0; i < num; ++i) { - msg += synergy::string::sprintf("%s (%d), ", names[i], (int)atom[i]); + msg += deskflow::string::sprintf("%s (%d), ", names[i], (int)atom[i]); XFree(names[i]); } } diff --git a/src/lib/platform/XWindowsUtil.h b/src/lib/platform/XWindowsUtil.h index b5591dcb4..479f597e2 100644 --- a/src/lib/platform/XWindowsUtil.h +++ b/src/lib/platform/XWindowsUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,7 +24,7 @@ #include "common/stdvector.h" #if X_DISPLAY_MISSING -#error X11 is required to build synergy +#error X11 is required to build deskflow #else #include #endif diff --git a/src/lib/platform/synwinhk.h b/src/lib/platform/dfwhook.h similarity index 55% rename from src/lib/platform/synwinhk.h rename to src/lib/platform/dfwhook.h index bc3c4f898..266c64c86 100644 --- a/src/lib/platform/synwinhk.h +++ b/src/lib/platform/dfwhook.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -31,27 +31,27 @@ #define WIN32_LEAN_AND_MEAN #include -#if defined(synwinhk_EXPORTS) -#define CSYNERGYHOOK_API __declspec(dllexport) +#if defined(dfwhook_EXPORTS) +#define CDESKFLOWHOOK_API __declspec(dllexport) #else -#define CSYNERGYHOOK_API __declspec(dllimport) +#define CDESKFLOWHOOK_API __declspec(dllimport) #endif -#define SYNERGY_MSG_MARK WM_APP + 0x0011 // mark id; -#define SYNERGY_MSG_KEY WM_APP + 0x0012 // vk code; key data -#define SYNERGY_MSG_MOUSE_BUTTON WM_APP + 0x0013 // button msg; -#define SYNERGY_MSG_MOUSE_WHEEL WM_APP + 0x0014 // delta; -#define SYNERGY_MSG_MOUSE_MOVE WM_APP + 0x0015 // x; y -#define SYNERGY_MSG_POST_WARP WM_APP + 0x0016 // ; -#define SYNERGY_MSG_PRE_WARP WM_APP + 0x0017 // x; y -#define SYNERGY_MSG_SCREEN_SAVER WM_APP + 0x0018 // activated; -#define SYNERGY_MSG_DEBUG WM_APP + 0x0019 // data, data -#define SYNERGY_MSG_INPUT_FIRST SYNERGY_MSG_KEY -#define SYNERGY_MSG_INPUT_LAST SYNERGY_MSG_PRE_WARP -#define SYNERGY_HOOK_LAST_MSG SYNERGY_MSG_DEBUG +#define DESKFLOW_MSG_MARK WM_APP + 0x0011 // mark id; +#define DESKFLOW_MSG_KEY WM_APP + 0x0012 // vk code; key data +#define DESKFLOW_MSG_MOUSE_BUTTON WM_APP + 0x0013 // button msg; +#define DESKFLOW_MSG_MOUSE_WHEEL WM_APP + 0x0014 // delta; +#define DESKFLOW_MSG_MOUSE_MOVE WM_APP + 0x0015 // x; y +#define DESKFLOW_MSG_POST_WARP WM_APP + 0x0016 // ; +#define DESKFLOW_MSG_PRE_WARP WM_APP + 0x0017 // x; y +#define DESKFLOW_MSG_SCREEN_SAVER WM_APP + 0x0018 // activated; +#define DESKFLOW_MSG_DEBUG WM_APP + 0x0019 // data, data +#define DESKFLOW_MSG_INPUT_FIRST DESKFLOW_MSG_KEY +#define DESKFLOW_MSG_INPUT_LAST DESKFLOW_MSG_PRE_WARP +#define DESKFLOW_HOOK_LAST_MSG DESKFLOW_MSG_DEBUG -#define SYNERGY_HOOK_FAKE_INPUT_VIRTUAL_KEY VK_CANCEL -#define SYNERGY_HOOK_FAKE_INPUT_SCANCODE 0 +#define DESKFLOW_HOOK_FAKE_INPUT_VIRTUAL_KEY VK_CANCEL +#define DESKFLOW_HOOK_FAKE_INPUT_SCANCODE 0 extern "C" { diff --git a/src/lib/platform/wayland.h b/src/lib/platform/wayland.h index 1344754de..2db0528f6 100644 --- a/src/lib/platform/wayland.h +++ b/src/lib/platform/wayland.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -namespace synergy::platform { +namespace deskflow::platform { #if WINAPI_LIBEI const auto kHasEi = true; @@ -44,4 +44,4 @@ inline bool isWayland() { return session != nullptr && std::string(session) == "wayland"; } -} // namespace synergy::platform +} // namespace deskflow::platform diff --git a/src/lib/server/BaseClientProxy.cpp b/src/lib/server/BaseClientProxy.cpp index a1c18f8ed..7cc9aca16 100644 --- a/src/lib/server/BaseClientProxy.cpp +++ b/src/lib/server/BaseClientProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2006 Chris Schoeneman * diff --git a/src/lib/server/BaseClientProxy.h b/src/lib/server/BaseClientProxy.h index a64ab19b1..7cf92712d 100644 --- a/src/lib/server/BaseClientProxy.h +++ b/src/lib/server/BaseClientProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,9 +19,9 @@ #pragma once #include "base/String.h" -#include "synergy/IClient.h" +#include "deskflow/IClient.h" -namespace synergy { +namespace deskflow { class IStream; } @@ -94,7 +94,7 @@ public: virtual String getSecureInputApp() const = 0; virtual void secureInputNotification(const String &app) const = 0; virtual String getName() const; - virtual synergy::IStream *getStream() const = 0; + virtual deskflow::IStream *getStream() const = 0; private: String m_name; diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt index d25b95d64..a4a75cd72 100644 --- a/src/lib/server/CMakeLists.txt +++ b/src/lib/server/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -26,5 +26,5 @@ add_library(server STATIC ${sources}) target_link_libraries(server license) if(UNIX) - target_link_libraries(server synlib) + target_link_libraries(server app) endif() diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp index af0709011..0f9993434 100644 --- a/src/lib/server/ClientListener.cpp +++ b/src/lib/server/ClientListener.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -22,13 +22,13 @@ #include "base/IEventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/PacketStreamFilter.h" #include "net/IDataSocket.h" #include "net/IListenSocket.h" #include "net/ISocketFactory.h" #include "net/XSocket.h" #include "server/ClientProxy.h" #include "server/ClientProxyUnknown.h" -#include "synergy/PacketStreamFilter.h" // // ClientListener @@ -167,7 +167,7 @@ void ClientListener::handleClientAccepted(const Event &, void *vsocket) { IDataSocket *socket = static_cast(vsocket); // filter socket messages, including a packetizing filter - synergy::IStream *stream = new PacketStreamFilter(m_events, socket, false); + deskflow::IStream *stream = new PacketStreamFilter(m_events, socket, false); assert(m_server != NULL); // create proxy for unknown client diff --git a/src/lib/server/ClientListener.h b/src/lib/server/ClientListener.h index f3ae2b0aa..de4960d04 100644 --- a/src/lib/server/ClientListener.h +++ b/src/lib/server/ClientListener.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/server/ClientProxy.cpp b/src/lib/server/ClientProxy.cpp index 26d24420f..b914822dd 100644 --- a/src/lib/server/ClientProxy.cpp +++ b/src/lib/server/ClientProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -20,14 +20,14 @@ #include "base/EventQueue.h" #include "base/Log.h" +#include "deskflow/ProtocolUtil.h" #include "io/IStream.h" -#include "synergy/ProtocolUtil.h" // // ClientProxy // -ClientProxy::ClientProxy(const String &name, synergy::IStream *stream) +ClientProxy::ClientProxy(const String &name, deskflow::IStream *stream) : BaseClientProxy(name), m_stream(stream) {} @@ -41,7 +41,7 @@ void ClientProxy::close(const char *msg) { getStream()->flush(); } -synergy::IStream *ClientProxy::getStream() const { return m_stream; } +deskflow::IStream *ClientProxy::getStream() const { return m_stream; } void *ClientProxy::getEventTarget() const { return static_cast(const_cast(this)); diff --git a/src/lib/server/ClientProxy.h b/src/lib/server/ClientProxy.h index bc2e93d96..54262529f 100644 --- a/src/lib/server/ClientProxy.h +++ b/src/lib/server/ClientProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,7 +23,7 @@ #include "base/String.h" #include "server/BaseClientProxy.h" -namespace synergy { +namespace deskflow { class IStream; } @@ -33,7 +33,7 @@ public: /*! \c name is the name of the client. */ - ClientProxy(const String &name, synergy::IStream *adoptedStream); + ClientProxy(const String &name, deskflow::IStream *adoptedStream); ClientProxy(ClientProxy const &) = delete; ClientProxy(ClientProxy &&) = delete; ~ClientProxy(); @@ -58,7 +58,7 @@ public: /*! Returns the original stream passed to the c'tor. */ - synergy::IStream *getStream() const override; + deskflow::IStream *getStream() const override; //@} @@ -96,5 +96,5 @@ public: void secureInputNotification(const String &app) const override = 0; private: - synergy::IStream *m_stream; + deskflow::IStream *m_stream; }; diff --git a/src/lib/server/ClientProxy1_0.cpp b/src/lib/server/ClientProxy1_0.cpp index 6f722fcb8..d87ccdb74 100644 --- a/src/lib/server/ClientProxy1_0.cpp +++ b/src/lib/server/ClientProxy1_0.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -21,9 +21,9 @@ #include "base/IEventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/ProtocolUtil.h" +#include "deskflow/XDeskflow.h" #include "io/IStream.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/XSynergy.h" #include @@ -32,7 +32,7 @@ // ClientProxy1_0::ClientProxy1_0( - const String &name, synergy::IStream *stream, IEventQueue *events) + const String &name, deskflow::IStream *stream, IEventQueue *events) : ClientProxy(name, stream), m_heartbeatTimer(NULL), m_parser(&ClientProxy1_0::parseHandshakeMessage), diff --git a/src/lib/server/ClientProxy1_0.h b/src/lib/server/ClientProxy1_0.h index 7b327ea70..b3d05ad16 100644 --- a/src/lib/server/ClientProxy1_0.h +++ b/src/lib/server/ClientProxy1_0.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,9 +18,9 @@ #pragma once +#include "deskflow/Clipboard.h" +#include "deskflow/protocol_types.h" #include "server/ClientProxy.h" -#include "synergy/Clipboard.h" -#include "synergy/protocol_types.h" class Event; class EventQueueTimer; @@ -30,7 +30,8 @@ class IEventQueue; class ClientProxy1_0 : public ClientProxy { public: ClientProxy1_0( - const String &name, synergy::IStream *adoptedStream, IEventQueue *events); + const String &name, deskflow::IStream *adoptedStream, + IEventQueue *events); ClientProxy1_0(ClientProxy1_0 const &) = delete; ClientProxy1_0(ClientProxy1_0 &&) = delete; ~ClientProxy1_0(); diff --git a/src/lib/server/ClientProxy1_1.cpp b/src/lib/server/ClientProxy1_1.cpp index c942b0628..e22b276dc 100644 --- a/src/lib/server/ClientProxy1_1.cpp +++ b/src/lib/server/ClientProxy1_1.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -17,10 +17,10 @@ */ #include "server/ClientProxy1_1.h" -#include "synergy/AppUtil.h" +#include "deskflow/AppUtil.h" #include "base/Log.h" -#include "synergy/ProtocolUtil.h" +#include "deskflow/ProtocolUtil.h" #include @@ -29,7 +29,7 @@ // ClientProxy1_1::ClientProxy1_1( - const String &name, synergy::IStream *stream, IEventQueue *events) + const String &name, deskflow::IStream *stream, IEventQueue *events) : ClientProxy1_0(name, stream, events) { // do nothing } diff --git a/src/lib/server/ClientProxy1_1.h b/src/lib/server/ClientProxy1_1.h index 7fc334c11..489dc78a1 100644 --- a/src/lib/server/ClientProxy1_1.h +++ b/src/lib/server/ClientProxy1_1.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,7 +24,8 @@ class ClientProxy1_1 : public ClientProxy1_0 { public: ClientProxy1_1( - const String &name, synergy::IStream *adoptedStream, IEventQueue *events); + const String &name, deskflow::IStream *adoptedStream, + IEventQueue *events); ~ClientProxy1_1(); // IClient overrides diff --git a/src/lib/server/ClientProxy1_2.cpp b/src/lib/server/ClientProxy1_2.cpp index 84c9071e5..4da79b567 100644 --- a/src/lib/server/ClientProxy1_2.cpp +++ b/src/lib/server/ClientProxy1_2.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,14 +19,14 @@ #include "server/ClientProxy1_2.h" #include "base/Log.h" -#include "synergy/ProtocolUtil.h" +#include "deskflow/ProtocolUtil.h" // // ClientProxy1_1 // ClientProxy1_2::ClientProxy1_2( - const String &name, synergy::IStream *stream, IEventQueue *events) + const String &name, deskflow::IStream *stream, IEventQueue *events) : ClientProxy1_1(name, stream, events) { // do nothing } diff --git a/src/lib/server/ClientProxy1_2.h b/src/lib/server/ClientProxy1_2.h index 68501c183..8829588bd 100644 --- a/src/lib/server/ClientProxy1_2.h +++ b/src/lib/server/ClientProxy1_2.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -26,7 +26,8 @@ class IEventQueue; class ClientProxy1_2 : public ClientProxy1_1 { public: ClientProxy1_2( - const String &name, synergy::IStream *adoptedStream, IEventQueue *events); + const String &name, deskflow::IStream *adoptedStream, + IEventQueue *events); ~ClientProxy1_2(); // IClient overrides diff --git a/src/lib/server/ClientProxy1_3.cpp b/src/lib/server/ClientProxy1_3.cpp index aab0b0092..84d833846 100644 --- a/src/lib/server/ClientProxy1_3.cpp +++ b/src/lib/server/ClientProxy1_3.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2006 Chris Schoeneman * @@ -21,7 +21,7 @@ #include "base/IEventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" -#include "synergy/ProtocolUtil.h" +#include "deskflow/ProtocolUtil.h" #include #include @@ -31,7 +31,7 @@ // ClientProxy1_3::ClientProxy1_3( - const String &name, synergy::IStream *stream, IEventQueue *events) + const String &name, deskflow::IStream *stream, IEventQueue *events) : ClientProxy1_2(name, stream, events), m_keepAliveRate(kKeepAliveRate), m_keepAliveTimer(NULL), diff --git a/src/lib/server/ClientProxy1_3.h b/src/lib/server/ClientProxy1_3.h index e5a6e8aeb..c3f7529fa 100644 --- a/src/lib/server/ClientProxy1_3.h +++ b/src/lib/server/ClientProxy1_3.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2006 Chris Schoeneman * @@ -24,7 +24,8 @@ class ClientProxy1_3 : public ClientProxy1_2 { public: ClientProxy1_3( - const String &name, synergy::IStream *adoptedStream, IEventQueue *events); + const String &name, deskflow::IStream *adoptedStream, + IEventQueue *events); ClientProxy1_3(ClientProxy1_3 const &) = delete; ClientProxy1_3(ClientProxy1_3 &&) = delete; ~ClientProxy1_3(); diff --git a/src/lib/server/ClientProxy1_4.cpp b/src/lib/server/ClientProxy1_4.cpp index dc640cee3..bd189920f 100644 --- a/src/lib/server/ClientProxy1_4.cpp +++ b/src/lib/server/ClientProxy1_4.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * @@ -21,8 +21,8 @@ #include "base/IEventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/ProtocolUtil.h" #include "server/Server.h" -#include "synergy/ProtocolUtil.h" #include #include @@ -32,7 +32,7 @@ // ClientProxy1_4::ClientProxy1_4( - const String &name, synergy::IStream *stream, Server *server, + const String &name, deskflow::IStream *stream, Server *server, IEventQueue *events) : ClientProxy1_3(name, stream, events), m_server(server) { diff --git a/src/lib/server/ClientProxy1_4.h b/src/lib/server/ClientProxy1_4.h index 96502ae2a..19d0f5660 100644 --- a/src/lib/server/ClientProxy1_4.h +++ b/src/lib/server/ClientProxy1_4.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * @@ -26,7 +26,7 @@ class Server; class ClientProxy1_4 : public ClientProxy1_3 { public: ClientProxy1_4( - const String &name, synergy::IStream *adoptedStream, Server *server, + const String &name, deskflow::IStream *adoptedStream, Server *server, IEventQueue *events); ~ClientProxy1_4(); diff --git a/src/lib/server/ClientProxy1_5.cpp b/src/lib/server/ClientProxy1_5.cpp index 963c26ada..3a544f4a4 100644 --- a/src/lib/server/ClientProxy1_5.cpp +++ b/src/lib/server/ClientProxy1_5.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,11 +19,11 @@ #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/FileChunk.h" +#include "deskflow/ProtocolUtil.h" +#include "deskflow/StreamChunker.h" #include "io/IStream.h" #include "server/Server.h" -#include "synergy/FileChunk.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/StreamChunker.h" #include @@ -32,7 +32,7 @@ // ClientProxy1_5::ClientProxy1_5( - const String &name, synergy::IStream *stream, Server *server, + const String &name, deskflow::IStream *stream, Server *server, IEventQueue *events) : ClientProxy1_4(name, stream, server, events), m_events(events) { diff --git a/src/lib/server/ClientProxy1_5.h b/src/lib/server/ClientProxy1_5.h index 9080e108f..b860edb83 100644 --- a/src/lib/server/ClientProxy1_5.h +++ b/src/lib/server/ClientProxy1_5.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ class IEventQueue; class ClientProxy1_5 : public ClientProxy1_4 { public: ClientProxy1_5( - const String &name, synergy::IStream *adoptedStream, Server *server, + const String &name, deskflow::IStream *adoptedStream, Server *server, IEventQueue *events); ClientProxy1_5(ClientProxy1_5 const &) = delete; ClientProxy1_5(ClientProxy1_5 &&) = delete; diff --git a/src/lib/server/ClientProxy1_6.cpp b/src/lib/server/ClientProxy1_6.cpp index 62445c04d..915fdb35b 100644 --- a/src/lib/server/ClientProxy1_6.cpp +++ b/src/lib/server/ClientProxy1_6.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,18 +19,18 @@ #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/ClipboardChunk.h" +#include "deskflow/ProtocolUtil.h" +#include "deskflow/StreamChunker.h" #include "io/IStream.h" #include "server/Server.h" -#include "synergy/ClipboardChunk.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/StreamChunker.h" // // ClientProxy1_6 // ClientProxy1_6::ClientProxy1_6( - const String &name, synergy::IStream *stream, Server *server, + const String &name, deskflow::IStream *stream, Server *server, IEventQueue *events) : ClientProxy1_5(name, stream, server, events), m_events(events) { diff --git a/src/lib/server/ClientProxy1_6.h b/src/lib/server/ClientProxy1_6.h index 2b3e26802..7af9a5a4a 100644 --- a/src/lib/server/ClientProxy1_6.h +++ b/src/lib/server/ClientProxy1_6.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ class IEventQueue; class ClientProxy1_6 : public ClientProxy1_5 { public: ClientProxy1_6( - const String &name, synergy::IStream *adoptedStream, Server *server, + const String &name, deskflow::IStream *adoptedStream, Server *server, IEventQueue *events); ~ClientProxy1_6(); diff --git a/src/lib/server/ClientProxy1_7.cpp b/src/lib/server/ClientProxy1_7.cpp index da3121f44..985e120b9 100644 --- a/src/lib/server/ClientProxy1_7.cpp +++ b/src/lib/server/ClientProxy1_7.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,16 +18,16 @@ #include "server/ClientProxy1_7.h" #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/AppUtil.h" +#include "deskflow/ProtocolUtil.h" #include "server/Server.h" -#include "synergy/AppUtil.h" -#include "synergy/ProtocolUtil.h" // // ClientProxy1_7 // ClientProxy1_7::ClientProxy1_7( - const String &name, synergy::IStream *stream, Server *server, + const String &name, deskflow::IStream *stream, Server *server, IEventQueue *events) : ClientProxy1_6(name, stream, server, events), m_events(events) {} diff --git a/src/lib/server/ClientProxy1_7.h b/src/lib/server/ClientProxy1_7.h index 0c1ee81ca..5db41185c 100644 --- a/src/lib/server/ClientProxy1_7.h +++ b/src/lib/server/ClientProxy1_7.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ class ClientProxy1_7 : public ClientProxy1_6 { public: ClientProxy1_7( - const String &name, synergy::IStream *adoptedStream, Server *server, + const String &name, deskflow::IStream *adoptedStream, Server *server, IEventQueue *events); ~ClientProxy1_7() override = default; diff --git a/src/lib/server/ClientProxy1_8.cpp b/src/lib/server/ClientProxy1_8.cpp index 473cfdff1..e7f15515e 100644 --- a/src/lib/server/ClientProxy1_8.cpp +++ b/src/lib/server/ClientProxy1_8.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,20 +15,20 @@ * along with this program. If not, see . */ #include "base/Log.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/languages/LanguageManager.h" +#include "deskflow/ProtocolUtil.h" +#include "deskflow/languages/LanguageManager.h" #include "ClientProxy1_8.h" ClientProxy1_8::ClientProxy1_8( - const String &name, synergy::IStream *adoptedStream, Server *server, + const String &name, deskflow::IStream *adoptedStream, Server *server, IEventQueue *events) : ClientProxy1_7(name, adoptedStream, server, events) { synchronizeLanguages(); } void ClientProxy1_8::synchronizeLanguages() const { - synergy::languages::LanguageManager languageManager; + deskflow::languages::LanguageManager languageManager; auto localLanguages = languageManager.getSerializedLocalLanguages(); if (!localLanguages.empty()) { LOG( diff --git a/src/lib/server/ClientProxy1_8.h b/src/lib/server/ClientProxy1_8.h index 77bb727d1..81094a7dc 100644 --- a/src/lib/server/ClientProxy1_8.h +++ b/src/lib/server/ClientProxy1_8.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ class ClientProxy1_8 : public ClientProxy1_7 { public: ClientProxy1_8( - const String &name, synergy::IStream *adoptedStream, Server *server, + const String &name, deskflow::IStream *adoptedStream, Server *server, IEventQueue *events); ~ClientProxy1_8() override = default; diff --git a/src/lib/server/ClientProxyUnknown.cpp b/src/lib/server/ClientProxyUnknown.cpp index 2b5642be2..2d9c7582c 100644 --- a/src/lib/server/ClientProxyUnknown.cpp +++ b/src/lib/server/ClientProxyUnknown.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -21,6 +21,10 @@ #include "base/IEventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/AppUtil.h" +#include "deskflow/ProtocolUtil.h" +#include "deskflow/XDeskflow.h" +#include "deskflow/protocol_types.h" #include "io/IStream.h" #include "io/XIO.h" #include "server/ClientProxy1_0.h" @@ -33,10 +37,6 @@ #include "server/ClientProxy1_7.h" #include "server/ClientProxy1_8.h" #include "server/Server.h" -#include "synergy/AppUtil.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/XSynergy.h" -#include "synergy/protocol_types.h" #include #include @@ -46,7 +46,7 @@ // ClientProxyUnknown::ClientProxyUnknown( - synergy::IStream *stream, double timeout, Server *server, + deskflow::IStream *stream, double timeout, Server *server, IEventQueue *events) : m_stream(stream), m_proxy(NULL), diff --git a/src/lib/server/ClientProxyUnknown.h b/src/lib/server/ClientProxyUnknown.h index 0c8cf046e..bb6811803 100644 --- a/src/lib/server/ClientProxyUnknown.h +++ b/src/lib/server/ClientProxyUnknown.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -24,7 +24,7 @@ class ClientProxy; class EventQueueTimer; -namespace synergy { +namespace deskflow { class IStream; } class Server; @@ -33,7 +33,7 @@ class IEventQueue; class ClientProxyUnknown { public: ClientProxyUnknown( - synergy::IStream *stream, double timeout, Server *server, + deskflow::IStream *stream, double timeout, Server *server, IEventQueue *events); ClientProxyUnknown(ClientProxyUnknown const &) = delete; ClientProxyUnknown(ClientProxyUnknown &&) = delete; @@ -54,7 +54,7 @@ public: ClientProxy *orphanClientProxy(); //! Get the stream - synergy::IStream *getStream() { return m_stream; } + deskflow::IStream *getStream() { return m_stream; } //@} @@ -73,7 +73,7 @@ private: void handleReady(const Event &, void *); private: - synergy::IStream *m_stream; + deskflow::IStream *m_stream; EventQueueTimer *m_timer; ClientProxy *m_proxy; bool m_ready; diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp index 7bc78f7fc..d9637fa30 100644 --- a/src/lib/server/Config.cpp +++ b/src/lib/server/Config.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -21,16 +21,16 @@ #include "base/IEventQueue.h" #include "common/stdistream.h" #include "common/stdostream.h" +#include "deskflow/KeyMap.h" +#include "deskflow/key_types.h" #include "net/XSocket.h" #include "server/Server.h" -#include "synergy/KeyMap.h" -#include "synergy/key_types.h" #include -using namespace synergy::string; +using namespace deskflow::string; -namespace synergy::server { +namespace deskflow::server { // // Config @@ -250,8 +250,8 @@ bool Config::disconnect( return true; } -void Config::setSynergyAddress(const NetworkAddress &addr) { - m_synergyAddress = addr; +void Config::setDeskflowAddress(const NetworkAddress &addr) { + m_deskflowAddress = addr; } bool Config::addOption(const String &name, OptionID option, OptionValue value) { @@ -459,8 +459,8 @@ Config::link_const_iterator Config::endNeighbor(const String &srcName) const { return index->second.end(); } -const NetworkAddress &Config::getSynergyAddress() const { - return m_synergyAddress; +const NetworkAddress &Config::getDeskflowAddress() const { + return m_deskflowAddress; } const Config::ScreenOptions *Config::getOptions(const String &name) const { @@ -482,7 +482,7 @@ const Config::ScreenOptions *Config::getOptions(const String &name) const { bool Config::hasLockToScreenAction() const { return m_hasLockToScreenAction; } bool Config::operator==(const Config &x) const { - if (m_synergyAddress != x.m_synergyAddress) { + if (m_deskflowAddress != x.m_deskflowAddress) { return false; } if (m_map.size() != x.m_map.size()) { @@ -555,7 +555,7 @@ String Config::formatInterval(const Interval &x) { if (x.first == 0.0f && x.second == 1.0f) { return ""; } - return synergy::string::sprintf( + return deskflow::string::sprintf( "(%d,%d)", (int)(x.first * 100.0f + 0.5f), (int)(x.second * 100.0f + 0.5f)); } @@ -629,8 +629,8 @@ void Config::readSectionOptions(ConfigReadContext &s) { bool handled = true; if (name == "address") { try { - m_synergyAddress = NetworkAddress(value, kDefaultPort); - m_synergyAddress.resolve(); + m_deskflowAddress = NetworkAddress(value, kDefaultPort); + m_deskflowAddress.resolve(); } catch (XSocketAddress &e) { throw XConfigRead(s, String("invalid address argument ") + e.what()); } @@ -1279,7 +1279,7 @@ String Config::getOptionValue(OptionID id, OptionValue value) { } if (id == kOptionHeartbeat || id == kOptionScreenSwitchCornerSize || id == kOptionScreenSwitchDelay || id == kOptionScreenSwitchTwoTap) { - return synergy::string::sprintf("%d", value); + return deskflow::string::sprintf("%d", value); } if (id == kOptionScreenSwitchCorners) { std::string result("none"); @@ -1621,8 +1621,8 @@ std::ostream &operator<<(std::ostream &s, const Config &config) { } } } - if (config.m_synergyAddress.isValid()) { - s << "\taddress = " << config.m_synergyAddress.getHostname().c_str() + if (config.m_deskflowAddress.isValid()) { + s << "\taddress = " << config.m_deskflowAddress.getHostname().c_str() << std::endl; } s << config.m_inputFilter.format("\t"); @@ -1671,7 +1671,7 @@ bool ConfigReadContext::readLine(String &line) { if (!isgraph(line[i]) && line[i] != ' ' && line[i] != '\t') { throw XConfigRead( *this, "invalid character %{1}", - synergy::string::sprintf("%#2x", line[i])); + deskflow::string::sprintf("%#2x", line[i])); } } @@ -1950,12 +1950,12 @@ IPlatformScreen::KeyInfo *ConfigReadContext::parseKeystroke( String s = keystroke; KeyModifierMask mask; - if (!synergy::KeyMap::parseModifiers(s, mask)) { + if (!deskflow::KeyMap::parseModifiers(s, mask)) { throw XConfigRead(*this, "unable to parse key modifiers"); } KeyID key; - if (!synergy::KeyMap::parseKey(s, key)) { + if (!deskflow::KeyMap::parseKey(s, key)) { throw XConfigRead(*this, "unable to parse key"); } @@ -1971,7 +1971,7 @@ ConfigReadContext::parseMouse(const String &mouse) const { String s = mouse; KeyModifierMask mask; - if (!synergy::KeyMap::parseModifiers(s, mask)) { + if (!deskflow::KeyMap::parseModifiers(s, mask)) { throw XConfigRead(*this, "unable to parse button modifiers"); } @@ -1992,7 +1992,7 @@ ConfigReadContext::parseModifier(const String &modifiers) const { String s = modifiers; KeyModifierMask mask; - if (!synergy::KeyMap::parseModifiers(s, mask)) { + if (!deskflow::KeyMap::parseModifiers(s, mask)) { throw XConfigRead(*this, "unable to parse modifiers"); } @@ -2020,7 +2020,7 @@ String ConfigReadContext::concatArgs(const ArgList &args) { // XConfigRead::XConfigRead(const ConfigReadContext &context, const String &error) - : m_error(synergy::string::sprintf( + : m_error(deskflow::string::sprintf( "line %d: %s", context.getLineNumber(), error.c_str())) { // do nothing } @@ -2028,8 +2028,8 @@ XConfigRead::XConfigRead(const ConfigReadContext &context, const String &error) XConfigRead::XConfigRead( const ConfigReadContext &context, const char *errorFmt, const String &arg) : m_error( - synergy::string::sprintf("line %d: ", context.getLineNumber()) + - synergy::string::format(errorFmt, arg.c_str())) { + deskflow::string::sprintf("line %d: ", context.getLineNumber()) + + deskflow::string::format(errorFmt, arg.c_str())) { // do nothing } @@ -2041,4 +2041,4 @@ String XConfigRead::getWhat() const throw() { return format("XConfigRead", "read error: %{1}", m_error.c_str()); } -} // namespace synergy::server +} // namespace deskflow::server diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h index e36698d83..76bf6bfa4 100644 --- a/src/lib/server/Config.h +++ b/src/lib/server/Config.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -22,23 +22,23 @@ #include "base/XBase.h" #include "common/stdmap.h" #include "common/stdset.h" +#include "deskflow/IPlatformScreen.h" +#include "deskflow/option_types.h" +#include "deskflow/protocol_types.h" #include "net/NetworkAddress.h" #include "server/InputFilter.h" -#include "synergy/IPlatformScreen.h" -#include "synergy/option_types.h" -#include "synergy/protocol_types.h" #include -namespace synergy::server { +namespace deskflow::server { class Config; class ConfigReadContext; -} // namespace synergy::server +} // namespace deskflow::server class IEventQueue; namespace std { -template <> struct iterator_traits { +template <> struct iterator_traits { typedef String value_type; typedef ptrdiff_t difference_type; typedef bidirectional_iterator_tag iterator_category; @@ -47,7 +47,7 @@ template <> struct iterator_traits { }; }; // namespace std -namespace synergy::server { +namespace deskflow::server { //! Server configuration /*! @@ -144,8 +144,8 @@ private: public: ScreenOptions m_options; }; - typedef std::map CellMap; - typedef std::map NameMap; + typedef std::map CellMap; + typedef std::map NameMap; public: typedef Cell::const_iterator link_const_iterator; @@ -285,10 +285,10 @@ public: //! Set server address /*! - Set the synergy listen addresses. There is no default address so + Set the deskflow listen addresses. There is no default address so this must be called to run a server using this configuration. */ - void setSynergyAddress(const NetworkAddress &); + void setDeskflowAddress(const NetworkAddress &); //! Add a screen option /*! @@ -390,7 +390,7 @@ public: link_const_iterator endNeighbor(const String &) const; //! Get the server address - const NetworkAddress &getSynergyAddress() const; + const NetworkAddress &getDeskflowAddress() const; //! Get the screen options /*! @@ -479,7 +479,7 @@ private: private: CellMap m_map; NameMap m_nameToCanonicalName; - NetworkAddress m_synergyAddress; + NetworkAddress m_deskflowAddress; ScreenOptions m_globalOptions; InputFilter m_inputFilter; bool m_hasLockToScreenAction; @@ -550,4 +550,4 @@ private: String m_error; }; -} // namespace synergy::server +} // namespace deskflow::server diff --git a/src/lib/server/InputFilter.cpp b/src/lib/server/InputFilter.cpp index 52f31275a..15e4be636 100644 --- a/src/lib/server/InputFilter.cpp +++ b/src/lib/server/InputFilter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2005 Chris Schoeneman * @@ -20,9 +20,9 @@ #include "base/EventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" +#include "deskflow/KeyMap.h" #include "server/PrimaryClient.h" #include "server/Server.h" -#include "synergy/KeyMap.h" #include #include @@ -79,8 +79,8 @@ InputFilter::Condition *InputFilter::KeystrokeCondition::clone() const { } String InputFilter::KeystrokeCondition::format() const { - return synergy::string::sprintf( - "keystroke(%s)", synergy::KeyMap::formatKey(m_key, m_mask).c_str()); + return deskflow::string::sprintf( + "keystroke(%s)", deskflow::KeyMap::formatKey(m_key, m_mask).c_str()); } InputFilter::EFilterStatus @@ -149,11 +149,11 @@ InputFilter::Condition *InputFilter::MouseButtonCondition::clone() const { } String InputFilter::MouseButtonCondition::format() const { - String key = synergy::KeyMap::formatKey(kKeyNone, m_mask); + String key = deskflow::KeyMap::formatKey(kKeyNone, m_mask); if (!key.empty()) { key += "+"; } - return synergy::string::sprintf("mousebutton(%s%d)", key.c_str(), m_button); + return deskflow::string::sprintf("mousebutton(%s%d)", key.c_str(), m_button); } InputFilter::EFilterStatus @@ -202,7 +202,7 @@ InputFilter::Condition *InputFilter::ScreenConnectedCondition::clone() const { } String InputFilter::ScreenConnectedCondition::format() const { - return synergy::string::sprintf("connect(%s)", m_screen.c_str()); + return deskflow::string::sprintf("connect(%s)", m_screen.c_str()); } InputFilter::EFilterStatus @@ -248,7 +248,7 @@ InputFilter::Action *InputFilter::LockCursorToScreenAction::clone() const { String InputFilter::LockCursorToScreenAction::format() const { static const char *s_mode[] = {"off", "on", "toggle"}; - return synergy::string::sprintf("lockCursorToScreen(%s)", s_mode[m_mode]); + return deskflow::string::sprintf("lockCursorToScreen(%s)", s_mode[m_mode]); } void InputFilter::LockCursorToScreenAction::perform(const Event &event) { @@ -281,7 +281,7 @@ InputFilter::Action *InputFilter::RestartServer::clone() const { String InputFilter::RestartServer::format() const { static const char *s_mode[] = {"restart"}; - return synergy::string::sprintf("restartServer(%s)", s_mode[m_mode]); + return deskflow::string::sprintf("restartServer(%s)", s_mode[m_mode]); } void InputFilter::RestartServer::perform(const Event &event) { @@ -303,7 +303,7 @@ InputFilter::Action *InputFilter::SwitchToScreenAction::clone() const { } String InputFilter::SwitchToScreenAction::format() const { - return synergy::string::sprintf("switchToScreen(%s)", m_screen.c_str()); + return deskflow::string::sprintf("switchToScreen(%s)", m_screen.c_str()); } void InputFilter::SwitchToScreenAction::perform(const Event &event) { @@ -341,7 +341,7 @@ InputFilter::Action *InputFilter::SwitchInDirectionAction::clone() const { String InputFilter::SwitchInDirectionAction::format() const { static const char *s_names[] = {"", "left", "right", "up", "down"}; - return synergy::string::sprintf( + return deskflow::string::sprintf( "switchInDirection(%s)", s_names[m_direction]); } @@ -388,9 +388,9 @@ String InputFilter::KeyboardBroadcastAction::format() const { static const char *s_name = "keyboardBroadcast"; if (m_screens.empty() || m_screens[0] == '*') { - return synergy::string::sprintf("%s(%s)", s_name, s_mode[m_mode]); + return deskflow::string::sprintf("%s(%s)", s_name, s_mode[m_mode]); } else { - return synergy::string::sprintf( + return deskflow::string::sprintf( "%s(%s,%.*s)", s_name, s_mode[m_mode], static_cast(m_screens.size() >= 2 ? m_screens.size() - 2 : 0), m_screens.c_str() + 1); @@ -440,19 +440,20 @@ String InputFilter::KeystrokeAction::format() const { const char *type = formatName(); if (m_keyInfo->m_screens[0] == '\0') { - return synergy::string::sprintf( + return deskflow::string::sprintf( "%s(%s)", type, - synergy::KeyMap::formatKey(m_keyInfo->m_key, m_keyInfo->m_mask) + deskflow::KeyMap::formatKey(m_keyInfo->m_key, m_keyInfo->m_mask) .c_str()); } else if (m_keyInfo->m_screens[0] == '*') { - return synergy::string::sprintf( + return deskflow::string::sprintf( "%s(%s,*)", type, - synergy::KeyMap::formatKey(m_keyInfo->m_key, m_keyInfo->m_mask) + deskflow::KeyMap::formatKey(m_keyInfo->m_key, m_keyInfo->m_mask) .c_str()); } else { - return synergy::string::sprintf( + return deskflow::string::sprintf( "%s(%s,%.*s)", type, - synergy::KeyMap::formatKey(m_keyInfo->m_key, m_keyInfo->m_mask).c_str(), + deskflow::KeyMap::formatKey(m_keyInfo->m_key, m_keyInfo->m_mask) + .c_str(), strnlen(m_keyInfo->m_screens + 1, SIZE_MAX) - 1, m_keyInfo->m_screens + 1); } @@ -503,8 +504,8 @@ InputFilter::Action *InputFilter::MouseButtonAction::clone() const { String InputFilter::MouseButtonAction::format() const { const char *type = formatName(); - String key = synergy::KeyMap::formatKey(kKeyNone, m_buttonInfo->m_mask); - return synergy::string::sprintf( + String key = deskflow::KeyMap::formatKey(kKeyNone, m_buttonInfo->m_mask); + return deskflow::string::sprintf( "%s(%s%s%d)", type, key.c_str(), key.empty() ? "" : "+", m_buttonInfo->m_button); } diff --git a/src/lib/server/InputFilter.h b/src/lib/server/InputFilter.h index 203977dd3..b8950c103 100644 --- a/src/lib/server/InputFilter.h +++ b/src/lib/server/InputFilter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2005 Chris Schoeneman * @@ -21,10 +21,10 @@ #include "base/String.h" #include "common/stdmap.h" #include "common/stdset.h" -#include "synergy/IPlatformScreen.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/protocol_types.h" +#include "deskflow/IPlatformScreen.h" +#include "deskflow/key_types.h" +#include "deskflow/mouse_types.h" +#include "deskflow/protocol_types.h" class PrimaryClient; class Event; diff --git a/src/lib/server/PrimaryClient.cpp b/src/lib/server/PrimaryClient.cpp index c63cec4ba..63ae13942 100644 --- a/src/lib/server/PrimaryClient.cpp +++ b/src/lib/server/PrimaryClient.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,14 +19,14 @@ #include "server/PrimaryClient.h" #include "base/Log.h" -#include "synergy/AppUtil.h" -#include "synergy/Clipboard.h" -#include "synergy/Screen.h" +#include "deskflow/AppUtil.h" +#include "deskflow/Clipboard.h" +#include "deskflow/Screen.h" // // PrimaryClient // -PrimaryClient::PrimaryClient(const String &name, synergy::Screen *screen) +PrimaryClient::PrimaryClient(const String &name, deskflow::Screen *screen) : BaseClientProxy(name), m_screen(screen), m_fakeInputCount(0) { diff --git a/src/lib/server/PrimaryClient.h b/src/lib/server/PrimaryClient.h index 2a849d0bf..d922ebae2 100644 --- a/src/lib/server/PrimaryClient.h +++ b/src/lib/server/PrimaryClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,10 +18,10 @@ #pragma once +#include "deskflow/protocol_types.h" #include "server/BaseClientProxy.h" -#include "synergy/protocol_types.h" -namespace synergy { +namespace deskflow { class Screen; } @@ -36,7 +36,7 @@ public: /*! \c name is the name of the server and \p screen is primary screen. */ - PrimaryClient(const String &name, synergy::Screen *screen); + PrimaryClient(const String &name, deskflow::Screen *screen); ~PrimaryClient(); #ifdef TEST_ENV @@ -149,11 +149,11 @@ public: String getSecureInputApp() const override; void secureInputNotification(const String &app) const override; - synergy::IStream *getStream() const override { return nullptr; } + deskflow::IStream *getStream() const override { return nullptr; } bool isPrimary() const override { return true; } private: - synergy::Screen *m_screen; + deskflow::Screen *m_screen; bool m_clipboardDirty[kClipboardEnd]; SInt32 m_fakeInputCount; }; diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index 6c3006a40..8d8e6caed 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,6 +24,15 @@ #include "base/TMethodEventJob.h" #include "base/TMethodJob.h" #include "common/stdexcept.h" +#include "deskflow/AppUtil.h" +#include "deskflow/DropHelper.h" +#include "deskflow/FileChunk.h" +#include "deskflow/IPlatformScreen.h" +#include "deskflow/PacketStreamFilter.h" +#include "deskflow/Screen.h" +#include "deskflow/StreamChunker.h" +#include "deskflow/option_types.h" +#include "deskflow/protocol_types.h" #include "license/License.h" #include "mt/Thread.h" #include "net/TCPSocket.h" @@ -31,31 +40,23 @@ #include "server/ClientProxy.h" #include "server/ClientProxyUnknown.h" #include "server/PrimaryClient.h" -#include "synergy/AppUtil.h" -#include "synergy/DropHelper.h" -#include "synergy/FileChunk.h" -#include "synergy/IPlatformScreen.h" -#include "synergy/PacketStreamFilter.h" -#include "synergy/Screen.h" -#include "synergy/StreamChunker.h" -#include "synergy/option_types.h" -#include "synergy/protocol_types.h" #include #include #include #include -using namespace synergy::license; -using namespace synergy::server; +using namespace deskflow::license; +using namespace deskflow::server; // // Server // Server::Server( - ServerConfig &config, PrimaryClient *primaryClient, synergy::Screen *screen, - IEventQueue *events, synergy::ServerArgs const &args) + ServerConfig &config, PrimaryClient *primaryClient, + deskflow::Screen *screen, IEventQueue *events, + deskflow::ServerArgs const &args) : m_mock(false), m_primaryClient(primaryClient), m_active(primaryClient), @@ -1761,8 +1762,8 @@ void Server::sendDragInfoThread(void *arg) { #if defined(__APPLE__) // on mac it seems that after faking a LMB up, system would signal back - // to synergy a mouse up event, which doesn't happen on windows. as a - // result, synergy would send dragging file to client twice. This variable + // to deskflow a mouse up event, which doesn't happen on windows. as a + // result, deskflow would send dragging file to client twice. This variable // is used to ignore the first file sending. m_ignoreFileTransfer = true; #endif diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h index 89b23dcf1..ff9b41555 100644 --- a/src/lib/server/Server.h +++ b/src/lib/server/Server.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,33 +24,33 @@ #include "common/stdmap.h" #include "common/stdset.h" #include "common/stdvector.h" +#include "deskflow/Clipboard.h" +#include "deskflow/DragInformation.h" +#include "deskflow/INode.h" +#include "deskflow/ServerArgs.h" +#include "deskflow/clipboard_types.h" +#include "deskflow/key_types.h" +#include "deskflow/mouse_types.h" #include "server/Config.h" -#include "synergy/Clipboard.h" -#include "synergy/DragInformation.h" -#include "synergy/INode.h" -#include "synergy/ServerArgs.h" -#include "synergy/clipboard_types.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" #include class BaseClientProxy; class EventQueueTimer; class PrimaryClient; class InputFilter; -namespace synergy { +namespace deskflow { class Screen; } class IEventQueue; class Thread; class ClientListener; -//! Synergy server +//! Deskflow server /*! -This class implements the top-level server algorithms for synergy. +This class implements the top-level server algorithms for deskflow. */ class Server : public INode { - using ServerConfig = synergy::server::Config; + using ServerConfig = deskflow::server::Config; public: //! Lock cursor to screen data @@ -112,8 +112,8 @@ public: */ Server( ServerConfig &config, PrimaryClient *primaryClient, - synergy::Screen *screen, IEventQueue *events, - synergy::ServerArgs const &args); + deskflow::Screen *screen, IEventQueue *events, + deskflow::ServerArgs const &args); Server(Server const &) = delete; Server(Server &&) = delete; ~Server(); @@ -470,7 +470,7 @@ private: bool m_lockedToScreen; // server screen - synergy::Screen *m_screen; + deskflow::Screen *m_screen; IEventQueue *m_events; @@ -492,5 +492,5 @@ private: bool m_waitDragInfoThread; ClientListener *m_clientListener; - synergy::ServerArgs m_args; + deskflow::ServerArgs m_args; }; diff --git a/src/lib/utils/string_utils.h b/src/lib/utils/string_utils.h index fa63153b2..6b75c44d4 100644 --- a/src/lib/utils/string_utils.h +++ b/src/lib/utils/string_utils.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ const auto isNotSpace = [](unsigned char ch) { return !std::isspace(ch); }; -namespace synergy::utils { +namespace deskflow::utils { /** * @brief A _very_ basic whitespace trimer. @@ -36,4 +36,4 @@ inline std::string trim(const std::string &str) { return (front < back ? std::string(front, back) : std::string{}); } -} // namespace synergy::utils +} // namespace deskflow::utils diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 6547a849d..0161119ce 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # @@ -137,7 +137,7 @@ macro(config_test_deps) net platform server - synlib + app mt ipc license diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt index 545cc255e..bc00b0344 100644 --- a/src/test/integtests/CMakeLists.txt +++ b/src/test/integtests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # diff --git a/src/test/integtests/synergy/ConfigTests.cpp b/src/test/integtests/deskflow/ConfigTests.cpp similarity index 96% rename from src/test/integtests/synergy/ConfigTests.cpp rename to src/test/integtests/deskflow/ConfigTests.cpp index 896257129..c19edb6cd 100644 --- a/src/test/integtests/synergy/ConfigTests.cpp +++ b/src/test/integtests/deskflow/ConfigTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,12 +17,12 @@ #if HAVE_TOMLPLUSPLUS -#include "synergy/Config.h" +#include "deskflow/Config.h" #include #include -using namespace synergy; +using namespace deskflow; const auto kTestFilename = "tmp/test/test.toml"; diff --git a/src/test/integtests/gui/MainWindowTests.cpp b/src/test/integtests/gui/MainWindowTests.cpp index c531b7a87..0c093179e 100644 --- a/src/test/integtests/gui/MainWindowTests.cpp +++ b/src/test/integtests/gui/MainWindowTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/integtests/gui/core/CommandProcessTests.cpp b/src/test/integtests/gui/core/CommandProcessTests.cpp index 4640f8080..e3463cc5b 100644 --- a/src/test/integtests/gui/core/CommandProcessTests.cpp +++ b/src/test/integtests/gui/core/CommandProcessTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/integtests/gui/core/CoreToolTests.cpp b/src/test/integtests/gui/core/CoreToolTests.cpp index 48daec5e3..6ac377cf4 100644 --- a/src/test/integtests/gui/core/CoreToolTests.cpp +++ b/src/test/integtests/gui/core/CoreToolTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/integtests/gui/dotenv_tests.cpp b/src/test/integtests/gui/dotenv_tests.cpp index 8db1515c1..9ca316c25 100644 --- a/src/test/integtests/gui/dotenv_tests.cpp +++ b/src/test/integtests/gui/dotenv_tests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ TEST(dotenv_tests, dotenv_fileDoesNotExist_doesNotLoadEnvVar) { const QString envFile = "tmp/test/.env"; - synergy::gui::dotenv(envFile); + deskflow::gui::dotenv(envFile); const QString actualValue = qEnvironmentVariable("TEST_ENV_VAR"); EXPECT_TRUE(actualValue.isEmpty()); @@ -48,7 +48,7 @@ TEST(dotenv_tests, dotenv_envFileWithEntry_loadsEnvVar) { out << entry << Qt::endl; file.close(); - synergy::gui::dotenv(envFile); + deskflow::gui::dotenv(envFile); const QString actualValue = qEnvironmentVariable(qPrintable(key)); EXPECT_EQ("test value", actualValue.toStdString()); diff --git a/src/test/integtests/ipc/IpcTests.cpp b/src/test/integtests/ipc/IpcTests.cpp index a2f86a5a6..438f5ff2a 100644 --- a/src/test/integtests/ipc/IpcTests.cpp +++ b/src/test/integtests/ipc/IpcTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/test/integtests/main.cpp b/src/test/integtests/main.cpp index 1960ce6c0..c6f057efb 100644 --- a/src/test/integtests/main.cpp +++ b/src/test/integtests/main.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -27,7 +27,7 @@ #include #include -using synergy::test::ExitTimeout; +using deskflow::test::ExitTimeout; const auto testDir = "tmp/test"; diff --git a/src/test/integtests/net/NetworkTests.cpp b/src/test/integtests/net/NetworkTests.cpp index 4e6ff6ae5..748933d8b 100644 --- a/src/test/integtests/net/NetworkTests.cpp +++ b/src/test/integtests/net/NetworkTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -25,6 +25,8 @@ #include "base/TMethodJob.h" #include "client/Client.h" #include "common/stdexcept.h" +#include "deskflow/FileChunk.h" +#include "deskflow/StreamChunker.h" #include "mt/Thread.h" #include "net/NetworkAddress.h" #include "net/SocketMultiplexer.h" @@ -32,12 +34,10 @@ #include "server/ClientListener.h" #include "server/ClientProxy.h" #include "server/Server.h" -#include "synergy/FileChunk.h" -#include "synergy/StreamChunker.h" +#include "test/mock/deskflow/MockScreen.h" #include "test/mock/server/MockConfig.h" #include "test/mock/server/MockInputFilter.h" #include "test/mock/server/MockPrimaryClient.h" -#include "test/mock/synergy/MockScreen.h" #include "test/shared/TestEventQueue.h" #include @@ -128,7 +128,7 @@ TEST_F(NetworkTests, sendToClient_mockData) { ON_CALL(serverConfig, getInputFilter()) .WillByDefault(Return(&serverInputFilter)); - synergy::ServerArgs serverArgs; + deskflow::ServerArgs serverArgs; serverArgs.m_enableDragDrop = true; Server server( serverConfig, &primaryClient, &serverScreen, &m_events, serverArgs); @@ -145,7 +145,7 @@ TEST_F(NetworkTests, sendToClient_mockData) { .WillByDefault(Invoke(getScreenShape)); ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; clientArgs.m_enableDragDrop = true; clientArgs.m_enableCrypto = false; Client client( @@ -192,7 +192,7 @@ TEST_F(NetworkTests, sendToClient_mockFile) { ON_CALL(serverConfig, getInputFilter()) .WillByDefault(Return(&serverInputFilter)); - synergy::ServerArgs serverArgs; + deskflow::ServerArgs serverArgs; serverArgs.m_enableDragDrop = true; Server server( serverConfig, &primaryClient, &serverScreen, &m_events, serverArgs); @@ -209,7 +209,7 @@ TEST_F(NetworkTests, sendToClient_mockFile) { .WillByDefault(Invoke(getScreenShape)); ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; clientArgs.m_enableDragDrop = true; clientArgs.m_enableCrypto = false; Client client( @@ -249,7 +249,7 @@ TEST_F(NetworkTests, sendToServer_mockData) { ON_CALL(serverConfig, getInputFilter()) .WillByDefault(Return(&serverInputFilter)); - synergy::ServerArgs serverArgs; + deskflow::ServerArgs serverArgs; serverArgs.m_enableDragDrop = true; Server server( serverConfig, &primaryClient, &serverScreen, &m_events, serverArgs); @@ -266,7 +266,7 @@ TEST_F(NetworkTests, sendToServer_mockData) { .WillByDefault(Invoke(getScreenShape)); ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; clientArgs.m_enableDragDrop = true; clientArgs.m_enableCrypto = false; Client client( @@ -313,7 +313,7 @@ TEST_F(NetworkTests, sendToServer_mockFile) { ON_CALL(serverConfig, getInputFilter()) .WillByDefault(Return(&serverInputFilter)); - synergy::ServerArgs serverArgs; + deskflow::ServerArgs serverArgs; serverArgs.m_enableDragDrop = true; Server server( serverConfig, &primaryClient, &serverScreen, &m_events, serverArgs); @@ -330,7 +330,7 @@ TEST_F(NetworkTests, sendToServer_mockFile) { .WillByDefault(Invoke(getScreenShape)); ON_CALL(clientScreen, getCursorPos(_, _)).WillByDefault(Invoke(getCursorPos)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; clientArgs.m_enableDragDrop = true; clientArgs.m_enableCrypto = false; Client client( @@ -437,7 +437,7 @@ void NetworkTests::sendToServer_mockFile_fileRecieveCompleted( void NetworkTests::sendMockData(void *eventTarget) { // send first message (file size) - String size = synergy::string::sizeTypeToString(kMockDataSize); + String size = deskflow::string::sizeTypeToString(kMockDataSize); FileChunk *sizeMessage = FileChunk::start(size); m_events.addEvent( @@ -481,19 +481,19 @@ UInt8 *newMockData(size_t size) { size_t headSize = sizeof(head) - 1; const UInt8 tail[] = "... mock tail"; size_t tailSize = sizeof(tail) - 1; - const UInt8 synergyRocks[] = "synergy\0 rocks! "; - size_t synergyRocksSize = sizeof(synergyRocks) - 1; + const UInt8 deskflowRocks[] = "deskflow\0 rocks! "; + size_t deskflowRocksSize = sizeof(deskflowRocks) - 1; memcpy(data, head, headSize); data += headSize; - size_t times = (size - headSize - tailSize) / synergyRocksSize; + size_t times = (size - headSize - tailSize) / deskflowRocksSize; for (size_t i = 0; i < times; ++i) { - memcpy(data, synergyRocks, synergyRocksSize); - data += synergyRocksSize; + memcpy(data, deskflowRocks, deskflowRocksSize); + data += deskflowRocksSize; } - size_t remainder = (size - headSize - tailSize) % synergyRocksSize; + size_t remainder = (size - headSize - tailSize) % deskflowRocksSize; if (remainder != 0) { memset(data, '.', remainder); data += remainder; diff --git a/src/test/integtests/platform/MSWindowsClipboardTests.cpp b/src/test/integtests/platform/MSWindowsClipboardTests.cpp index 77826b334..195f2cfa4 100644 --- a/src/test/integtests/platform/MSWindowsClipboardTests.cpp +++ b/src/test/integtests/platform/MSWindowsClipboardTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -62,7 +62,7 @@ TEST_F(MSWindowsClipboardTests, empty_openCalled_returnsTrue) { TEST_F(MSWindowsClipboardTests, empty_singleFormat_hasReturnsFalse) { MSWindowsClipboard clipboard(NULL); clipboard.open(0); - clipboard.add(MSWindowsClipboard::kText, "synergy rocks!"); + clipboard.add(MSWindowsClipboard::kText, "deskflow rocks!"); clipboard.empty(); @@ -74,10 +74,10 @@ TEST_F(MSWindowsClipboardTests, add_newValue_valueWasStored) { MSWindowsClipboard clipboard(NULL); clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } TEST_F(MSWindowsClipboardTests, add_newValue_writeWasCalled) { @@ -88,14 +88,14 @@ TEST_F(MSWindowsClipboardTests, add_newValue_writeWasCalled) { clipboard.setFacade(facade); clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); } TEST_F(MSWindowsClipboardTests, add_replaceValue_valueWasReplaced) { MSWindowsClipboard clipboard(NULL); clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding. String actual = clipboard.get(IClipboard::kText); @@ -157,7 +157,7 @@ TEST_F(MSWindowsClipboardTests, has_withFormatAdded_returnsTrue) { MSWindowsClipboard clipboard(NULL); clipboard.open(0); clipboard.empty(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); bool actual = clipboard.has(IClipboard::kText); @@ -188,18 +188,18 @@ TEST_F(MSWindowsClipboardTests, get_withFormatAdded_returnsExpected) { MSWindowsClipboard clipboard(NULL); clipboard.open(0); clipboard.empty(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } -TEST_F(MSWindowsClipboardTests, isOwnedBySynergy_defaultState_noError) { +TEST_F(MSWindowsClipboardTests, isOwnedByDeskflow_defaultState_noError) { MSWindowsClipboard clipboard(NULL); clipboard.open(0); - bool actual = clipboard.isOwnedBySynergy(); + bool actual = clipboard.isOwnedByDeskflow(); EXPECT_EQ(true, actual); } diff --git a/src/test/integtests/platform/MSWindowsKeyStateTests.cpp b/src/test/integtests/platform/MSWindowsKeyStateTests.cpp index 5ed97a72c..c9f65b6e9 100644 --- a/src/test/integtests/platform/MSWindowsKeyStateTests.cpp +++ b/src/test/integtests/platform/MSWindowsKeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -26,14 +26,14 @@ #include "platform/MSWindowsKeyState.h" #include "platform/MSWindowsScreen.h" #include "platform/MSWindowsScreenSaver.h" -#include "test/mock/synergy/MockEventQueue.h" -#include "test/mock/synergy/MockKeyMap.h" +#include "test/mock/deskflow/MockEventQueue.h" +#include "test/mock/deskflow/MockKeyMap.h" #include #include // wParam = flags, HIBYTE(lParam) = virtual key, LOBYTE(lParam) = scan code -#define SYNERGY_MSG_FAKE_KEY SYNERGY_HOOK_LAST_MSG + 4 +#define DESKFLOW_MSG_FAKE_KEY DESKFLOW_HOOK_LAST_MSG + 4 using ::testing::_; using ::testing::NiceMock; diff --git a/src/test/integtests/platform/OSXClipboardTests.cpp b/src/test/integtests/platform/OSXClipboardTests.cpp index 3de707af5..555a2d15f 100644 --- a/src/test/integtests/platform/OSXClipboardTests.cpp +++ b/src/test/integtests/platform/OSXClipboardTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -35,7 +35,7 @@ TEST(OSXClipboardTests, empty_openCalled_returnsTrue) { TEST(OSXClipboardTests, empty_singleFormat_hasReturnsFalse) { OSXClipboard clipboard; clipboard.open(0); - clipboard.add(OSXClipboard::kText, "synergy rocks!"); + clipboard.add(OSXClipboard::kText, "deskflow rocks!"); clipboard.empty(); @@ -47,17 +47,17 @@ TEST(OSXClipboardTests, add_newValue_valueWasStored) { OSXClipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } TEST(OSXClipboardTests, add_replaceValue_valueWasReplaced) { OSXClipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding. String actual = clipboard.get(IClipboard::kText); @@ -114,7 +114,7 @@ TEST(OSXClipboardTests, has_withFormatAdded_returnsTrue) { OSXClipboard clipboard; clipboard.open(0); clipboard.empty(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); bool actual = clipboard.has(IClipboard::kText); @@ -145,11 +145,11 @@ TEST(OSXClipboardTests, get_withFormatAdded_returnsExpected) { OSXClipboard clipboard; clipboard.open(0); clipboard.empty(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } #endif \ No newline at end of file diff --git a/src/test/integtests/platform/OSXKeyStateTests.cpp b/src/test/integtests/platform/OSXKeyStateTests.cpp index 5748e054b..460c28bea 100644 --- a/src/test/integtests/platform/OSXKeyStateTests.cpp +++ b/src/test/integtests/platform/OSXKeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -18,8 +18,8 @@ #include "base/Log.h" #include "platform/OSXKeyState.h" -#include "test/mock/synergy/MockEventQueue.h" -#include "test/mock/synergy/MockKeyMap.h" +#include "test/mock/deskflow/MockEventQueue.h" +#include "test/mock/deskflow/MockKeyMap.h" #include #include @@ -39,7 +39,7 @@ public: #if __MAC_OS_X_VERSION_MIN_REQUIRED > 1060 TEST_F(OSXKeyStateTests, fakeAndPoll_shift) { - synergy::KeyMap keyMap; + deskflow::KeyMap keyMap; MockEventQueue eventQueue; OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true); keyState.updateKeyMap(); @@ -58,7 +58,7 @@ TEST_F(OSXKeyStateTests, fakeAndPoll_shift) { } TEST_F(OSXKeyStateTests, fakeAndPoll_charKey) { - synergy::KeyMap keyMap; + deskflow::KeyMap keyMap; MockEventQueue eventQueue; OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true); keyState.updateKeyMap(); @@ -76,7 +76,7 @@ TEST_F(OSXKeyStateTests, fakeAndPoll_charKey) { } TEST_F(OSXKeyStateTests, fakeAndPoll_charKeyAndModifier) { - synergy::KeyMap keyMap; + deskflow::KeyMap keyMap; MockEventQueue eventQueue; OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true); keyState.updateKeyMap(); diff --git a/src/test/integtests/platform/OSXScreenTests.cpp b/src/test/integtests/platform/OSXScreenTests.cpp index 8be9f0900..50dd02c87 100644 --- a/src/test/integtests/platform/OSXScreenTests.cpp +++ b/src/test/integtests/platform/OSXScreenTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/integtests/platform/XWindowsClipboardTests.cpp b/src/test/integtests/platform/XWindowsClipboardTests.cpp index 52f1ccf63..639297662 100644 --- a/src/test/integtests/platform/XWindowsClipboardTests.cpp +++ b/src/test/integtests/platform/XWindowsClipboardTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -69,7 +69,7 @@ TEST_F(XWindowsClipboardTests, empty_openCalled_returnsTrue) { TEST_F(XWindowsClipboardTests, empty_singleFormat_hasReturnsFalse) { XWindowsClipboard &clipboard = getClipboard(); - clipboard.add(XWindowsClipboard::kText, "synergy rocks!"); + clipboard.add(XWindowsClipboard::kText, "deskflow rocks!"); clipboard.empty(); @@ -80,16 +80,16 @@ TEST_F(XWindowsClipboardTests, empty_singleFormat_hasReturnsFalse) { TEST_F(XWindowsClipboardTests, add_newValue_valueWasStored) { XWindowsClipboard &clipboard = getClipboard(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } TEST_F(XWindowsClipboardTests, add_replaceValue_valueWasReplaced) { XWindowsClipboard &clipboard = getClipboard(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding. String actual = clipboard.get(IClipboard::kText); @@ -107,7 +107,7 @@ TEST_F(XWindowsClipboardTests, close_isOpen_noErrors) { TEST_F(XWindowsClipboardTests, has_withFormatAdded_returnsTrue) { XWindowsClipboard &clipboard = getClipboard(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); bool actual = clipboard.has(IClipboard::kText); @@ -132,11 +132,11 @@ TEST_F(XWindowsClipboardTests, get_withNoFormats_returnsEmpty) { TEST_F(XWindowsClipboardTests, get_withFormatAdded_returnsExpected) { XWindowsClipboard &clipboard = getClipboard(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } #endif diff --git a/src/test/integtests/platform/XWindowsKeyStateTests.cpp b/src/test/integtests/platform/XWindowsKeyStateTests.cpp index 8d36891cb..6fde7cbf6 100644 --- a/src/test/integtests/platform/XWindowsKeyStateTests.cpp +++ b/src/test/integtests/platform/XWindowsKeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -21,8 +21,8 @@ #define TEST_ENV -#include "test/mock/synergy/MockEventQueue.h" -#include "test/mock/synergy/MockKeyMap.h" +#include "test/mock/deskflow/MockEventQueue.h" +#include "test/mock/deskflow/MockKeyMap.h" #include "base/Log.h" #include "platform/XWindowsKeyState.h" @@ -151,13 +151,13 @@ TEST_F(XWindowsKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCor KeyCode key = XKeysymToKeycode(m_display, XK_Shift_L); - // fake shift key down (without using synergy) + // fake shift key down (without using deskflow) XTestFakeKeyEvent(m_display, key, true, CurrentTime); // function under test (1st call) KeyModifierMask modDown = keyState.pollActiveModifiers(); - // fake shift key up (without using synergy) + // fake shift key up (without using deskflow) XTestFakeKeyEvent(m_display, key, false, CurrentTime); // function under test (2nd call) diff --git a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp index 2220d4cc9..11c65e348 100644 --- a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp +++ b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -20,7 +20,7 @@ #if 0 #include "platform/XWindowsScreenSaver.h" -#include "test/mock/synergy/MockEventQueue.h" +#include "test/mock/deskflow/MockEventQueue.h" #include #include diff --git a/src/test/integtests/platform/XWindowsScreenTests.cpp b/src/test/integtests/platform/XWindowsScreenTests.cpp index 4a4564f09..cebfb276b 100644 --- a/src/test/integtests/platform/XWindowsScreenTests.cpp +++ b/src/test/integtests/platform/XWindowsScreenTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "test/mock/synergy/MockEventQueue.h" +#include "test/mock/deskflow/MockEventQueue.h" #include diff --git a/src/test/mock/synergy/MockApp.h b/src/test/mock/deskflow/MockApp.h similarity index 91% rename from src/test/mock/synergy/MockApp.h rename to src/test/mock/deskflow/MockApp.h index 1b09de362..10b2e9b36 100644 --- a/src/test/mock/synergy/MockApp.h +++ b/src/test/mock/deskflow/MockApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #define TEST_ENV -#include "synergy/App.h" +#include "deskflow/App.h" #include @@ -40,6 +40,6 @@ public: MOCK_METHOD(void, startNode, (), (override)); MOCK_METHOD(int, mainLoop, (), (override)); MOCK_METHOD(int, foregroundStartup, (int, char **), (override)); - MOCK_METHOD(synergy::Screen *, createScreen, (), (override)); + MOCK_METHOD(deskflow::Screen *, createScreen, (), (override)); MOCK_METHOD(std::string, configSection, (), (const, override)); }; diff --git a/src/test/mock/synergy/MockArgParser.h b/src/test/mock/deskflow/MockArgParser.h similarity index 91% rename from src/test/mock/synergy/MockArgParser.h rename to src/test/mock/deskflow/MockArgParser.h index 1e5fd0ffd..e3c8f0833 100644 --- a/src/test/mock/synergy/MockArgParser.h +++ b/src/test/mock/deskflow/MockArgParser.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #define TEST_ENV -#include "synergy/ArgParser.h" +#include "deskflow/ArgParser.h" #include diff --git a/src/test/mock/synergy/MockEventQueue.h b/src/test/mock/deskflow/MockEventQueue.h similarity index 98% rename from src/test/mock/synergy/MockEventQueue.h rename to src/test/mock/deskflow/MockEventQueue.h index 4f9bccc22..9ec018625 100644 --- a/src/test/mock/synergy/MockEventQueue.h +++ b/src/test/mock/deskflow/MockEventQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * diff --git a/src/test/mock/synergy/MockKeyMap.h b/src/test/mock/deskflow/MockKeyMap.h similarity index 91% rename from src/test/mock/synergy/MockKeyMap.h rename to src/test/mock/deskflow/MockKeyMap.h index 9d53ee076..5efc73db1 100644 --- a/src/test/mock/synergy/MockKeyMap.h +++ b/src/test/mock/deskflow/MockKeyMap.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -18,11 +18,11 @@ #pragma once #include "base/String.h" -#include "synergy/KeyMap.h" +#include "deskflow/KeyMap.h" #include -class MockKeyMap : public synergy::KeyMap { +class MockKeyMap : public deskflow::KeyMap { public: MOCK_METHOD(void, swap, (KeyMap &), (override)); MOCK_METHOD(void, finish, (), (override)); diff --git a/src/test/mock/synergy/MockKeyState.h b/src/test/mock/deskflow/MockKeyState.h similarity index 81% rename from src/test/mock/synergy/MockKeyState.h rename to src/test/mock/deskflow/MockKeyState.h index 5f3999d94..e613a8baf 100644 --- a/src/test/mock/synergy/MockKeyState.h +++ b/src/test/mock/deskflow/MockKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "deskflow/KeyState.h" #include @@ -32,15 +32,15 @@ public: MockKeyState(const MockEventQueue &eventQueue) : KeyState((IEventQueue *)&eventQueue, {"en"}, true) {} - MockKeyState(const MockEventQueue &eventQueue, const synergy::KeyMap &keyMap) + MockKeyState(const MockEventQueue &eventQueue, const deskflow::KeyMap &keyMap) : KeyState( - (IEventQueue *)&eventQueue, (synergy::KeyMap &)keyMap, {"en"}, + (IEventQueue *)&eventQueue, (deskflow::KeyMap &)keyMap, {"en"}, true) {} MOCK_METHOD(SInt32, pollActiveGroup, (), (const, override)); MOCK_METHOD(KeyModifierMask, pollActiveModifiers, (), (const, override)); MOCK_METHOD(bool, fakeCtrlAltDel, (), (override)); - MOCK_METHOD(void, getKeyMap, (synergy::KeyMap &), (override)); + MOCK_METHOD(void, getKeyMap, (deskflow::KeyMap &), (override)); MOCK_METHOD(void, fakeKey, (const Keystroke &), (override)); MOCK_METHOD(bool, fakeMediaKey, (KeyID), (override)); MOCK_METHOD(void, pollPressedKeys, (KeyButtonSet &), (const, override)); @@ -51,4 +51,4 @@ typedef ::testing::NiceMock KeyStateImpl; typedef UInt32 KeyID; typedef void (*ForeachKeyCallback)( - KeyID, SInt32 group, synergy::KeyMap::KeyItem &, void *userData); + KeyID, SInt32 group, deskflow::KeyMap::KeyItem &, void *userData); diff --git a/src/test/mock/synergy/MockScreen.h b/src/test/mock/deskflow/MockScreen.h similarity index 87% rename from src/test/mock/synergy/MockScreen.h rename to src/test/mock/deskflow/MockScreen.h index 641e48b33..cab9673ab 100644 --- a/src/test/mock/synergy/MockScreen.h +++ b/src/test/mock/deskflow/MockScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,13 +19,13 @@ #define TEST_ENV -#include "synergy/Screen.h" +#include "deskflow/Screen.h" #include -class MockScreen : public synergy::Screen { +class MockScreen : public deskflow::Screen { public: - MockScreen() : synergy::Screen() {} + MockScreen() : deskflow::Screen() {} MOCK_METHOD(void, disable, (), (override)); MOCK_METHOD( void, getShape, (SInt32 &, SInt32 &, SInt32 &, SInt32 &), diff --git a/src/test/mock/io/MockStream.h b/src/test/mock/io/MockStream.h index 1ad6e64d4..5e21c8758 100644 --- a/src/test/mock/io/MockStream.h +++ b/src/test/mock/io/MockStream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -24,7 +24,7 @@ class IEventQueue; -class MockStream : public synergy::IStream { +class MockStream : public deskflow::IStream { public: MockStream() {} MOCK_METHOD(void, close, (), (override)); diff --git a/src/test/mock/ipc/MockIpcServer.h b/src/test/mock/ipc/MockIpcServer.h index 7e0e7163c..e4dcbde00 100644 --- a/src/test/mock/ipc/MockIpcServer.h +++ b/src/test/mock/ipc/MockIpcServer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/mock/server/MockConfig.h b/src/test/mock/server/MockConfig.h index 4bf94d35f..697adcfee 100644 --- a/src/test/mock/server/MockConfig.h +++ b/src/test/mock/server/MockConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/mock/server/MockInputFilter.h b/src/test/mock/server/MockInputFilter.h index 7cd1c152e..7b4eb544d 100644 --- a/src/test/mock/server/MockInputFilter.h +++ b/src/test/mock/server/MockInputFilter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/mock/server/MockPrimaryClient.h b/src/test/mock/server/MockPrimaryClient.h index 6dae819ae..0de76fa6a 100644 --- a/src/test/mock/server/MockPrimaryClient.h +++ b/src/test/mock/server/MockPrimaryClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/mock/server/MockServer.h b/src/test/mock/server/MockServer.h index b8d821d54..866b55dc7 100644 --- a/src/test/mock/server/MockServer.h +++ b/src/test/mock/server/MockServer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/shared/ExitTimeout.cpp b/src/test/shared/ExitTimeout.cpp index 3aa33e8f3..d72873b92 100644 --- a/src/test/shared/ExitTimeout.cpp +++ b/src/test/shared/ExitTimeout.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #include #include -namespace synergy::test { +namespace deskflow::test { const auto checkMilliseconds = std::chrono::milliseconds(100); @@ -58,4 +58,4 @@ void ExitTimeout::run() const { } } -} // namespace synergy::test +} // namespace deskflow::test diff --git a/src/test/shared/ExitTimeout.h b/src/test/shared/ExitTimeout.h index 1f9c71536..93cd3301c 100644 --- a/src/test/shared/ExitTimeout.h +++ b/src/test/shared/ExitTimeout.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include #include -namespace synergy::test { +namespace deskflow::test { /** * @brief Exits the program after a specified timeout, unless destroyed. @@ -44,4 +44,4 @@ private: std::unique_ptr m_thread; }; -} // namespace synergy::test +} // namespace deskflow::test diff --git a/src/test/shared/TestEventQueue.cpp b/src/test/shared/TestEventQueue.cpp index bba5940a7..8bfa199d8 100644 --- a/src/test/shared/TestEventQueue.cpp +++ b/src/test/shared/TestEventQueue.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/shared/TestEventQueue.h b/src/test/shared/TestEventQueue.h index 5f89d17bc..a4ed56753 100644 --- a/src/test/shared/TestEventQueue.h +++ b/src/test/shared/TestEventQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/shared/gui/TestQtCoreApp.h b/src/test/shared/gui/TestQtCoreApp.h index 33a5b9462..f63da5cc5 100644 --- a/src/test/shared/gui/TestQtCoreApp.h +++ b/src/test/shared/gui/TestQtCoreApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/shared/gui/TestQtFullApp.h b/src/test/shared/gui/TestQtFullApp.h index 0bf600eb0..fb6b3ae85 100644 --- a/src/test/shared/gui/TestQtFullApp.h +++ b/src/test/shared/gui/TestQtFullApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/shared/gui/mocks/AppConfigMock.h b/src/test/shared/gui/mocks/AppConfigMock.h index c7e3ec8b3..618e0f591 100644 --- a/src/test/shared/gui/mocks/AppConfigMock.h +++ b/src/test/shared/gui/mocks/AppConfigMock.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,8 +23,8 @@ #include -class AppConfigMock : public synergy::gui::IAppConfig { - using ProcessMode = synergy::gui::ProcessMode; +class AppConfigMock : public deskflow::gui::IAppConfig { + using ProcessMode = deskflow::gui::ProcessMode; public: AppConfigMock() { @@ -42,7 +42,7 @@ public: // Getters // - MOCK_METHOD(synergy::gui::IConfigScopes &, scopes, (), (const, override)); + MOCK_METHOD(deskflow::gui::IConfigScopes &, scopes, (), (const, override)); MOCK_METHOD(QString, tlsCertPath, (), (const, override)); MOCK_METHOD(int, tlsKeyLength, (), (const, override)); MOCK_METHOD(bool, tlsEnabled, (), (const, override)); diff --git a/src/test/shared/gui/mocks/ServerConfigMock.h b/src/test/shared/gui/mocks/ServerConfigMock.h index 700593266..2fa46c3e8 100644 --- a/src/test/shared/gui/mocks/ServerConfigMock.h +++ b/src/test/shared/gui/mocks/ServerConfigMock.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include -class ServerConfigMock : public synergy::gui::IServerConfig { +class ServerConfigMock : public deskflow::gui::IServerConfig { public: ServerConfigMock() { ON_CALL(*this, screens()).WillByDefault(testing::ReturnRef(m_screensStub)); diff --git a/src/test/shared/undef_x11_macros.h b/src/test/shared/undef_x11_macros.h index aabf58bf3..2ae42ea40 100644 --- a/src/test/shared/undef_x11_macros.h +++ b/src/test/shared/undef_x11_macros.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt index b0885b049..5adc2eeae 100644 --- a/src/test/unittests/CMakeLists.txt +++ b/src/test/unittests/CMakeLists.txt @@ -1,4 +1,4 @@ -# Synergy -- mouse and keyboard sharing utility +# Deskflow -- mouse and keyboard sharing utility # Copyright (C) 2012-2024 Symless Ltd. # Copyright (C) 2009-2012 Nick Bolton # diff --git a/src/test/unittests/arch/IArchStringTests.cpp b/src/test/unittests/arch/IArchStringTests.cpp index fe1ed1339..d23f2d8cb 100644 --- a/src/test/unittests/arch/IArchStringTests.cpp +++ b/src/test/unittests/arch/IArchStringTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/unittests/arch/unix/ArchNetworkBSDTests.cpp b/src/test/unittests/arch/unix/ArchNetworkBSDTests.cpp index 99e4397d8..23b5e1cce 100644 --- a/src/test/unittests/arch/unix/ArchNetworkBSDTests.cpp +++ b/src/test/unittests/arch/unix/ArchNetworkBSDTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/unittests/base/PathTests.cpp b/src/test/unittests/base/PathTests.cpp index 159de116c..35a207d15 100644 --- a/src/test/unittests/base/PathTests.cpp +++ b/src/test/unittests/base/PathTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -37,6 +37,6 @@ TEST(PathTests, open_file_using_path) { file << "test"; file.close(); - std::ifstream inFile(synergy::filesystem::path(utf8FileName)); + std::ifstream inFile(deskflow::filesystem::path(utf8FileName)); EXPECT_TRUE(inFile.is_open()); } diff --git a/src/test/unittests/base/StringTests.cpp b/src/test/unittests/base/StringTests.cpp index 4bea49dcd..9b58e5b71 100644 --- a/src/test/unittests/base/StringTests.cpp +++ b/src/test/unittests/base/StringTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -using namespace synergy; +using namespace deskflow; TEST(StringTests, format_formatWithArguments_formatedString) { const char *format = "%%%{1}=%{2}"; diff --git a/src/test/unittests/base/UnicodeTests.cpp b/src/test/unittests/base/UnicodeTests.cpp index 09a5da4ee..0c4b9d5d5 100644 --- a/src/test/unittests/base/UnicodeTests.cpp +++ b/src/test/unittests/base/UnicodeTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/unittests/synergy/ArgParserTests.cpp b/src/test/unittests/deskflow/ArgParserTests.cpp similarity index 93% rename from src/test/unittests/synergy/ArgParserTests.cpp rename to src/test/unittests/deskflow/ArgParserTests.cpp index af25e5111..7cc8d9cae 100644 --- a/src/test/unittests/synergy/ArgParserTests.cpp +++ b/src/test/unittests/deskflow/ArgParserTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,11 +18,11 @@ #include #include -#include "synergy/ArgParser.h" -#include "synergy/ArgsBase.h" -#include "synergy/ClientArgs.h" -#include "synergy/ServerArgs.h" -#include "synergy/ToolArgs.h" +#include "deskflow/ArgParser.h" +#include "deskflow/ArgsBase.h" +#include "deskflow/ClientArgs.h" +#include "deskflow/ServerArgs.h" +#include "deskflow/ToolArgs.h" #include @@ -48,7 +48,7 @@ TEST(ArgParserTests, isArg_missingArgs_returnFalse) { int i = 1; const int argc = 2; const char *argv[argc] = {"stub", "-t"}; - static synergy::ArgsBase argsBase; + static deskflow::ArgsBase argsBase; ArgParser argParser(NULL); argParser.setArgsBase(argsBase); @@ -211,21 +211,21 @@ TEST(ArgParserTests, parseToolArgs_matches_correspondingly) { for (auto const &test : tests) { ToolArgs toolArgs; EXPECT_FALSE(test.second(toolArgs)); - std::array twoArgs{"syntool", test.first}; + std::array twoArgs{"deskflow-legacy", test.first}; EXPECT_TRUE(parser.parseToolArgs(toolArgs, 2, twoArgs.data())); EXPECT_TRUE(test.second(toolArgs)); } ToolArgs toolArgs; - std::array twoArgs{"syntool", "--garbage"}; + std::array twoArgs{"deskflow-legacy", "--garbage"}; EXPECT_FALSE(parser.parseToolArgs(toolArgs, 2, twoArgs.data())); } TEST(ArgParserTests, parseServerArgs_parses_each_category) { ArgParser parser(nullptr); - synergy::ServerArgs args; + deskflow::ServerArgs args; args.m_daemon = false; char const *argv[] = { - "synergy", "--help" + "deskflow", "--help" #if WINAPI_MSWINDOWS , "--exit-pause" @@ -242,10 +242,10 @@ TEST(ArgParserTests, parseServerArgs_parses_each_category) { TEST(ArgParserTests, parseClientArgs_parses_single_help) { ArgParser parser(nullptr); - synergy::ClientArgs args; + deskflow::ClientArgs args; args.m_daemon = false; char const *argv[] = { - "synergy", + "deskflow", "--help" #if WINAPI_MSWINDOWS , diff --git a/src/test/unittests/synergy/ClientArgsParsingTests.cpp b/src/test/unittests/deskflow/ClientArgsParsingTests.cpp similarity index 89% rename from src/test/unittests/synergy/ClientArgsParsingTests.cpp rename to src/test/unittests/deskflow/ClientArgsParsingTests.cpp index 90cc687fd..ace8e6d82 100644 --- a/src/test/unittests/synergy/ClientArgsParsingTests.cpp +++ b/src/test/unittests/deskflow/ClientArgsParsingTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ClientArgs.h" -#include "test/mock/synergy/MockArgParser.h" +#include "deskflow/ArgParser.h" +#include "deskflow/ClientArgs.h" +#include "test/mock/deskflow/MockArgParser.h" #include @@ -39,7 +39,7 @@ TEST(ClientArgsParsingTests, parseClientArgs_yScrollArg_setYScroll) { .WillByDefault(Invoke(client_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(client_stubCheckUnexpectedArgs)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; const int argc = 3; const char *kYScrollCmd[argc] = {"stub", "--yscroll", "1"}; @@ -54,7 +54,7 @@ TEST(ClientArgsParsingTests, parseClientArgs_setLangSync) { .WillByDefault(Invoke(client_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(client_stubCheckUnexpectedArgs)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; clientArgs.m_enableLangSync = false; const int argc = 2; std::array kLangCmd = {"stub", "--sync-language"}; @@ -66,14 +66,14 @@ TEST(ClientArgsParsingTests, parseClientArgs_setLangSync) { TEST(ClientArgsParsingTests, parseClientArgs_setInvertScroll) { NiceMock argParser; - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; const int argc = 2; std::array kLangCmd = {"stub", "--invert-scroll"}; argParser.parseClientArgs(clientArgs, argc, kLangCmd.data()); EXPECT_EQ( clientArgs.m_clientScrollDirection, - synergy::ClientScrollDirection::INVERT_SERVER); + deskflow::ClientScrollDirection::INVERT_SERVER); } TEST(ClientArgsParsingTests, parseClientArgs_setCommonArgs) { @@ -82,7 +82,7 @@ TEST(ClientArgsParsingTests, parseClientArgs_setCommonArgs) { .WillByDefault(Invoke(client_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(client_stubCheckUnexpectedArgs)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; clientArgs.m_enableLangSync = false; const int argc = 9; std::array kLangCmd = { @@ -99,13 +99,13 @@ TEST(ClientArgsParsingTests, parseClientArgs_setCommonArgs) { EXPECT_TRUE(clientArgs.m_preventSleep); } -TEST(ClientArgsParsingTests, parseClientArgs_addressArg_setSynergyAddress) { +TEST(ClientArgsParsingTests, parseClientArgs_addressArg_setDeskflowAddress) { NiceMock argParser; ON_CALL(argParser, parseGenericArgs(_, _, _)) .WillByDefault(Invoke(client_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(client_stubCheckUnexpectedArgs)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; const int argc = 2; const char *kAddressCmd[argc] = {"stub", "mock_address"}; @@ -121,7 +121,7 @@ TEST(ClientArgsParsingTests, parseClientArgs_noAddressArg_returnFalse) { .WillByDefault(Invoke(client_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(client_stubCheckUnexpectedArgs)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; const int argc = 1; const char *kNoAddressCmd[argc] = {"stub"}; @@ -136,7 +136,7 @@ TEST(ClientArgsParsingTests, parseClientArgs_unrecognizedArg_returnFalse) { .WillByDefault(Invoke(client_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(client_stubCheckUnexpectedArgs)); - synergy::ClientArgs clientArgs; + deskflow::ClientArgs clientArgs; const int argc = 3; const char *kUnrecognizedCmd[argc] = {"stub", "mock_arg", "mock_address"}; diff --git a/src/test/unittests/synergy/ClipboardChunkTests.cpp b/src/test/unittests/deskflow/ClipboardChunkTests.cpp similarity index 94% rename from src/test/unittests/synergy/ClipboardChunkTests.cpp rename to src/test/unittests/deskflow/ClipboardChunkTests.cpp index 476f6d3cb..bd567adfe 100644 --- a/src/test/unittests/synergy/ClipboardChunkTests.cpp +++ b/src/test/unittests/deskflow/ClipboardChunkTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "synergy/ClipboardChunk.h" -#include "synergy/protocol_types.h" +#include "deskflow/ClipboardChunk.h" +#include "deskflow/protocol_types.h" #include diff --git a/src/test/unittests/synergy/ClipboardTests.cpp b/src/test/unittests/deskflow/ClipboardTests.cpp similarity index 88% rename from src/test/unittests/synergy/ClipboardTests.cpp rename to src/test/unittests/deskflow/ClipboardTests.cpp index b5a3ed5ff..921b6a76c 100644 --- a/src/test/unittests/synergy/ClipboardTests.cpp +++ b/src/test/unittests/deskflow/ClipboardTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/Clipboard.h" +#include "deskflow/Clipboard.h" #include @@ -32,7 +32,7 @@ TEST(ClipboardTests, empty_openCalled_returnsTrue) { TEST(ClipboardTests, empty_singleFormat_hasReturnsFalse) { Clipboard clipboard; clipboard.open(0); - clipboard.add(Clipboard::kText, "synergy rocks!"); + clipboard.add(Clipboard::kText, "deskflow rocks!"); clipboard.empty(); @@ -44,17 +44,17 @@ TEST(ClipboardTests, add_newValue_valueWasStored) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } TEST(ClipboardTests, add_replaceValue_valueWasReplaced) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding. String actual = clipboard.get(IClipboard::kText); @@ -108,7 +108,7 @@ TEST(ClipboardTests, getTime_openAndEmpty_returnsOne) { TEST(ClipboardTests, has_withFormatAdded_returnsTrue) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); bool actual = clipboard.has(IClipboard::kText); @@ -136,11 +136,11 @@ TEST(ClipboardTests, get_withNoFormats_returnsEmpty) { TEST(ClipboardTests, get_withFormatAdded_returnsExpected) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } TEST(ClipboardTests, marshall_addNotCalled_firstCharIsZero) { @@ -156,7 +156,7 @@ TEST(ClipboardTests, marshall_addNotCalled_firstCharIsZero) { TEST(ClipboardTests, marshall_withTextAdded_typeCharIsText) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); clipboard.close(); String actual = clipboard.marshall(); @@ -168,7 +168,7 @@ TEST(ClipboardTests, marshall_withTextAdded_typeCharIsText) { TEST(ClipboardTests, marshall_withTextAdded_lastSizeCharIs14) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); // 14 chars + clipboard.add(IClipboard::kText, "deskflow rocks!"); // 14 chars clipboard.close(); String actual = clipboard.marshall(); @@ -182,11 +182,11 @@ TEST(ClipboardTests, marshall_withTextAdded_lastSizeCharIs14) { TEST(ClipboardTests, marshall_withTextSize285_sizeCharsValid) { // 285 chars String data; - data.append("Synergy is Free and Open Source Software that lets you "); + data.append("Deskflow is Free and Open Source Software that lets you "); data.append("easily share your mouse and keyboard between multiple "); data.append("computers, where each computer has it's own display. No "); data.append("special hardware is required, all you need is a local area "); - data.append("network. Synergy is supported on Windows, Mac OS X and Linux."); + data.append("network. Deskflow is supported on Windows, Mac OS X and Linux."); Clipboard clipboard; clipboard.open(0); @@ -223,7 +223,7 @@ TEST(ClipboardTests, marshall_withHtmlAdded_typeCharIsHtml) { TEST(ClipboardTests, marshall_withHtmlAndText_has2Formats) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks"); + clipboard.add(IClipboard::kText, "deskflow rocks"); clipboard.add(IClipboard::kHTML, "html sucks"); clipboard.close(); @@ -240,13 +240,13 @@ TEST(ClipboardTests, marshall_withHtmlAndText_has2Formats) { TEST(ClipboardTests, marshall_withTextAdded_endsWithAdded) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "deskflow rocks!"); clipboard.close(); String actual = clipboard.marshall(); // string contains other data, but should end in the string we added. - EXPECT_EQ("synergy rocks!", actual.substr(12)); + EXPECT_EQ("deskflow rocks!", actual.substr(12)); } TEST(ClipboardTests, unmarshall_emptyData_hasTextIsFalse) { @@ -270,11 +270,11 @@ TEST(ClipboardTests, unmarshall_withTextSize285_getTextIsValid) { // 285 chars String text; - text.append("Synergy is Free and Open Source Software that lets you "); + text.append("Deskflow is Free and Open Source Software that lets you "); text.append("easily share your mouse and keyboard between multiple "); text.append("computers, where each computer has it's own display. No "); text.append("special hardware is required, all you need is a local area "); - text.append("network. Synergy is supported on Windows, Mac OS X and Linux."); + text.append("network. Deskflow is supported on Windows, Mac OS X and Linux."); String data; data += (char)0; @@ -313,7 +313,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getTextIsValid) { data += (char)0; data += (char)0; data += (char)14; - data += "synergy rocks!"; + data += "deskflow rocks!"; data += (char)0; data += (char)0; data += (char)0; @@ -328,7 +328,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getTextIsValid) { clipboard.open(0); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } TEST(ClipboardTests, unmarshall_withTextAndHtml_getHtmlIsValid) { @@ -346,7 +346,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getHtmlIsValid) { data += (char)0; data += (char)0; data += (char)14; - data += "synergy rocks!"; + data += "deskflow rocks!"; data += (char)0; data += (char)0; data += (char)0; @@ -367,7 +367,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getHtmlIsValid) { TEST(ClipboardTests, copy_withSingleText_clipboardsAreEqual) { Clipboard clipboard1; clipboard1.open(0); - clipboard1.add(Clipboard::kText, "synergy rocks!"); + clipboard1.add(Clipboard::kText, "deskflow rocks!"); clipboard1.close(); Clipboard clipboard2; @@ -375,5 +375,5 @@ TEST(ClipboardTests, copy_withSingleText_clipboardsAreEqual) { clipboard2.open(0); String actual = clipboard2.get(Clipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("deskflow rocks!", actual); } diff --git a/src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp b/src/test/unittests/deskflow/DeprecatedArgsParsingTests.cpp similarity index 92% rename from src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp rename to src/test/unittests/deskflow/DeprecatedArgsParsingTests.cpp index 92e9b6b8b..bc35c6cfe 100644 --- a/src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp +++ b/src/test/unittests/deskflow/DeprecatedArgsParsingTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" +#include "deskflow/ArgParser.h" #include -using namespace synergy; +using namespace deskflow; TEST(DeprecatedArgsParsingTests, parseDeprecatedArgs_cryptoPass_returnTrue) { int i = 1; diff --git a/src/test/unittests/synergy/GenericArgsParsingTests.cpp b/src/test/unittests/deskflow/GenericArgsParsingTests.cpp similarity index 95% rename from src/test/unittests/synergy/GenericArgsParsingTests.cpp rename to src/test/unittests/deskflow/GenericArgsParsingTests.cpp index 79d325033..53fc93dc4 100644 --- a/src/test/unittests/synergy/GenericArgsParsingTests.cpp +++ b/src/test/unittests/deskflow/GenericArgsParsingTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ArgsBase.h" -#include "test/mock/synergy/MockApp.h" +#include "deskflow/ArgParser.h" +#include "deskflow/ArgsBase.h" +#include "test/mock/deskflow/MockApp.h" #include -using namespace synergy; +using namespace deskflow; using ::testing::_; using ::testing::Invoke; using ::testing::NiceMock; @@ -42,11 +42,11 @@ public: void TearDown() { delete m_argParser; } - static synergy::ArgsBase argsBase; + static deskflow::ArgsBase argsBase; ArgParser *m_argParser = nullptr; }; -synergy::ArgsBase GenericArgsParsingTests::argsBase; +deskflow::ArgsBase GenericArgsParsingTests::argsBase; TEST_F(GenericArgsParsingTests, parseGenericArgs_logLevelCmd_setLogLevel) { int i = 1; diff --git a/src/test/unittests/synergy/IKeyStateTests.cpp b/src/test/unittests/deskflow/IKeyStateTests.cpp similarity index 85% rename from src/test/unittests/synergy/IKeyStateTests.cpp rename to src/test/unittests/deskflow/IKeyStateTests.cpp index 20984fd26..9fbc11883 100644 --- a/src/test/unittests/synergy/IKeyStateTests.cpp +++ b/src/test/unittests/deskflow/IKeyStateTests.cpp @@ -1,4 +1,4 @@ -#include "lib/synergy/IKeyState.h" +#include "lib/deskflow/IKeyState.h" #include diff --git a/src/test/unittests/synergy/KeyMapTests.cpp b/src/test/unittests/deskflow/KeyMapTests.cpp similarity index 98% rename from src/test/unittests/synergy/KeyMapTests.cpp rename to src/test/unittests/deskflow/KeyMapTests.cpp index 4db3beb06..e28871594 100644 --- a/src/test/unittests/synergy/KeyMapTests.cpp +++ b/src/test/unittests/deskflow/KeyMapTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #define TEST_ENV -#include "synergy/KeyMap.h" +#include "deskflow/KeyMap.h" #include #include @@ -29,7 +29,7 @@ using ::testing::Return; using ::testing::ReturnRef; using ::testing::SaveArg; -namespace synergy { +namespace deskflow { TEST(KeyMapTests, findBestKey_requiredDown_matchExactFirstItem) { KeyMap keyMap; @@ -223,4 +223,4 @@ TEST(KeyMapTests, mapkey_handles_setmodifier_with_no_mapped) { EXPECT_TRUE(result == nullptr); } -} // namespace synergy +} // namespace deskflow diff --git a/src/test/unittests/synergy/KeyStateTests.cpp b/src/test/unittests/deskflow/KeyStateTests.cpp similarity index 93% rename from src/test/unittests/synergy/KeyStateTests.cpp rename to src/test/unittests/deskflow/KeyStateTests.cpp index 43e04760a..c275f2d47 100644 --- a/src/test/unittests/synergy/KeyStateTests.cpp +++ b/src/test/unittests/deskflow/KeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -#include "test/mock/synergy/MockEventQueue.h" -#include "test/mock/synergy/MockKeyMap.h" -#include "test/mock/synergy/MockKeyState.h" +#include "test/mock/deskflow/MockEventQueue.h" +#include "test/mock/deskflow/MockKeyMap.h" +#include "test/mock/deskflow/MockKeyState.h" #include #include @@ -34,14 +34,14 @@ void stubPollPressedKeys(IKeyState::KeyButtonSet &pressedKeys); void assertMaskIsOne(ForeachKeyCallback cb, void *userData); -const synergy::KeyMap::KeyItem *stubMapKey( - synergy::KeyMap::Keystrokes &keys, KeyID id, SInt32 group, - synergy::KeyMap::ModifierToKeys &activeModifiers, +const deskflow::KeyMap::KeyItem *stubMapKey( + deskflow::KeyMap::Keystrokes &keys, KeyID id, SInt32 group, + deskflow::KeyMap::ModifierToKeys &activeModifiers, KeyModifierMask ¤tState, KeyModifierMask desiredMask, bool isAutoRepeat, const String &lang); -synergy::KeyMap::Keystroke s_stubKeystroke(1, false, false); -synergy::KeyMap::KeyItem s_stubKeyItem; +deskflow::KeyMap::Keystroke s_stubKeystroke(1, false, false); +deskflow::KeyMap::KeyItem s_stubKeyItem; TEST(CKeyStateTests, onKey_aKeyDown_keyStateOne) { MockKeyMap keyMap; @@ -302,7 +302,7 @@ TEST(KeyStateTests, fakeKeyRepeat_nullKey_returnsFalse) { KeyStateImpl keyState(eventQueue, keyMap); // set the key to down (we need to make mapKey return a valid key to do this). - synergy::KeyMap::KeyItem keyItem; + deskflow::KeyMap::KeyItem keyItem; keyItem.m_client = 0; keyItem.m_button = 1; ON_CALL(keyMap, mapKey(_, _, _, _, _, _, _, _)) @@ -310,7 +310,7 @@ TEST(KeyStateTests, fakeKeyRepeat_nullKey_returnsFalse) { keyState.fakeKeyDown(1, 0, 0, "en"); // change mapKey to return NULL so that fakeKeyRepeat exits early. - synergy::KeyMap::KeyItem *nullKeyItem = NULL; + deskflow::KeyMap::KeyItem *nullKeyItem = NULL; ON_CALL(keyMap, mapKey(_, _, _, _, _, _, _, _)) .WillByDefault(Return(nullKeyItem)); @@ -325,7 +325,7 @@ TEST(KeyStateTests, fakeKeyRepeat_invalidButton_returnsFalse) { KeyStateImpl keyState(eventQueue, keyMap); // set the key to down (we need to make mapKey return a valid key to do this). - synergy::KeyMap::KeyItem keyItem; + deskflow::KeyMap::KeyItem keyItem; keyItem.m_client = 0; keyItem.m_button = 1; // set to 1 to make fakeKeyDown work. ON_CALL(keyMap, mapKey(_, _, _, _, _, _, _, _)) @@ -347,7 +347,7 @@ TEST(KeyStateTests, fakeKeyRepeat_validKey_returnsTrue) { MockEventQueue eventQueue; KeyStateImpl keyState(eventQueue, keyMap); s_stubKeyItem.m_client = 0; - s_stubKeystroke.m_type = synergy::KeyMap::Keystroke::kButton; + s_stubKeystroke.m_type = deskflow::KeyMap::Keystroke::kButton; s_stubKeystroke.m_data.m_button.m_button = 2; // set the button to 1 for fakeKeyDown call @@ -445,8 +445,8 @@ TEST(KeyStateTests, isKeyDown_noKeysDown_returnsFalse) { } TEST(KeyStateTests, updateKeyMap_exercised) { - synergy::KeyMap keyMap; - synergy::KeyMap::KeyItem keyItem; + deskflow::KeyMap keyMap; + deskflow::KeyMap::KeyItem keyItem; keyItem.m_button = 'A'; keyItem.m_group = 1; keyItem.m_id = 'A'; @@ -466,10 +466,10 @@ void assertMaskIsOne(ForeachKeyCallback cb, void *userData) { ASSERT_EQ(1, ((KeyState::AddActiveModifierContext *)userData)->m_mask); } -const synergy::KeyMap::KeyItem *stubMapKey( - synergy::KeyMap::Keystrokes &keys, KeyID, SInt32, - synergy::KeyMap::ModifierToKeys &, KeyModifierMask &, KeyModifierMask, bool, - const String &) { +const deskflow::KeyMap::KeyItem *stubMapKey( + deskflow::KeyMap::Keystrokes &keys, KeyID, SInt32, + deskflow::KeyMap::ModifierToKeys &, KeyModifierMask &, KeyModifierMask, + bool, const String &) { keys.push_back(s_stubKeystroke); return &s_stubKeyItem; } diff --git a/src/test/unittests/synergy/ProtocolUtilTests.cpp b/src/test/unittests/deskflow/ProtocolUtilTests.cpp similarity index 99% rename from src/test/unittests/synergy/ProtocolUtilTests.cpp rename to src/test/unittests/deskflow/ProtocolUtilTests.cpp index 45c20477f..d414ccd27 100644 --- a/src/test/unittests/synergy/ProtocolUtilTests.cpp +++ b/src/test/unittests/deskflow/ProtocolUtilTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2020 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/ProtocolUtil.h" +#include "deskflow/ProtocolUtil.h" #include "test/mock/io/MockStream.h" #include diff --git a/src/test/unittests/synergy/ServerAppTests.cpp b/src/test/unittests/deskflow/ServerAppTests.cpp similarity index 90% rename from src/test/unittests/synergy/ServerAppTests.cpp rename to src/test/unittests/deskflow/ServerAppTests.cpp index 2a3f08b09..d6e107fee 100644 --- a/src/test/unittests/synergy/ServerAppTests.cpp +++ b/src/test/unittests/deskflow/ServerAppTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,9 +17,9 @@ #define TEST_ENV -#include "synergy/ArgParser.h" -#include "synergy/ServerApp.h" -#include "synergy/ServerArgs.h" +#include "deskflow/ArgParser.h" +#include "deskflow/ServerApp.h" +#include "deskflow/ServerArgs.h" #include #include @@ -36,7 +36,7 @@ TEST(ServerAppTests, runInner_will_handle_configuration_lifetime) { EXPECT_FALSE(app.args().m_config); - const char *argv[]{"synergyc"}; + const char *argv[]{"deskflowc"}; app.runInner( 1, const_cast(argv), nullptr, [](int, char **) { return 0; }); diff --git a/src/test/unittests/synergy/ServerArgsParsingTests.cpp b/src/test/unittests/deskflow/ServerArgsParsingTests.cpp similarity index 85% rename from src/test/unittests/synergy/ServerArgsParsingTests.cpp rename to src/test/unittests/deskflow/ServerArgsParsingTests.cpp index 1c9e7ad4d..102f6f892 100644 --- a/src/test/unittests/synergy/ServerArgsParsingTests.cpp +++ b/src/test/unittests/deskflow/ServerArgsParsingTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ServerArgs.h" -#include "test/mock/synergy/MockArgParser.h" +#include "deskflow/ArgParser.h" +#include "deskflow/ServerArgs.h" +#include "test/mock/deskflow/MockArgParser.h" #include #include @@ -33,25 +33,25 @@ bool server_stubParseGenericArgs(int, const char *const *, int &) { bool server_stubCheckUnexpectedArgs() { return false; } TEST(ServerArgs, ServerArgs_will_construct_from_copy) { - synergy::ServerArgs serverArgs; + deskflow::ServerArgs serverArgs; serverArgs.m_display = "display0"; - synergy::ServerArgs serverArgs2{serverArgs}; + deskflow::ServerArgs serverArgs2{serverArgs}; EXPECT_EQ(serverArgs.m_display, serverArgs2.m_display); } -TEST(ServerArgsParsingTests, parseServerArgs_addressArg_setSynergyAddress) { +TEST(ServerArgsParsingTests, parseServerArgs_addressArg_setDeskflowAddress) { NiceMock argParser; ON_CALL(argParser, parseGenericArgs(_, _, _)) .WillByDefault(Invoke(server_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(server_stubCheckUnexpectedArgs)); - synergy::ServerArgs serverArgs; + deskflow::ServerArgs serverArgs; const int argc = 3; const char *kAddressCmd[argc] = {"stub", "--address", "mock_address"}; argParser.parseServerArgs(serverArgs, argc, kAddressCmd); - EXPECT_EQ("mock_address", serverArgs.m_synergyAddress); + EXPECT_EQ("mock_address", serverArgs.m_deskflowAddress); } TEST(ServerArgsParsingTests, parseServerArgs_configArg_setConfigFile) { @@ -60,7 +60,7 @@ TEST(ServerArgsParsingTests, parseServerArgs_configArg_setConfigFile) { .WillByDefault(Invoke(server_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(server_stubCheckUnexpectedArgs)); - synergy::ServerArgs serverArgs; + deskflow::ServerArgs serverArgs; const int argc = 3; const char *kConfigCmd[argc] = {"stub", "--config", "mock_configFile"}; @@ -75,7 +75,7 @@ TEST(ServerArgsParsingTests, parseServerArgs_serialKey_isSet) { .WillByDefault(Invoke(server_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(server_stubCheckUnexpectedArgs)); - synergy::ServerArgs serverArgs; + deskflow::ServerArgs serverArgs; const int argc = 3; const char *serial = "7B76323B737562736372697074696F6E3B62617369633B426F623B313B656D61696C3B63" @@ -92,7 +92,7 @@ TEST(ServerArgsParsingTests, parseServerArgs_checkUnexpectedParams) { .WillByDefault(Invoke(server_stubParseGenericArgs)); ON_CALL(argParser, checkUnexpectedArgs()) .WillByDefault(Invoke(server_stubCheckUnexpectedArgs)); - synergy::ServerArgs serverArgs; + deskflow::ServerArgs serverArgs; const int argc = 2; std::array kUnknownCmd = {"stub", "--unknown"}; diff --git a/src/test/unittests/synergy/X11LayoutParserTests.cpp b/src/test/unittests/deskflow/X11LayoutParserTests.cpp similarity index 98% rename from src/test/unittests/synergy/X11LayoutParserTests.cpp rename to src/test/unittests/deskflow/X11LayoutParserTests.cpp index 3dc40b85b..6000668d5 100644 --- a/src/test/unittests/synergy/X11LayoutParserTests.cpp +++ b/src/test/unittests/deskflow/X11LayoutParserTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -16,7 +16,7 @@ */ #if WINAPI_XWINDOWS -#include "synergy/unix/X11LayoutsParser.h" +#include "deskflow/unix/X11LayoutsParser.h" #include #include diff --git a/src/test/unittests/synergy/languages/LanguageManagerTests.cpp b/src/test/unittests/deskflow/languages/LanguageManagerTests.cpp similarity index 81% rename from src/test/unittests/synergy/languages/LanguageManagerTests.cpp rename to src/test/unittests/deskflow/languages/LanguageManagerTests.cpp index cfcc80039..c1990c9c1 100644 --- a/src/test/unittests/synergy/languages/LanguageManagerTests.cpp +++ b/src/test/unittests/deskflow/languages/LanguageManagerTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2021 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -#include "synergy/languages/LanguageManager.h" +#include "deskflow/languages/LanguageManager.h" #include TEST(LanguageManager, RemoteLanguagesTest) { std::string remoteLanguages = "ruenuk"; - synergy::languages::LanguageManager manager({"ru", "en", "uk"}); + deskflow::languages::LanguageManager manager({"ru", "en", "uk"}); manager.setRemoteLanguages(remoteLanguages); EXPECT_EQ( @@ -34,7 +34,7 @@ TEST(LanguageManager, RemoteLanguagesTest) { TEST(LanguageManager, LocalLanguagesTest) { std::vector localLanguages = {"ru", "en", "uk"}; - synergy::languages::LanguageManager manager(localLanguages); + deskflow::languages::LanguageManager manager(localLanguages); EXPECT_EQ( (std::vector{"ru", "en", "uk"}), @@ -44,7 +44,7 @@ TEST(LanguageManager, LocalLanguagesTest) { TEST(LanguageManager, MissedLanguagesTest) { String remoteLanguages = "ruenuk"; std::vector localLanguages = {"en"}; - synergy::languages::LanguageManager manager(localLanguages); + deskflow::languages::LanguageManager manager(localLanguages); manager.setRemoteLanguages(remoteLanguages); EXPECT_EQ("ru, uk", manager.getMissedLanguages()); @@ -52,14 +52,14 @@ TEST(LanguageManager, MissedLanguagesTest) { TEST(LanguageManager, SerializeLocalLanguagesTest) { std::vector localLanguages = {"ru", "en", "uk"}; - synergy::languages::LanguageManager manager(localLanguages); + deskflow::languages::LanguageManager manager(localLanguages); EXPECT_EQ("ruenuk", manager.getSerializedLocalLanguages()); } TEST(LanguageManager, LanguageInstalledTest) { std::vector localLanguages = {"ru", "en", "uk"}; - synergy::languages::LanguageManager manager(localLanguages); + deskflow::languages::LanguageManager manager(localLanguages); EXPECT_FALSE(manager.isLanguageInstalled("us")); EXPECT_TRUE(manager.isLanguageInstalled("en")); diff --git a/src/test/unittests/gui/LoggerTests.cpp b/src/test/unittests/gui/LoggerTests.cpp index 51c6a158e..2afd01b77 100644 --- a/src/test/unittests/gui/LoggerTests.cpp +++ b/src/test/unittests/gui/LoggerTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include using namespace testing; -using namespace synergy::gui; +using namespace deskflow::gui; TEST(LoggerTests, handleMessage_withDebugEnvVarOn_emitsNewLine) { Logger logger; @@ -31,14 +31,14 @@ TEST(LoggerTests, handleMessage_withDebugEnvVarOn_emitsNewLine) { [&newLineEmitted](const QString &line) { newLineEmitted = line.toStdString(); }); - qputenv("SYNERGY_GUI_DEBUG", "true"); + qputenv("DESKFLOW_GUI_DEBUG", "true"); logger.loadEnvVars(); logger.handleMessage(QtDebugMsg, "stub", "test"); EXPECT_THAT(newLineEmitted, HasSubstr("test")); - qputenv("SYNERGY_GUI_DEBUG", ""); + qputenv("DESKFLOW_GUI_DEBUG", ""); } TEST(LoggerTests, handleMessage_withDebugEnvVarOff_doesNotEmitNewLine) { @@ -47,12 +47,12 @@ TEST(LoggerTests, handleMessage_withDebugEnvVarOff_doesNotEmitNewLine) { QObject::connect( &logger, &Logger::newLine, // [&newLineEmitted](const QString &line) { newLineEmitted = true; }); - qputenv("SYNERGY_GUI_DEBUG", "false"); + qputenv("DESKFLOW_GUI_DEBUG", "false"); logger.loadEnvVars(); logger.handleMessage(QtDebugMsg, "stub", "test"); EXPECT_FALSE(newLineEmitted); - qputenv("SYNERGY_GUI_DEBUG", ""); + qputenv("DESKFLOW_GUI_DEBUG", ""); } diff --git a/src/test/unittests/gui/VersionCheckerTests.cpp b/src/test/unittests/gui/VersionCheckerTests.cpp index ed22c4ed1..bd850a5ba 100644 --- a/src/test/unittests/gui/VersionCheckerTests.cpp +++ b/src/test/unittests/gui/VersionCheckerTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/unittests/gui/byte_utils_tests.cpp b/src/test/unittests/gui/byte_utils_tests.cpp index 1e97dc137..04bb87b8f 100644 --- a/src/test/unittests/gui/byte_utils_tests.cpp +++ b/src/test/unittests/gui/byte_utils_tests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include -using namespace synergy::gui; +using namespace deskflow::gui; TEST(byte_utils_tests, bytesToInt_size4) { char buffer[4] = {0x01, 0x02, 0x03, 0x04}; diff --git a/src/test/unittests/gui/config/AppConfigTests.cpp b/src/test/unittests/gui/config/AppConfigTests.cpp index e9bed0f05..75108396e 100644 --- a/src/test/unittests/gui/config/AppConfigTests.cpp +++ b/src/test/unittests/gui/config/AppConfigTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -24,12 +24,12 @@ #include using namespace testing; -using namespace synergy::gui::proxy; +using namespace deskflow::gui::proxy; namespace { -class ConfigScopesMock : public synergy::gui::IConfigScopes { - using QSettingsProxy = synergy::gui::proxy::QSettingsProxy; +class ConfigScopesMock : public deskflow::gui::IConfigScopes { + using QSettingsProxy = deskflow::gui::proxy::QSettingsProxy; public: MOCK_METHOD(void, signalReady, (), (override)); diff --git a/src/test/unittests/gui/config/ConfigScopesTests.cpp b/src/test/unittests/gui/config/ConfigScopesTests.cpp index 87f4c5fc9..ef0c153a0 100644 --- a/src/test/unittests/gui/config/ConfigScopesTests.cpp +++ b/src/test/unittests/gui/config/ConfigScopesTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,8 +23,8 @@ #include using namespace testing; -using namespace synergy::gui; -using namespace synergy::gui::proxy; +using namespace deskflow::gui; +using namespace deskflow::gui::proxy; namespace { diff --git a/src/test/unittests/gui/config/ScreenTests.cpp b/src/test/unittests/gui/config/ScreenTests.cpp index 99e2ae25b..277e79fbd 100644 --- a/src/test/unittests/gui/config/ScreenTests.cpp +++ b/src/test/unittests/gui/config/ScreenTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #include #include -using namespace synergy::gui::proxy; +using namespace deskflow::gui::proxy; using namespace testing; class QSettingsProxyMock : public QSettingsProxy { diff --git a/src/test/unittests/gui/core/ClientConnectionTests.cpp b/src/test/unittests/gui/core/ClientConnectionTests.cpp index 00aaf4fb2..140bbbbb3 100644 --- a/src/test/unittests/gui/core/ClientConnectionTests.cpp +++ b/src/test/unittests/gui/core/ClientConnectionTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ class QWidget; using testing::_; using testing::NiceMock; -using namespace synergy::gui; +using namespace deskflow::gui; using enum messages::ClientError; namespace { diff --git a/src/test/unittests/gui/core/CoreProcessTests.cpp b/src/test/unittests/gui/core/CoreProcessTests.cpp index 3209497c6..02ef3238e 100644 --- a/src/test/unittests/gui/core/CoreProcessTests.cpp +++ b/src/test/unittests/gui/core/CoreProcessTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -27,8 +27,8 @@ #include #include -using namespace synergy::gui; -using namespace synergy::license; +using namespace deskflow::gui; +using namespace deskflow::license; using namespace testing; namespace { diff --git a/src/test/unittests/gui/core/ServerConnectionTests.cpp b/src/test/unittests/gui/core/ServerConnectionTests.cpp index 1442afb4c..ebd40dbcb 100644 --- a/src/test/unittests/gui/core/ServerConnectionTests.cpp +++ b/src/test/unittests/gui/core/ServerConnectionTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ using testing::_; using testing::NiceMock; -using namespace synergy::gui; +using namespace deskflow::gui; class QWidget; diff --git a/src/test/unittests/gui/core/WaylandWarningsTests.cpp b/src/test/unittests/gui/core/WaylandWarningsTests.cpp index 6c4a147ad..4bf3c2821 100644 --- a/src/test/unittests/gui/core/WaylandWarningsTests.cpp +++ b/src/test/unittests/gui/core/WaylandWarningsTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,8 +22,8 @@ #include #include -using namespace synergy::gui; -using namespace synergy::gui::core; +using namespace deskflow::gui; +using namespace deskflow::gui::core; namespace { struct MockDeps : public WaylandWarnings::Deps { diff --git a/src/test/unittests/gui/dialogs/SettingsDialogTests.cpp b/src/test/unittests/gui/dialogs/SettingsDialogTests.cpp index 60eab9868..a2762942e 100644 --- a/src/test/unittests/gui/dialogs/SettingsDialogTests.cpp +++ b/src/test/unittests/gui/dialogs/SettingsDialogTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -28,8 +28,8 @@ #include using namespace testing; -using namespace synergy::license; -using namespace synergy::gui; +using namespace deskflow::license; +using namespace deskflow::gui; TEST(SettingsDialogTests, ctor_getsScreenName) { TestQtFullApp app; diff --git a/src/test/unittests/gui/ipc/QIpcClientTests.cpp b/src/test/unittests/gui/ipc/QIpcClientTests.cpp index 8a66d879a..9797ebd8d 100644 --- a/src/test/unittests/gui/ipc/QIpcClientTests.cpp +++ b/src/test/unittests/gui/ipc/QIpcClientTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/unittests/gui/license/LicenseHandlerTests.cpp b/src/test/unittests/gui/license/LicenseHandlerTests.cpp index f2ac5a0a8..838cda5d9 100644 --- a/src/test/unittests/gui/license/LicenseHandlerTests.cpp +++ b/src/test/unittests/gui/license/LicenseHandlerTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include #include -using namespace synergy::license; +using namespace deskflow::license; using namespace std::chrono; const auto kPast = system_clock::now() - hours(1); diff --git a/src/test/unittests/gui/license/license_notices_tests.cpp b/src/test/unittests/gui/license/license_notices_tests.cpp index 25242c7d7..507508e45 100644 --- a/src/test/unittests/gui/license/license_notices_tests.cpp +++ b/src/test/unittests/gui/license/license_notices_tests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,8 +22,8 @@ #include using namespace std::chrono; -using namespace synergy::license; -using namespace synergy::gui; +using namespace deskflow::license; +using namespace deskflow::gui; using ::testing::HasSubstr; const auto kPast = system_clock::now() - hours(1); diff --git a/src/test/unittests/ipc/IpcLogOutputterTests.cpp b/src/test/unittests/ipc/IpcLogOutputterTests.cpp index f52e60850..0bcbd7c2f 100644 --- a/src/test/unittests/ipc/IpcLogOutputterTests.cpp +++ b/src/test/unittests/ipc/IpcLogOutputterTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -38,7 +38,7 @@ using ::testing::Property; using ::testing::Return; using ::testing::StrEq; -using namespace synergy; +using namespace deskflow; // TODO Fix the IPC Tests for windows, see #6709 // Tests disabled due to gtest/gmock update causing build problems diff --git a/src/test/unittests/ipc/IpcSettingMessageTests.cpp b/src/test/unittests/ipc/IpcSettingMessageTests.cpp index 8f4d07ab7..5c14a7ebb 100644 --- a/src/test/unittests/ipc/IpcSettingMessageTests.cpp +++ b/src/test/unittests/ipc/IpcSettingMessageTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2015-2022 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/unittests/main.cpp b/src/test/unittests/main.cpp index 7e51d9ec2..43a56fe04 100644 --- a/src/test/unittests/main.cpp +++ b/src/test/unittests/main.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -27,7 +27,7 @@ #include #include -using synergy::test::ExitTimeout; +using deskflow::test::ExitTimeout; const auto testDir = "tmp/test"; diff --git a/src/test/unittests/platform/OSXClipboardUTF8ConverterTest.cpp b/src/test/unittests/platform/OSXClipboardUTF8ConverterTest.cpp index f8d611fbe..1dc4bb6ec 100644 --- a/src/test/unittests/platform/OSXClipboardUTF8ConverterTest.cpp +++ b/src/test/unittests/platform/OSXClipboardUTF8ConverterTest.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * diff --git a/src/test/unittests/platform/OSXKeyStateTests.cpp b/src/test/unittests/platform/OSXKeyStateTests.cpp index 3e4b925b2..7cd793c43 100644 --- a/src/test/unittests/platform/OSXKeyStateTests.cpp +++ b/src/test/unittests/platform/OSXKeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -17,14 +17,14 @@ */ #include "platform/OSXKeyState.h" -#include "test/mock/synergy/MockEventQueue.h" -#include "test/mock/synergy/MockKeyMap.h" +#include "test/mock/deskflow/MockEventQueue.h" +#include "test/mock/deskflow/MockKeyMap.h" #include #include -TEST(OSXKeyStateTests, mapModifiersFromOSX_OSXMask_returnSynergyMask) { - synergy::KeyMap keyMap; +TEST(OSXKeyStateTests, mapModifiersFromOSX_OSXMask_returnDeskflowMask) { + deskflow::KeyMap keyMap; MockEventQueue eventQueue; OSXKeyState keyState(&eventQueue, keyMap, {"en"}, true); diff --git a/src/test/unittests/platform/XWindowsClipboardTests.cpp b/src/test/unittests/platform/XWindowsClipboardTests.cpp index 3bb4f9f60..84019fc00 100644 --- a/src/test/unittests/platform/XWindowsClipboardTests.cpp +++ b/src/test/unittests/platform/XWindowsClipboardTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2024 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/unittests/server/ConfigTests.cpp b/src/test/unittests/server/ConfigTests.cpp index ab83468a3..3d461b477 100644 --- a/src/test/unittests/server/ConfigTests.cpp +++ b/src/test/unittests/server/ConfigTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -83,8 +83,8 @@ TEST(ServerConfigTests, addr1.resolve(); NetworkAddress addr2("localhost", 8080); addr2.resolve(); - a.setSynergyAddress(addr1); - b.setSynergyAddress(addr2); + a.setDeskflowAddress(addr1); + b.setDeskflowAddress(addr2); EXPECT_TRUE(a == b); EXPECT_TRUE(b == a); @@ -214,8 +214,8 @@ TEST(ServerConfigTests, Config b(nullptr); a.addScreen("screenA"); b.addScreen("screenA"); - a.setSynergyAddress(NetworkAddress(8080)); - b.setSynergyAddress(NetworkAddress(1010)); + a.setDeskflowAddress(NetworkAddress(8080)); + b.setDeskflowAddress(NetworkAddress(1010)); EXPECT_FALSE(a == b); EXPECT_FALSE(b == a); } diff --git a/src/test/unittests/shared/LicenseTests.cpp b/src/test/unittests/shared/LicenseTests.cpp index 02a90ef88..3477fd1f2 100644 --- a/src/test/unittests/shared/LicenseTests.cpp +++ b/src/test/unittests/shared/LicenseTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ #include using enum Edition; -using namespace synergy::license; +using namespace deskflow::license; using time_point = std::chrono::system_clock::time_point; using seconds = std::chrono::seconds; diff --git a/src/test/unittests/shared/ProductTests.cpp b/src/test/unittests/shared/ProductTests.cpp index b978a5080..376eec853 100644 --- a/src/test/unittests/shared/ProductTests.cpp +++ b/src/test/unittests/shared/ProductTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -56,7 +56,7 @@ TEST(ProductTests, setEdition_pro_isValid) { EXPECT_EQ(kPro, product.edition()); EXPECT_EQ(Product::SerialKeyEditionID::Pro, product.serialKeyId()); - EXPECT_EQ("Synergy 1 Pro", product.name()); + EXPECT_EQ("Deskflow", product.name()); EXPECT_TRUE(product.isValid()); } @@ -67,7 +67,7 @@ TEST(ProductTests, setEdition_basic_isValid) { EXPECT_EQ(kBasic, product.edition()); EXPECT_EQ(Product::SerialKeyEditionID::Basic, product.serialKeyId()); - EXPECT_EQ("Synergy 1 Basic", product.name()); + EXPECT_EQ("Deskflow", product.name()); } TEST(ProductTests, setEdition_business_isValid) { @@ -77,5 +77,5 @@ TEST(ProductTests, setEdition_business_isValid) { EXPECT_EQ(kBusiness, product.edition()); EXPECT_EQ(Product::SerialKeyEditionID::Buisiness, product.serialKeyId()); - EXPECT_EQ("Synergy 1 Business", product.name()); + EXPECT_EQ("Deskflow", product.name()); } diff --git a/src/test/unittests/shared/SerialKeyTypeTests.cpp b/src/test/unittests/shared/SerialKeyTypeTests.cpp index 08a6a89fd..140bc7e90 100644 --- a/src/test/unittests/shared/SerialKeyTypeTests.cpp +++ b/src/test/unittests/shared/SerialKeyTypeTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * Deskflow -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or