chore: switch to use nativeEventFilter

此提交也是对后续 Tray SelectionOwner 支持相关提交的预先准备。

Log:

Author: BLumia

plugins/application-tray/util.cpp

@@ -2,26 +2,31 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include <QDebug>
+#include <QLoggingCategory>
 
 #include "util.h"
-#include "xcbthread.h"
 
 #include <QSize>
 #include <QPixmap>
 #include <QBitmap>
 #include <QFileInfo>
 #include <QtGlobal>
+#include <QSocketNotifier>
+#include <QCoreApplication>
+#include <QAbstractEventDispatcher>
 
 #include <X11/Xlib.h>
 
 #include <mutex>
 #include <xcb/res.h>
 #include <xcb/xcb.h>
+#include <xcb/xcb_atom.h>
 #include <xcb/xtest.h>
 #include <xcb/xproto.h>
 #include <xcb/composite.h>
 
+Q_LOGGING_CATEGORY(TRAYUTIL, "org.deepin.dde.trayloader.util")
+
 namespace tray {
 void clean_xcb_image(void *data)
 {
@@ -36,7 +41,29 @@ Util* Util::instance()
     return _instance;
 }
 
+void Util::dispatchEvents(DispatchEventsMode mode)
+{
+    xcb_connection_t *connection = m_x11connection;
+    if (!connection) {
+        qCWarning(TRAYUTIL, "Attempting to dispatch X11 events with no connection");
+        return;
+    }
+
+    auto pollEventFunc = mode == DispatchEventsMode::Poll ? xcb_poll_for_event : xcb_poll_for_queued_event;
+
+    while (xcb_generic_event_t *event = pollEventFunc(connection)) {
+        qintptr result = 0;
+
+        QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher();
+        dispatcher->filterNativeEvent(QByteArrayLiteral("xcb_generic_event_t"), event, &result);
+        free(event);
+    }
+
+    xcb_flush(connection);
+}
+
 Util::Util()
+    : QObject()
 {
     m_x11connection = xcb_connect(nullptr, nullptr);
     m_display = XOpenDisplay("");
@@ -50,8 +77,20 @@ Util::Util()
     m_rootWindow = screen->root;
 
     xcb_ewmh_init_atoms_replies(&m_ewmh, xcb_ewmh_init_atoms(m_x11connection, &m_ewmh), nullptr);
-    m_xcbThread = new XcbThread(m_x11connection);
-    m_xcbThread->start();
+
+    const int fd = xcb_get_file_descriptor(m_x11connection);
+    QSocketNotifier * qfd = new QSocketNotifier(fd, QSocketNotifier::Read, this);
+    connect(qfd, &QSocketNotifier::activated, this, [this](){
+        dispatchEvents(DispatchEventsMode::Poll);
+    });
+
+    QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher();
+    connect(dispatcher, &QAbstractEventDispatcher::aboutToBlock, this, [this]() {
+        dispatchEvents(DispatchEventsMode::EventQueue);
+    });
+    connect(dispatcher, &QAbstractEventDispatcher::awake, this, [this]() {
+        dispatchEvents(DispatchEventsMode::EventQueue);
+    });
 }
 
 Util::~Util()
@@ -143,6 +182,11 @@ QString Util::getNameByAtom(const xcb_atom_t& atom)
     return name;
 }
 
+xcb_atom_t Util::getAtomFromDisplay(const char * name)
+{
+    return getAtomByName(xcb_atom_name_by_screen(name, DefaultScreen(getDisplay())));
+}
+
 void Util::moveX11Window(const xcb_window_t& window, const uint32_t& x, const uint32_t& y)
 {
     const uint32_t windowMoveConfigVals[2] = {x, y};

plugins/application-tray/util.h

@@ -8,6 +8,7 @@
 #include <QImage>
 #include <QSharedPointer>
 #include <QSet>
+#include <QObject>
 
 #include <cstdint>
 #include <sys/types.h>
@@ -20,8 +21,7 @@ struct _XDisplay;
 
 namespace tray {
 #define UTIL Util::instance()
-class XcbThread;
-class Util
+class Util : public QObject
 {
 
 public:
@@ -34,6 +34,7 @@ class Util
 
     xcb_atom_t getAtomByName(const QString& name);
     QString getNameByAtom(const xcb_atom_t& atom);
+    xcb_atom_t getAtomFromDisplay(const char * name);
 
     void moveX11Window(const xcb_window_t& window, const uint32_t& x, const uint32_t& y);
     void setX11WindowSize(const xcb_window_t& window, const QSize& size);
@@ -58,6 +59,12 @@ class Util
     Util(const Util&) = delete;
     Util& operator=(const Util&) = delete;
 
+    enum class DispatchEventsMode {
+        Poll,
+        EventQueue
+    };
+    void dispatchEvents(DispatchEventsMode mode);
+
     bool isTransparentImage(const QImage &image);
 
     QImage convertFromNative(xcb_image_t* image);
@@ -71,8 +78,6 @@ class Util
     _XDisplay *m_display;
 
     QSet<QString> m_currentIds;
-
-    XcbThread *m_xcbThread;
 };
 
 }

plugins/application-tray/xcbthread.cpp

@@ -16,6 +16,7 @@
 
 #include <xcb/xcb.h>
 #include <xcb/xtest.h>
+#include <xcb/xcb_event.h>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XTest.h>
@@ -31,6 +32,8 @@ XembedProtocol::XembedProtocol(QObject *parent)
     : AbstractTrayProtocol(parent)
     , m_trayManager(new TrayManager("org.deepin.dde.TrayManager1", "/org/deepin/dde/TrayManager1", QDBusConnection::sessionBus(), this))
 {
+    qApp->installNativeEventFilter(this);
+
     m_trayManager->Manage();
     connect(m_trayManager, &TrayManager::Added, this, &XembedProtocol::onTrayIconsChanged);
     connect(m_trayManager, &TrayManager::Removed, this, &XembedProtocol::onTrayIconsChanged);
@@ -43,6 +46,26 @@ XembedProtocol::~XembedProtocol()
     m_registedItem.clear();
 }
 
+bool XembedProtocol::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
+{
+    Q_UNUSED(result)
+
+    if (eventType != "xcb_generic_event_t") {
+        return false;
+    }
+
+    auto *ev = static_cast<xcb_generic_event_t *>(message);
+
+    const auto responseType = XCB_EVENT_RESPONSE_TYPE(ev);
+    if (responseType == XCB_LEAVE_NOTIFY) {
+        xcb_leave_notify_event_t *lE = (xcb_leave_notify_event_t *)ev;
+        UTIL->setX11WindowInputShape(lE->event, QSize(0, 0));
+        return true;
+    }
+
+    return false;
+}
+
 void XembedProtocol::onTrayIconsChanged()
 {
     QTimer::singleShot(200, this,[this](){

plugins/application-tray/xcbthread.h

@@ -17,14 +17,17 @@
 #include <xcb/xcb_image.h>
 
 namespace tray {
-class XembedProtocol : public AbstractTrayProtocol
+class XembedProtocol : public AbstractTrayProtocol, public QAbstractNativeEventFilter
 {
     Q_OBJECT
 
 public:
     XembedProtocol(QObject *parent = nullptr);
     ~XembedProtocol();
 
+protected:
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+
 private Q_SLOTS:
     void onTrayIconsChanged();