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