refactor(notification): move bubble overlay logic to QML delegate

debian/control

@@ -22,6 +22,7 @@ Build-Depends:
  libxcb-res0-dev,
  libxcb-util-dev,
  libxcb1-dev,
+ libxcb-shape0-dev,
  libxtst-dev,
  libyaml-cpp-dev,
  qml6-module-qtquick-controls2-styles-chameleon,

frame/CMakeLists.txt

@@ -118,7 +118,7 @@ target_link_directories(dde-shell-frame INTERFACE
 
 if (BUILD_WITH_X11)
     target_compile_definitions(dde-shell-frame PRIVATE BUILD_WITH_X11)
-    pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb-ewmh xcb-icccm xtst x11)
+    pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb-ewmh xcb-icccm xtst xcb-shape x11)
     target_sources(dde-shell-frame PRIVATE layershell/x11dlayershellemulation.h layershell/x11dlayershellemulation.cpp)
     target_link_libraries(dde-shell-frame PRIVATE PkgConfig::XCB)
 endif(BUILD_WITH_X11)

frame/layershell/dlayershellwindow.cpp

@@ -43,9 +43,10 @@
     int preferredWidth = -1;
     int preferredHeight = -1;
     bool closeOnDismissed = true;
+    QRegion inputRegion;
 };
 
 void DLayerShellWindow::setAnchors(DLayerShellWindow::Anchors anchors)
 {
     if (anchors != d->anchors) {
         d->anchors = anchors;
@@ -192,6 +193,29 @@
     return d->preferredHeight; 
 }
 
+void DLayerShellWindow::setInputRegion(const QRegion &region)
+{
+    if (d->inputRegion != region) {
+        d->inputRegion = region;
+        Q_EMIT inputRegionChanged();
+    }
+}
+
+void DLayerShellWindow::resetInputRegion()
+{
+    setInputRegion(QRegion());
+}
+
+QRegion DLayerShellWindow::inputRegion() const
+{
+    return d->inputRegion;
+}
+
+void DLayerShellWindow::setInputRegionRect(int x, int y, int width, int height)
+{
+    setInputRegion(QRegion(x, y, width, height));
+}
+
 bool DLayerShellWindow::closeOnDismissed() const
 {
     return d->closeOnDismissed;

frame/layershell/dlayershellwindow.h

@@ -30,6 +30,7 @@
     Q_PROPERTY(ScreenConfiguration screenConfiguration READ screenConfiguration WRITE setScreenConfiguration)
     Q_PROPERTY(int preferredWidth READ preferredWidth WRITE setPreferredWidth RESET resetPreferredWidth NOTIFY geometryHintsChanged)
     Q_PROPERTY(int preferredHeight READ preferredHeight WRITE setPreferredHeight RESET resetPreferredHeight NOTIFY geometryHintsChanged)
+    Q_PROPERTY(QRegion inputRegion READ inputRegion WRITE setInputRegion RESET resetInputRegion NOTIFY inputRegionChanged)
 
     Q_PROPERTY(bool closeOnDismissed READ closeOnDismissed WRITE setCloseOnDismissed)
 
@@ -121,6 +122,12 @@
     void resetPreferredHeight();
     int preferredHeight() const;
 
+    void setInputRegion(const QRegion &region);
+    void resetInputRegion();
+    QRegion inputRegion() const;
+
+    Q_INVOKABLE void setInputRegionRect(int x, int y, int width, int height);
+
     /**
      * Sets a string based identifier for this window.
      * This may be used by a compositor to determine stacking
@@ -156,9 +163,10 @@
     void layerChanged();
     void scopeChanged();
     void geometryHintsChanged();
+    void inputRegionChanged();
 
 private:
     DLayerShellWindow(QWindow* window);
     QScopedPointer<DLayerShellWindowPrivate> d;
 };
 

frame/layershell/qwaylandlayershellsurface.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -75,6 +75,13 @@ QWaylandLayerShellSurface::QWaylandLayerShellSurface(QtWayland::zwlr_layer_shell
         window->waylandSurface()->commit();
     });
 
+    auto applyInputRegion = [this, window]() {
+        window->window()->setMask(m_dlayerShellWindow->inputRegion());
+        window->waylandSurface()->commit();
+    };
+
+    connect(m_dlayerShellWindow, &DLayerShellWindow::inputRegionChanged, this, applyInputRegion);
+
     calcAndSetRequestSize(window->surfaceSize());
 
     if (m_requestSize.isValid()) {

frame/layershell/x11dlayershellemulation.cpp

@@ -14,9 +14,10 @@
 #include <qpa/qplatformwindow.h>
 #include <qpa/qplatformwindow_p.h>
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_ewmh.h>
 #include <xcb/xcb_icccm.h>
+#include <xcb/shape.h>
 
 DS_BEGIN_NAMESPACE
 
@@ -71,6 +72,9 @@
     onScopeChanged();
     connect(m_dlayerShellWindow, &DLayerShellWindow::scopeChanged, this, &LayerShellEmulation::onScopeChanged);
 
+    onInputRegionChanged();
+    connect(m_dlayerShellWindow, &DLayerShellWindow::inputRegionChanged, this, &LayerShellEmulation::onInputRegionChanged);
+
     // connect(m_dlayerShellWindow, &DS_NAMESPACE::DLayerShellWindow::keyboardInteractivityChanged, this, &LayerShellEmulation::onKeyboardInteractivityChanged);
 }
 
@@ -321,6 +325,41 @@
     qCDebug(layershell) << "Set WM_CLASS for window" << m_window->winId() << " wm_class:" << wmClassData;
 }
 
+void LayerShellEmulation::onInputRegionChanged()
+{
+    auto *x11Application = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
+    if (!x11Application || !m_window->winId() || !m_dlayerShellWindow) {
+        return;
+    }
+
+    if (m_dlayerShellWindow->inputRegion().isNull()) {
+        // Reset input region (no shape constraint)
+        xcb_shape_mask(x11Application->connection(), XCB_SHAPE_SO_SET, XCB_SHAPE_SK_INPUT, m_window->winId(), 0, 0, XCB_NONE);
+        xcb_flush(x11Application->connection());
+        return;
+    }
+
+    QRegion region = m_dlayerShellWindow->inputRegion();
+    qreal scaleFactor = qGuiApp->devicePixelRatio();
+
+    QVector<xcb_rectangle_t> rects;
+    for (const QRect &r : region) {
+        xcb_rectangle_t rect;
+        rect.x = r.x() * scaleFactor;
+        rect.y = r.y() * scaleFactor;
+        rect.width = r.width() * scaleFactor;
+        rect.height = r.height() * scaleFactor;
+        rects.append(rect);
+    }
+
+    // Set the input shape via XCB
+    // If rects vector is empty, the window will become completely transparent to input clicks (unclickable)
+    xcb_shape_rectangles(x11Application->connection(), XCB_SHAPE_SO_SET, XCB_SHAPE_SK_INPUT,
+                         XCB_CLIP_ORDERING_UNSORTED, m_window->winId(), 0, 0,
+                         rects.size(), rects.data());
+    xcb_flush(x11Application->connection());
+}
+
 // void X11Emulation::onKeyboardInteractivityChanged()
 // {
 //     // kwin no implentation on wayland

frame/layershell/x11dlayershellemulation.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -28,6 +28,7 @@ private slots:
     void onPositionChanged();
     void onExclusionZoneChanged();
     void onScopeChanged();
+    void onInputRegionChanged();
     // void onKeyboardInteractivityChanged();
 
 private:

panels/notification/bubble/bubbleitem.cpp

@@ -282,19 +282,6 @@ void BubbleItem::updateActions()
     m_actions = array;
 }
 
-int BubbleItem::level() const
-{
-    return m_level;
-}
-
-void BubbleItem::setLevel(int level)
-{
-    if (m_level == level)
-        return;
-
-    m_level = level;
-    emit levelChanged();
-}
 
 QString BubbleItem::timeTip() const
 {

panels/notification/bubble/bubbleitem.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -36,11 +36,9 @@
     qint64 ctime() const;
 
     QString defaultAction() const;
     QVariantList actions() const;
     void updateActions();
 
-    int level() const;
-    void setLevel(int level);
 
     QString timeTip() const;
     void setTimeTip(const QString &timeTip);
@@ -51,15 +49,13 @@
     bool isValid() const;
 
 signals:
-    void levelChanged();
     void timeTipChanged();
 
 private:
     QString displayText() const;
 
 private:
     NotifyEntity m_entity;
-    int m_level = 0;
     int m_urgency = NotifyEntity::Normal;
     QString m_timeTip;
     bool m_enablePreview = true;