fix(xwayland): refresh user Xauthority after Xwayland restart

misc/dbus/org.deepin.compositor1.xml

@@ -11,5 +11,7 @@
     </method>
     <signal name="SessionChanged">
     </signal>
+    <signal name="XWaylandAuthChanged">
+    </signal>
   </interface>
 </node>

src/core/treeland.cpp

@@ -370,6 +370,7 @@ class Compositor1Adaptor: public QDBusAbstractAdaptor
                 "      <arg direction=\"out\" type=\"ay\" name=\"auth\"/>\n"
                 "    </method>\n"
                 "    <signal name=\"SessionChanged\"/>\n"
+                "    <signal name=\"XWaylandAuthChanged\"/>\n"
                 "  </interface>\n"
                 "")
 public:
@@ -396,6 +397,7 @@ public Q_SLOTS: // METHODS
 
 Q_SIGNALS: // SIGNALS
     void SessionChanged();
+    void XWaylandAuthChanged();
 };
 
 Treeland::Treeland()

src/core/treeland.h

@@ -44,8 +44,9 @@
 Q_SIGNALS:
     void socketDisconnected();
     void SessionChanged();
+    void XWaylandAuthChanged();
 
 public Q_SLOTS:
     bool ActivateWayland(QDBusUnixFileDescriptor fd);
     void XWaylandName();
 

src/seat/helper.cpp

@@ -1968,6 +1968,10 @@ void Helper::init(Treeland::Treeland *treeland)
 {
     m_treeland = treeland;
     connect(m_sessionManager, &SessionManager::sessionChanged, treeland, &Treeland::Treeland::SessionChanged);
+    connect(m_sessionManager,
+            &SessionManager::xwaylandAuthChanged,
+            treeland,
+            &Treeland::Treeland::XWaylandAuthChanged);
 
     auto engine = qmlEngine();
     m_greeterProxy = engine->singletonInstance<GreeterProxy *>("Treeland", "GreeterProxy");

src/session/session.cpp

@@ -295,6 +295,7 @@ std::shared_ptr<Session> SessionManager::ensureSession(int id, QString username)
         xwayland->setOwnsSocket(socket);
         // Connect signals
         connect(xwayland, &WXWayland::ready, this, [this, xwayland] {
+            Q_EMIT xwaylandAuthChanged();
             syncActiveSessionXWaylandPrimaryOutput();
             if (auto session = sessionForXWayland(xwayland)) {
                 session->m_noTitlebarAtom =

src/session/session.h

@@ -89,6 +89,7 @@ class SessionManager : public QObject {
 Q_SIGNALS:
     void socketFileChanged();
     void sessionChanged();
+    void xwaylandAuthChanged();
 
 private:
     std::shared_ptr<Session> ensureSession(int id, QString username);

src/systemd-socket.cpp

@@ -57,11 +57,6 @@ class SocketActivator : public QObject
         if (!test.isValid())
             return false;
 
-        if (m_type == "xwayland") {
-            m_compositorBus = busFromConnection(connection);
-            return true;
-        }
-
         return connectActivationSignal(connection);
     }
 
@@ -264,12 +259,19 @@ public Q_SLOTS:
         if (m_compositorBus == bus)
             return true;
 
+        // Xwayland only has to react to auth refreshes. Its display number and
+        // the XAUTHORITY path survive a wlroots in-place Xwayland restart, so
+        // a session change does not affect it and must not re-run activation.
+        const QString signalName = m_type == "xwayland"
+            ? QStringLiteral("XWaylandAuthChanged")
+            : QStringLiteral("SessionChanged");
+
         if (m_compositorBus.has_value()) {
             auto oldConnection = dbusConnection(*m_compositorBus);
             oldConnection.disconnect("org.deepin.Compositor1",
                                      "/org/deepin/Compositor1",
                                      "org.deepin.Compositor1",
-                                     QStringLiteral("SessionChanged"),
+                                     signalName,
                                      this,
                                      SLOT(activate()));
             m_compositorBus.reset();
@@ -278,7 +280,7 @@ public Q_SLOTS:
         if (connection.connect("org.deepin.Compositor1",
                                "/org/deepin/Compositor1",
                                "org.deepin.Compositor1",
-                               QStringLiteral("SessionChanged"),
+                               signalName,
                                this,
                                SLOT(activate()))) {
             m_compositorBus = bus;