From 03e014c75347bf37fc62a5c6b8b3bb81256f3d98 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 23 Sep 2025 10:25:42 -0400 Subject: [PATCH] feat: Remove daemon / no-daemon option --- src/lib/deskflow/App.h | 8 +++---- src/lib/deskflow/ArgParser.cpp | 20 ----------------- src/lib/deskflow/ArgsBase.h | 3 --- src/lib/deskflow/ClientApp.cpp | 18 ++-------------- src/lib/deskflow/ClientApp.h | 1 - src/lib/deskflow/IApp.h | 1 - src/lib/deskflow/ServerApp.cpp | 14 ------------ src/lib/deskflow/ServerApp.h | 1 - src/lib/deskflow/win32/AppUtilWindows.cpp | 3 +-- src/lib/gui/core/CoreProcess.cpp | 3 +-- src/unittests/deskflow/ArgParserTests.cpp | 26 ----------------------- src/unittests/deskflow/ArgParserTests.h | 2 -- 12 files changed, 7 insertions(+), 93 deletions(-) diff --git a/src/lib/deskflow/App.h b/src/lib/deskflow/App.h index 208d6e90d..9a5f5f9b6 100644 --- a/src/lib/deskflow/App.h +++ b/src/lib/deskflow/App.h @@ -153,11 +153,9 @@ constexpr static auto s_helpCommonArgs = // // system args (windows/unix) #if SYSAPI_UNIX -// unix daemon mode args -constexpr static auto s_helpSysArgs = " [--daemon|--no-daemon]"; -constexpr static auto s_helpSysInfo = // - " -f, --no-daemon run in the foreground.\n" - "* --daemon run as a daemon.\n"; +// unix has no system args +constexpr static auto s_helpSysArgs = ""; +constexpr static auto s_helpSysInfo = ""; #elif SYSAPI_WIN32 diff --git a/src/lib/deskflow/ArgParser.cpp b/src/lib/deskflow/ArgParser.cpp index d4e81c5e6..f35419b51 100644 --- a/src/lib/deskflow/ArgParser.cpp +++ b/src/lib/deskflow/ArgParser.cpp @@ -129,12 +129,6 @@ bool ArgParser::parseGenericArgs(int argc, const char *const *argv, int &i) cons argsBase().m_logFilter = argv[++i]; } else if (isArg(i, argc, argv, "-l", "--log", 1)) { argsBase().m_logFile = argv[++i]; - } else if (isArg(i, argc, argv, "-f", "--no-daemon")) { - // not a daemon - argsBase().m_daemon = false; - } else if (isArg(i, argc, argv, nullptr, "--daemon")) { - // daemonize - argsBase().m_daemon = true; } else if (isArg(i, argc, argv, "-n", "--name", 1)) { // save screen name argsBase().m_name = argv[++i]; @@ -339,19 +333,5 @@ void ArgParser::updateCommonArgs(const char *const *argv) const bool ArgParser::checkUnexpectedArgs() const { -#if SYSAPI_WIN32 - // suggest that user installs as a windows service. when launched as - // service, process should automatically detect that it should run in - // daemon mode. - if (argsBase().m_daemon) { - LOG( - (CLOG_ERR "the --daemon argument is not supported on windows. " - "instead, install %s as a service (--service install)", - argsBase().m_pname) - ); - return true; - } -#endif - return false; } diff --git a/src/lib/deskflow/ArgsBase.h b/src/lib/deskflow/ArgsBase.h index 988b7a595..f2e3e35d7 100644 --- a/src/lib/deskflow/ArgsBase.h +++ b/src/lib/deskflow/ArgsBase.h @@ -32,9 +32,6 @@ public: /// @brief Stores what type of object this is ClassType m_classType = ClassType::Base; - /// @brief Should run as a daemon - bool m_daemon = true; - /// @brief Should the app restart automatically bool m_restartable = true; diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index 4110886c5..c7f31144c 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -109,7 +109,7 @@ void ClientApp::help() #ifdef WINAPI_XWINDOWS << " [--display ]" #endif - << s_helpSysArgs << s_helpCommonArgs << " " + << s_helpCommonArgs << " " << "\n\n" << "Connect to a " << kAppName << " mouse/keyboard sharing server.\n" << "\n" @@ -314,14 +314,6 @@ void ClientApp::closeClient(Client *client) delete client; } -int ClientApp::foregroundStartup(int argc, char **argv) -{ - initApp(argc, argv); - - // never daemonize - return mainLoop(); -} - bool ClientApp::startClient() { double retryTime; @@ -413,13 +405,7 @@ static int daemonMainLoopStatic(int argc, const char **argv) int ClientApp::standardStartup(int argc, char **argv) { initApp(argc, argv); - - // daemonize if requested - if (args().m_daemon) { - return ARCH->daemonize(daemonName(), &daemonMainLoopStatic); - } else { - return mainLoop(); - } + return mainLoop(); } int ClientApp::runInner(int argc, char **argv, StartupFunc startup) diff --git a/src/lib/deskflow/ClientApp.h b/src/lib/deskflow/ClientApp.h index d07d0fe97..b1c1af35f 100644 --- a/src/lib/deskflow/ClientApp.h +++ b/src/lib/deskflow/ClientApp.h @@ -43,7 +43,6 @@ public: { return false; } - int foregroundStartup(int argc, char **argv) override; int standardStartup(int argc, char **argv) override; int runInner(int argc, char **argv, StartupFunc startup) override; deskflow::Screen *createScreen() override; diff --git a/src/lib/deskflow/IApp.h b/src/lib/deskflow/IApp.h index ad25a4377..7f0571ea6 100644 --- a/src/lib/deskflow/IApp.h +++ b/src/lib/deskflow/IApp.h @@ -30,7 +30,6 @@ public: virtual int mainLoop() = 0; virtual void initApp(int argc, const char **argv) = 0; virtual const char *daemonName() const = 0; - virtual int foregroundStartup(int argc, char **argv) = 0; virtual deskflow::Screen *createScreen() = 0; virtual IEventQueue *getEvents() const = 0; }; diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index 192d8ba90..a8c1783d4 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -678,20 +678,6 @@ int daemonMainLoopStatic(int argc, const char **argv) int ServerApp::standardStartup(int argc, char **argv) { initApp(argc, argv); - - // daemonize if requested - if (args().m_daemon) { - return ARCH->daemonize(daemonName(), daemonMainLoopStatic); - } else { - return mainLoop(); - } -} - -int ServerApp::foregroundStartup(int argc, char **argv) -{ - initApp(argc, argv); - - // never daemonize return mainLoop(); } diff --git a/src/lib/deskflow/ServerApp.h b/src/lib/deskflow/ServerApp.h index d6799b2f6..0823b8a69 100644 --- a/src/lib/deskflow/ServerApp.h +++ b/src/lib/deskflow/ServerApp.h @@ -65,7 +65,6 @@ public: int mainLoop() override; int runInner(int argc, char **argv, StartupFunc startup) override; int standardStartup(int argc, char **argv) override; - int foregroundStartup(int argc, char **argv) override; void startNode() override; // diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp index d9d2e484c..7d95084aa 100644 --- a/src/lib/deskflow/win32/AppUtilWindows.cpp +++ b/src/lib/deskflow/win32/AppUtilWindows.cpp @@ -100,7 +100,7 @@ static int daemonNTStartupStatic(int argc, char **argv) static int foregroundStartupStatic(int argc, char **argv) { - return AppUtil::instance().app().foregroundStartup(argc, argv); + return AppUtil::instance().app().standardStartup(argc, argv); } int AppUtilWindows::run(int argc, char **argv) @@ -120,7 +120,6 @@ int AppUtilWindows::run(int argc, char **argv) startup = &daemonNTStartupStatic; } else { startup = &foregroundStartupStatic; - app().argsBase().m_daemon = false; } return app().runInner(argc, argv, startup); diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index 4255a4646..927afa3e1 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -461,8 +461,7 @@ void CoreProcess::cleanup() bool CoreProcess::addGenericArgs(QStringList &args) const { - args << "-f" - << "--debug" << Settings::logLevelText(); + args << "--debug" << Settings::logLevelText(); args << "--name" << Settings::value(Settings::Core::ScreenName).toString(); diff --git a/src/unittests/deskflow/ArgParserTests.cpp b/src/unittests/deskflow/ArgParserTests.cpp index b296f1bc9..1b6ce3f1b 100644 --- a/src/unittests/deskflow/ArgParserTests.cpp +++ b/src/unittests/deskflow/ArgParserTests.cpp @@ -196,7 +196,6 @@ void ArgParserTests::server_unexpectedParam() void ArgParserTests::serverArgs() { deskflow::ServerArgs args; - args.m_daemon = false; char const *argv[] = {"deskflow", "--help", "--res-w", "888"}; QVERIFY(m_parser.parseServerArgs(args, sizeof(argv) / sizeof(argv[0]), argv)); @@ -206,7 +205,6 @@ void ArgParserTests::serverArgs() void ArgParserTests::clientArgs() { deskflow::ClientArgs args; - args.m_daemon = false; char const *argv[] = {kAppId, "--help", "--res-w", "888", "127.0.0.1"}; QVERIFY(m_parser.parseClientArgs(args, sizeof(argv) / sizeof(argv[0]), argv)); @@ -339,30 +337,6 @@ void ArgParserTests::generic_logFileWithSpace() QCOMPARE(i, 2); } -void ArgParserTests::generic_foreground() -{ - int i = 1; - const int argc = 2; - const char *kNoDeamonCmd[argc] = {"stub", "-f"}; - - m_parser.parseGenericArgs(argc, kNoDeamonCmd, i); - - QVERIFY(!m_parser.argsBase().m_daemon); - QCOMPARE(i, 1); -} - -void ArgParserTests::generic_daemon() -{ - int i = 1; - const int argc = 2; - const char *kDeamonCmd[argc] = {"stub", "--daemon"}; - - m_parser.parseGenericArgs(argc, kDeamonCmd, i); - - QVERIFY(m_parser.argsBase().m_daemon); - QCOMPARE(i, 1); -} - void ArgParserTests::generic_name() { int i = 1; diff --git a/src/unittests/deskflow/ArgParserTests.h b/src/unittests/deskflow/ArgParserTests.h index d4d122633..9af31c623 100644 --- a/src/unittests/deskflow/ArgParserTests.h +++ b/src/unittests/deskflow/ArgParserTests.h @@ -37,8 +37,6 @@ private Q_SLOTS: void generic_logLevel(); void generic_logFile(); void generic_logFileWithSpace(); - void generic_foreground(); - void generic_daemon(); void generic_name(); void generic_noRestart(); void generic_restart();