move the InputActions implementation from the daemon to the client

.clang-format

@@ -0,0 +1,46 @@
+Language: Cpp
+Standard: c++20
+
+ColumnLimit: 160
+IndentWidth: 4
+
+AllowShortBlocksOnASingleLine: Never
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: Empty
+
+AlignAfterOpenBracket: Align
+AllowAllArgumentsOnNextLine: true
+AlignEscapedNewlines: LeftWithLastLine
+AlignOperands: AlignAfterOperator
+AlignTrailingComments: false
+
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterClass: true
+  AfterEnum: true
+  AfterExternBlock: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeComma
+BreakTemplateDeclarations: Yes
+
+AccessModifierOffset: -4
+IndentAccessModifiers: false
+
+IncludeBlocks: Merge
+FixNamespaceComments: false
+
+AllowAllConstructorInitializersOnNextLine: true
+BinPackArguments: false
+IndentCaseLabels: true
+SpaceAfterTemplateKeyword: false
+
+PenaltyBreakAssignment: 10000
+PenaltyBreakBeforeFirstCallParameter: 0
+PenaltyBreakOpenParenthesis: 10000
+PenaltyBreakScopeResolution: 10000

CMakeLists.txt

@@ -37,6 +37,6 @@ if(NOT INPUTACTIONS_OVERRIDE_CORE)
     add_subdirectory(lib/core)
 endif()
 add_subdirectory(lib/libinput-cpp)
-add_subdirectory(src/ipc)
+add_subdirectory(src/common)
 add_subdirectory(src/client)
 add_subdirectory(src/daemon)

src/client/CMakeLists.txt

@@ -4,21 +4,26 @@ pkg_search_module(WAYLAND_CLIENT REQUIRED wayland-client)
 
 add_executable(inputactions-client
     gnome/GNOMEClient.cpp
+    input/EvdevVirtualKeyboard.cpp
+    input/EvdevVirtualMouse.cpp
+    input/StandaloneInputBackend.cpp
+    input/StandaloneInputDevice.cpp
+    interfaces/DBusEnvironmentStateProvider.cpp
     plasma/PlasmaClient.cpp
     wayland/WaylandClient.cpp
     wayland/WaylandProtocol.cpp
     wayland/WaylandProtocolManager.cpp
     wayland/WlrForeignToplevelManagementV1.cpp
     Client.cpp
-    ClientDBusInterface.cpp
-    ClientMessageHandler.cpp
+    ClientHandler.cpp
     main.cpp
 )
 
 target_compile_options(inputactions-client PUBLIC -fexceptions)
 target_link_libraries(inputactions-client PRIVATE
+    libinput-cpp
     libinputactions
-    libinputactions-standalone-ipc
+    libinputactions-standalone-common
     ${WAYLAND_CLIENT_LIBRARIES}
 )
 target_include_directories(inputactions-client PRIVATE

src/client/Client.cpp

@@ -17,25 +17,11 @@
 */
 
 #include "Client.h"
-#include "ClientDBusInterface.h"
-#include <QCoreApplication>
-#include <libinputactions/globals.h>
-#include <libinputactions/helpers/QThread.h>
-#include <libinputactions/helpers/Session.h>
-#include <libinputactions-standalone-ipc/MessageSocketConnection.h>
-#include <libinputactions-standalone-ipc/messages.h>
+#include <libinputactions-standalone-common/ipc/MessageSocketConnection.h>
 
 namespace InputActions
 {
 
-Client::Client()
-    : m_dbusInterface(this)
-    , m_currentTty(SessionHelpers::currentTty())
-{
-}
-
-Client::~Client() = default;
-
 void Client::start()
 {
     m_connectionRetryTimer = new QTimer(this);
@@ -45,53 +31,23 @@ void Client::start()
     auto socket = new QLocalSocket(this);
     m_connection = new MessageSocketConnection(socket, this);
 
-    connect(&configProvider, &ConfigProvider::configChanged, this, &Client::onConfigChanged);
     connect(socket, &QLocalSocket::connected, this, &Client::onConnected);
     connect(socket, &QLocalSocket::errorOccurred, this, &Client::onErrorOccurred);
+    connect(socket, &QLocalSocket::disconnected, this, &Client::onDisconnected);
     connect(m_connection, &MessageSocketConnection::messageReceived, this, &Client::messageReceived);
     socket->connectToServer(INPUTACTIONS_IPC_SOCKET_PATH);
 }
 
-MessageSocketConnection *Client::socketConnection() const
-{
-    return m_connection;
-}
-
 void Client::onConnected()
 {
     m_connectionRetryTimer->stop();
-    Q_EMIT connected();
-    QThreadHelpers::runOnThread(QThreadHelpers::mainThread(), [this]() {
-        HandshakeRequestMessage handshakeRequest;
-        if (const auto response = m_connection->sendMessageAndWaitForResponse(handshakeRequest); !response->success()) {
-            qCritical().noquote().nospace() << "Handshake failed: " << response->error();
-            QCoreApplication::exit(-1);
-            return;
-        }
-
-        BeginSessionRequestMessage beginSessionRequest;
-        beginSessionRequest.setTty(m_currentTty);
-        if (const auto response = m_connection->sendMessageAndWaitForResponse(beginSessionRequest)) {
-            if (!response->success()) {
-                qCritical().noquote().nospace() << "Daemon rejected request to begin session: " << response->error();
-                QCoreApplication::exit(-1);
-                return;
-            }
-        } else {
-            qCritical() << "Daemon did not reply to session begin request";
-            QCoreApplication::exit(-1);
-            return;
-        }
-
-        LoadConfigRequestMessage configRequest;
-        configRequest.setConfig(configProvider.currentConfig());
-        m_connection->sendMessageAndWaitForResponse(configRequest);
-    });
+    Q_EMIT connected(m_connection);
 }
 
 void Client::onDisconnected()
 {
     m_connectionRetryTimer->start();
+    Q_EMIT disconnected();
 }
 
 void Client::onErrorOccurred(QLocalSocket::LocalSocketError error)
@@ -100,13 +56,6 @@ void Client::onErrorOccurred(QLocalSocket::LocalSocketError error)
     m_connectionRetryTimer->start();
 }
 
-void Client::onConfigChanged(const QString &config)
-{
-    LoadConfigRequestMessage request;
-    request.setConfig(config);
-    m_connection->sendMessage(request);
-}
-
 void Client::connectToDaemon()
 {
     m_connection->socket()->connectToServer(INPUTACTIONS_IPC_SOCKET_PATH);

src/client/Client.h

@@ -18,15 +18,12 @@
 
 #pragma once
 
-#include "ClientDBusInterface.h"
 #include <QLocalSocket>
 #include <QObject>
-#include <libinputactions/interfaces/implementations/FileConfigProvider.h>
 
 namespace InputActions
 {
 
-class ClientDBusInterface;
 class Message;
 class MessageSocketConnection;
 
@@ -35,33 +32,23 @@ class Client : public QObject
     Q_OBJECT
 
 public:
-    Client();
-    ~Client() override;
-
     Q_INVOKABLE void start();
-    MessageSocketConnection *socketConnection() const;
-
-    FileConfigProvider configProvider;
 
 signals:
-    void connected();
-    void messageReceived(std::shared_ptr<Message> message);
+    void connected(MessageSocketConnection *connection);
+    void disconnected();
+    void messageReceived(std::shared_ptr<const Message> message);
 
 private slots:
     void onConnected();
     void onDisconnected();
     void onErrorOccurred(QLocalSocket::LocalSocketError error);
-    void onConfigChanged(const QString &config);
 
 private:
     void connectToDaemon();
 
     MessageSocketConnection *m_connection;
     QTimer *m_connectionRetryTimer{};
-
-    ClientDBusInterface m_dbusInterface;
-
-    QString m_currentTty;
 };
 
 }