From c2a658256ec0073d61e6f4bd078cb3faf31cda7a Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 11 Jun 2025 23:47:06 -0400 Subject: [PATCH] feat: remove defunct --no-xinitThreads option based on https://github.com/input-leap/input-leap/pull/1503 --- src/lib/deskflow/ArgParser.cpp | 4 ---- src/lib/deskflow/ArgsBase.h | 4 ---- src/lib/deskflow/ClientApp.cpp | 8 +------- src/lib/deskflow/ServerApp.cpp | 7 ++----- src/lib/platform/XWindowsScreen.cpp | 10 +++------- src/lib/platform/XWindowsScreen.h | 2 +- src/unittests/deskflow/ArgParserTests.cpp | 23 ++--------------------- 7 files changed, 9 insertions(+), 49 deletions(-) diff --git a/src/lib/deskflow/ArgParser.cpp b/src/lib/deskflow/ArgParser.cpp index 8235414f9..18e01a5e1 100644 --- a/src/lib/deskflow/ArgParser.cpp +++ b/src/lib/deskflow/ArgParser.cpp @@ -130,10 +130,6 @@ bool ArgParser::parsePlatformArgs( argsBase.m_display = argv[++i]; } - else if (isArg(i, argc, argv, nullptr, "--no-xinitthreads")) { - argsBase.m_disableXInitThreads = true; - } - else { // option not supported here return false; diff --git a/src/lib/deskflow/ArgsBase.h b/src/lib/deskflow/ArgsBase.h index 9c2b70600..90358cd69 100644 --- a/src/lib/deskflow/ArgsBase.h +++ b/src/lib/deskflow/ArgsBase.h @@ -77,10 +77,6 @@ public: /// @brief Stop this computer from sleeping bool m_preventSleep = false; -#if WINAPI_XWINDOWS - bool m_disableXInitThreads = false; -#endif - protected: /// @brief deletes pointers and sets the value to null template static inline void destroy(T *&p) diff --git a/src/lib/deskflow/ClientApp.cpp b/src/lib/deskflow/ClientApp.cpp index 20f4d84ee..bc86c62f9 100644 --- a/src/lib/deskflow/ClientApp.cpp +++ b/src/lib/deskflow/ClientApp.cpp @@ -105,7 +105,6 @@ void ClientApp::help() << " [--invert-scroll]" #ifdef WINAPI_XWINDOWS << " [--display ]" - << " [--no-xinitthreads]" #endif << HELP_SYS_ARGS << HELP_COMMON_ARGS << " " << "\n\n" @@ -123,7 +122,6 @@ void ClientApp::help() #if WINAPI_XWINDOWS << " --display when in X mode, connect to the X server\n" << " at .\n" - << " --no-xinitthreads do not call XInitThreads()\n" #endif << HELP_COMMON_INFO_2 << "\n" << "* marks defaults.\n" @@ -180,11 +178,7 @@ deskflow::Screen *ClientApp::createScreen() #if WINAPI_XWINDOWS LOG((CLOG_INFO "using legacy x windows screen")); return new deskflow::Screen( - new XWindowsScreen( - args().m_display, false, args().m_disableXInitThreads, args().m_yscroll, m_events, - args().m_clientScrollDirection - ), - m_events + new XWindowsScreen(args().m_display, false, args().m_yscroll, m_events, args().m_clientScrollDirection), m_events ); #endif diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp index cd3880ab8..6a8d06a24 100644 --- a/src/lib/deskflow/ServerApp.cpp +++ b/src/lib/deskflow/ServerApp.cpp @@ -107,7 +107,7 @@ void ServerApp::help() << " [--address
]" #if WINAPI_XWINDOWS - << " [--display ] [--no-xinitthreads]" + << " [--display ]" #endif << HELP_SYS_ARGS HELP_COMMON_ARGS "\n" @@ -127,7 +127,6 @@ void ServerApp::help() #if WINAPI_XWINDOWS << " --display when in X mode, connect to the X server\n" << " at .\n" - << " --no-xinitthreads do not call XInitThreads()\n" #endif << "* marks defaults.\n" @@ -517,9 +516,7 @@ deskflow::Screen *ServerApp::createScreen() #if WINAPI_XWINDOWS LOG((CLOG_INFO "using legacy x windows screen")); - return new deskflow::Screen( - new XWindowsScreen(args().m_display, true, args().m_disableXInitThreads, 0, m_events), m_events - ); + return new deskflow::Screen(new XWindowsScreen(args().m_display, true, 0, m_events), m_events); #elif WINAPI_CARBON return new deskflow::Screen(new OSXScreen(m_events, true), m_events); #endif diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp index 4a2711731..847281429 100644 --- a/src/lib/platform/XWindowsScreen.cpp +++ b/src/lib/platform/XWindowsScreen.cpp @@ -86,7 +86,7 @@ static int xi_opcode; XWindowsScreen *XWindowsScreen::s_screen = nullptr; XWindowsScreen::XWindowsScreen( - const char *displayName, bool isPrimary, bool disableXInitThreads, int mouseScrollDelta, IEventQueue *events, + const char *displayName, bool isPrimary, int mouseScrollDelta, IEventQueue *events, deskflow::ClientScrollDirection scrollDirection ) : PlatformScreen(events, scrollDirection), @@ -101,12 +101,8 @@ XWindowsScreen::XWindowsScreen( m_mouseScrollDelta = 120; s_screen = this; - if (!disableXInitThreads) { - // initializes Xlib support for concurrent threads. - if (XInitThreads() == 0) - throw std::runtime_error("XInitThreads() returned zero"); - } else { - LOG((CLOG_DEBUG "skipping XInitThreads()")); + if (XInitThreads() == 0) { + throw std::runtime_error("XInitThreads() returned zero"); } // set the X I/O error handler so we catch the display disconnecting diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h index 1133a448b..ff32f84b9 100644 --- a/src/lib/platform/XWindowsScreen.h +++ b/src/lib/platform/XWindowsScreen.h @@ -31,7 +31,7 @@ class XWindowsScreen : public PlatformScreen { public: XWindowsScreen( - const char *displayName, bool isPrimary, bool disableXInitThreads, int mouseScrollDelta, IEventQueue *events, + const char *displayName, bool isPrimary, int mouseScrollDelta, IEventQueue *events, deskflow::ClientScrollDirection m_clientScrollDirection = deskflow::ClientScrollDirection::SERVER ); ~XWindowsScreen() override; diff --git a/src/unittests/deskflow/ArgParserTests.cpp b/src/unittests/deskflow/ArgParserTests.cpp index 96e150da3..509e3262f 100644 --- a/src/unittests/deskflow/ArgParserTests.cpp +++ b/src/unittests/deskflow/ArgParserTests.cpp @@ -197,15 +197,7 @@ void ArgParserTests::serverArgs() { deskflow::ServerArgs args; args.m_daemon = false; - char const *argv[] = { - "deskflow", "--help" -#if WINAPI_XWINDOWS - , - "--no-xinitthreads" -#endif - , - "--res-w", "888" - }; + char const *argv[] = {"deskflow", "--help", "--res-w", "888"}; QVERIFY(m_parser.parseServerArgs(args, sizeof(argv) / sizeof(argv[0]), argv)); QVERIFY(args.m_shouldExitOk); @@ -215,18 +207,7 @@ void ArgParserTests::clientArgs() { deskflow::ClientArgs args; args.m_daemon = false; - char const *argv[] = { - kAppId, - "--help" -#if WINAPI_XWINDOWS - , - "--no-xinitthreads" -#endif - , - "--res-w", - "888", - "127.0.0.1" - }; + char const *argv[] = {kAppId, "--help", "--res-w", "888", "127.0.0.1"}; QVERIFY(m_parser.parseClientArgs(args, sizeof(argv) / sizeof(argv[0]), argv)); QVERIFY(args.m_shouldExitOk);