fix: fix dde-session not started after ddm restart or crash recover

src/core/treeland.cpp

@@ -31,12 +31,13 @@
 #endif
 
 #include <wsocket.h>
 #include <wxwayland.h>
 
 #include <QCoreApplication>
+#include <QDBusAbstractAdaptor>
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 #include <QDBusMessage>
 #include <QDebug>
 #include <QLocalSocket>
 #include <QLoggingCategory>
@@ -265,6 +266,50 @@
     std::map<PluginInterface *, QTranslator *> pluginTs;
 };
 
+
+class Compositor1Adaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.deepin.Compositor1")
+    Q_CLASSINFO("D-Bus Introspection",
+                "  <interface name=\"org.deepin.Compositor1\">\n"
+                "    <method name=\"ActivateWayland\">\n"
+                "      <arg direction=\"in\" type=\"h\" name=\"fd\"/>\n"
+                "      <arg direction=\"out\" type=\"b\" name=\"result\"/>\n"
+                "    </method>\n"
+                "    <method name=\"XWaylandName\">\n"
+                "      <arg direction=\"out\" type=\"s\" name=\"result\"/>\n"
+                "      <arg direction=\"out\" type=\"ay\" name=\"auth\"/>\n"
+                "    </method>\n"
+                "    <signal name=\"SessionChanged\"/>\n"
+                "  </interface>\n"
+                "")
+public:
+    Compositor1Adaptor(Treeland *parent)
+    : QDBusAbstractAdaptor(parent)
+    {
+        setAutoRelaySignals(true);
+    }
+
+    inline Treeland *parent() const
+    { return static_cast<Treeland *>(QObject::parent()); }
+
+public Q_SLOTS: // METHODS
+
+    bool ActivateWayland(const QDBusUnixFileDescriptor &fd)
+    {
+        return parent()->ActivateWayland(fd);
+    }
+
+    void XWaylandName()
+    {
+        parent()->XWaylandName();
+    }
+
+Q_SIGNALS: // SIGNALS
+    void SessionChanged();
+};
+
 Treeland::Treeland()
     : QObject()
     , d_ptr(std::make_unique<TreelandPrivate>(this))
@@ -310,16 +355,14 @@
         }
     }
 
+    new Compositor1Adaptor(this);
+
     // init dbus after QML engine loaded.
     QDBusConnection::systemBus().registerService("org.deepin.Compositor1");
-    QDBusConnection::systemBus().registerObject("/org/deepin/Compositor1",
-                                                this,
-                                                QDBusConnection::ExportAllSlots);
+    QDBusConnection::systemBus().registerObject("/org/deepin/Compositor1", this);
 
     QDBusConnection::sessionBus().registerService("org.deepin.Compositor1");
-    QDBusConnection::sessionBus().registerObject("/org/deepin/Compositor1",
-                                                 this,
-                                                 QDBusConnection::ExportAllSlots);
+    QDBusConnection::sessionBus().registerObject("/org/deepin/Compositor1", this);
 
 #ifdef QT_DEBUG
     QDir dir(QStringLiteral(TREELAND_PLUGINS_OUTPUT_PATH));

src/core/treeland.h

@@ -30,20 +30,6 @@ class Treeland
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(Treeland)
-    Q_CLASSINFO("D-Bus Interface", "org.deepin.Compositor1")
-    Q_CLASSINFO("D-Bus Introspection",
-                "  <interface name=\"org.deepin.Compositor1\">\n"
-                "    <method name=\"ActivateWayland\">\n"
-                "      <arg direction=\"in\" type=\"h\" name=\"fd\"/>\n"
-                "      <arg direction=\"out\" type=\"b\" name=\"result\"/>\n"
-                "    </method>\n"
-                "    <method name=\"XWaylandName\">\n"
-                "      <arg direction=\"out\" type=\"s\" name=\"result\"/>\n"
-                "      <arg direction=\"out\" type=\"ay\" name=\"auth\"/>\n"
-                "    </method>\n"
-                "    <signal name=\"SessionChanged\"/>\n"
-                "  </interface>\n"
-                "")
 
 public:
     explicit Treeland();

src/greeter/greeterproxy.cpp

@@ -434,13 +434,15 @@ void GreeterProxy::readyRead()
         } break;
         case DaemonMessages::UserLoggedIn: {
             QString user;
-            input >> user;
+            int sessionId;
+            input >> user >> sessionId;
 
             // This will happen after a crash recovery of treeland
             qCInfo(treelandGreeter) << "User " << user << " is already logged in";
             auto userPtr = d->userModel->getUser(user);
             if (userPtr) {
                 userPtr.get()->setLogined(true);
+                Q_EMIT d->userModel->userLoggedIn(user, sessionId);
             } else {
                 qCWarning(treelandGreeter) << "User " << user << " logged in but not found";
             }

src/systemd-socket.cpp

@@ -144,24 +144,12 @@ int main(int argc, char *argv[])
             }
         };
 
-        QDBusServiceWatcher *compositorWatcher =
-            new QDBusServiceWatcher("org.deepin.Compositor1",
-                                    connection,
-                                    QDBusServiceWatcher::WatchForRegistration);
-
-        QObject::connect(compositorWatcher,
-                         &QDBusServiceWatcher::serviceRegistered,
-                         compositorWatcher,
-                         activateFd);
-
-        // Listen to SessionChanged signal and activate fd when session changed
         connection.connect("org.deepin.Compositor1",
                            "/org/deepin/Compositor1",
                            "org.deepin.Compositor1",
                            "SessionChanged",
                            new SignalReceiver(activateFd),
                            SLOT(onSessionChanged()));
-
         activateFd();
     };