fix: Avoid showing XEMBED and SNI plugins together

The trayplugin-loader will only show SNI plugin when both plugins are
both available.

Bug: https://pms.uniontech.com/bug-view-270397.html
Log: Avoid showing XEMBED and SNI plugins together

Author: ArchieMeng

plugins/application-tray/abstracttrayprotocol.h

@@ -11,6 +11,13 @@
 
 class TrayWidget;
 namespace tray {
+
+enum Protocol {
+    UNKNOWN = 0,
+    XEMBED,
+    SNI
+};
+
 class AbstractTrayProtocolHandler;
 class AbstractTrayProtocol : public QObject
 {
@@ -21,6 +28,9 @@ class AbstractTrayProtocol : public QObject
 
 Q_SIGNALS:
     void trayCreated(QPointer<AbstractTrayProtocolHandler> handler);
+
+protected:
+    inline static QHash<uint, enum Protocol> registeredMap;
 };
 
 class AbstractTrayProtocolHandler : public QObject

plugins/application-tray/sniprotocolhandler.cpp

@@ -78,6 +78,11 @@ void SniTrayProtocol::registedItemChanged()
     for (auto currentRegistedItem : currentRegistedItems) {
         if (!m_registedItem.contains(currentRegistedItem)) {
             auto trayHandler = QSharedPointer<SniTrayProtocolHandler>(new SniTrayProtocolHandler(currentRegistedItem));
+            uint pid = QDBusConnection::sessionBus().interface()->servicePid(SniTrayProtocolHandler::serviceAndPath(currentRegistedItem).first).value();
+            m_item2Pid[currentRegistedItem] = pid;
+            if (registeredMap[pid] != SNI)
+                emit removeXEmbedItemByPid(pid);
+            registeredMap[pid] = SNI;
             m_registedItem.insert(currentRegistedItem, trayHandler);
             Q_EMIT AbstractTrayProtocol::trayCreated(trayHandler.get());
         }
@@ -86,6 +91,9 @@ void SniTrayProtocol::registedItemChanged()
     for (auto alreadyRegistedItem : m_registedItem.keys()) {
         if (!currentRegistedItems.contains(alreadyRegistedItem)) {
             if (auto value = m_registedItem.value(alreadyRegistedItem, nullptr)) {
+                uint pid = m_item2Pid[alreadyRegistedItem];
+                m_item2Pid.remove(alreadyRegistedItem);
+                registeredMap.remove(pid);
                 m_registedItem.remove(alreadyRegistedItem);
             }
         }

plugins/application-tray/sniprotocolhandler.h

@@ -27,13 +27,17 @@ class SniTrayProtocol : public AbstractTrayProtocol
     explicit SniTrayProtocol(QObject *parent = nullptr);
     ~SniTrayProtocol();
 
+Q_SIGNALS:
+    void removeXEmbedItemByPid(uint pid);
+
 private Q_SLOTS:
     void registedItemChanged();
 
 private:
     OrgKdeStatusNotifierWatcherInterface* m_trayManager;
 
     QHash<QString, QSharedPointer<SniTrayProtocolHandler>> m_registedItem;
+    QHash<QString, uint> m_item2Pid;
 };
 
 class SniTrayProtocolHandler : public AbstractTrayProtocolHandler

plugins/application-tray/trayplugin.cpp

@@ -59,6 +59,7 @@ void TrayPlugin::init(PluginProxyInterface *proxyInter)
 
     connect(sniProtocol, &SniTrayProtocol::trayCreated, this, &TrayPlugin::onTrayhandlerCreatd);
     connect(indicatorProtocol, &SniTrayProtocol::trayCreated, this, &TrayPlugin::onTrayhandlerCreatd);
+    connect(sniProtocol, &SniTrayProtocol::removeXEmbedItemByPid, xembedProtocol, &XembedProtocol::onRemoveItemByPid);
     if (UTIL->isXAvaliable()) {
         connect(xembedProtocol, &SniTrayProtocol::trayCreated, this, &TrayPlugin::onTrayhandlerCreatd);
     } else {

plugins/application-tray/xembedprotocolhandler.cpp

@@ -88,6 +88,11 @@ void XembedProtocol::onTrayIconsChanged()
         for (auto currentRegistedItem : currentRegistedItems) {
             if (!m_registedItem.contains(currentRegistedItem)) {
                 auto trayHandler = QSharedPointer<XembedProtocolHandler>(new XembedProtocolHandler(currentRegistedItem));
+                uint pid = UTIL->getWindowPid(trayHandler->windowId());
+                if (registeredMap[pid] == SNI)
+                    continue;
+                registeredMap[pid] = XEMBED;
+                m_item2Pid[currentRegistedItem] = pid;
                 connect(m_trayManager, &TrayManager::Changed, trayHandler.get(), &XembedProtocolHandler::xembedTrayIconChanged);
                 m_registedItem.insert(currentRegistedItem, trayHandler);
                 Q_EMIT AbstractTrayProtocol::trayCreated(trayHandler.get());
@@ -97,6 +102,9 @@ void XembedProtocol::onTrayIconsChanged()
         for (auto alreadyRegistedItem : m_registedItem.keys()) {
             if (!currentRegistedItems.contains(alreadyRegistedItem)) {
                 if (auto value = m_registedItem.value(alreadyRegistedItem, nullptr)) {
+                    uint pid = m_item2Pid[alreadyRegistedItem];
+                    registeredMap.remove(pid);
+                    m_item2Pid.remove(alreadyRegistedItem);
                     m_registedItem.remove(alreadyRegistedItem);
                 }
             }
@@ -105,6 +113,15 @@ void XembedProtocol::onTrayIconsChanged()
 
 }
 
+void XembedProtocol::onRemoveItemByPid(uint pid)
+{
+    auto it = std::find_if(m_registedItem.keys().begin(), m_registedItem.keys().end(), [this, pid] (uint id) { return pid == m_item2Pid[id]; });
+    if (it != m_registedItem.keys().end()) {
+        m_item2Pid.remove(*it);
+        m_registedItem.remove(*it);
+    }
+}
+
 XembedProtocolHandler::XembedProtocolHandler(const uint32_t& id, QObject* parent)
     : AbstractTrayProtocolHandler(parent)
     , m_enabled(false)

plugins/application-tray/xembedprotocolhandler.h

@@ -26,6 +26,9 @@ class XembedProtocol : public AbstractTrayProtocol, public QAbstractNativeEventF
     XembedProtocol(QObject *parent = nullptr);
     ~XembedProtocol();
 
+public Q_SLOTS:
+    void onRemoveItemByPid(uint pid);
+
 protected:
     bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
 
@@ -36,6 +39,7 @@ private Q_SLOTS:
     TrayManager* m_trayManager;
     FdoSelectionManager *m_selectionManager = nullptr;
     QHash<uint32_t, QSharedPointer<AbstractTrayProtocolHandler>> m_registedItem;
+    QHash<uint, uint> m_item2Pid;
 };
 
 class XembedProtocolHandler : public AbstractTrayProtocolHandler