feat: refine dock interactions and left plugins

Refine dock interactions for the fashion mode workflow.
Extend and harden the behavior of the left side plugins.

Author: shule1987

frame/layershell/x11dlayershellemulation.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -17,7 +17,6 @@
 #include <xcb/xcb.h>
 #include <xcb/xcb_ewmh.h>
 #include <xcb/xcb_icccm.h>
-#include <xcb/shape.h>
 
 DS_BEGIN_NAMESPACE
 
@@ -30,11 +29,16 @@ LayerShellEmulation::LayerShellEmulation(QWindow* window, QObject *parent)
 {
     onLayerChanged();
     connect(m_dlayerShellWindow, &DLayerShellWindow::layerChanged, this, &LayerShellEmulation::onLayerChanged);
+    connect(m_window, &QWindow::visibleChanged, this, [this](bool) {
+        onLayerChanged();
+    });
+    connect(m_window, &QWindow::visibilityChanged, this, [this](QWindow::Visibility) {
+        onLayerChanged();
+    });
 
     onPositionChanged();
     connect(m_dlayerShellWindow, &DLayerShellWindow::anchorsChanged, this, &LayerShellEmulation::onPositionChanged);
     connect(m_dlayerShellWindow, &DLayerShellWindow::marginsChanged, this, &LayerShellEmulation::onPositionChanged);
-    connect(m_dlayerShellWindow, &DLayerShellWindow::geometryHintsChanged, this, &LayerShellEmulation::onPositionChanged);
 
     onExclusionZoneChanged();
     m_exclusionZoneChangedTimer.setSingleShot(true);
@@ -72,9 +76,6 @@ LayerShellEmulation::LayerShellEmulation(QWindow* window, QObject *parent)
     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);
 }
 
@@ -90,6 +91,10 @@ LayerShellEmulation::LayerShellEmulation(QWindow* window, QObject *parent)
 void LayerShellEmulation::onLayerChanged()
 {
     auto xcbWindow = dynamic_cast<QNativeInterface::Private::QXcbWindow*>(m_window->handle());
+    if (!xcbWindow) {
+        return;
+    }
+
     switch (m_dlayerShellWindow->layer()) {
         case DLayerShellWindow::LayerBackground: {
             m_window->setFlags(m_window->flags() & ~Qt::WindowStaysOnBottomHint);
@@ -122,30 +127,17 @@ void LayerShellEmulation::onPositionChanged()
 {
     auto anchors = m_dlayerShellWindow->anchors();
     auto screen = m_window->screen();
-    if (!screen) {
-        return;
-    }
-
-    int targetWidth = m_window->width();
-    int targetHeight = m_window->height();
-    if (m_dlayerShellWindow->preferredWidth() > 0) {
-        targetWidth = m_dlayerShellWindow->preferredWidth();
-    }
-    if (m_dlayerShellWindow->preferredHeight() > 0) {
-        targetHeight = m_dlayerShellWindow->preferredHeight();
-    }
-
     auto screenRect = screen->geometry();
-    auto x = screenRect.left() + (screenRect.width() - targetWidth) / 2;
-    auto y = screenRect.top() + (screenRect.height() - targetHeight) / 2;
+    auto x = screenRect.left() + (screenRect.width() - m_window->width()) / 2;
+    auto y = screenRect.top() + (screenRect.height() - m_window->height()) / 2;
     if (anchors & DLayerShellWindow::AnchorRight) {
         // https://doc.qt.io/qt-6/qrect.html#right
-        x = (screen->geometry().right() + 1 - targetWidth - m_dlayerShellWindow->rightMargin());
+        x = (screen->geometry().right() + 1 - m_window->width() - m_dlayerShellWindow->rightMargin());
     }
 
     if (anchors & DLayerShellWindow::AnchorBottom) {
         // https://doc.qt.io/qt-6/qrect.html#bottom
-        y = (screen->geometry().bottom() + 1 - targetHeight - m_dlayerShellWindow->bottomMargin());
+        y = (screen->geometry().bottom() + 1 - m_window->height() - m_dlayerShellWindow->bottomMargin());
     }
     if (anchors & DLayerShellWindow::AnchorLeft) {
         x = (screen->geometry().left() + m_dlayerShellWindow->leftMargin());
@@ -154,7 +146,7 @@ void LayerShellEmulation::onPositionChanged()
         y = (screen->geometry().top() + m_dlayerShellWindow->topMargin());
     }
 
-    QRect rect(x, y, targetWidth, targetHeight);
+    QRect rect(x, y, m_window->width(), m_window->height());
 
     const bool horizontallyConstrained = anchors.testFlags({DLayerShellWindow::AnchorLeft, DLayerShellWindow::AnchorRight});
     const bool verticallyConstrained = anchors.testFlags({DLayerShellWindow::AnchorTop, DLayerShellWindow::AnchorBottom});
@@ -168,9 +160,8 @@ void LayerShellEmulation::onPositionChanged()
         rect.setHeight(screen->geometry().height() - m_dlayerShellWindow->topMargin() - m_dlayerShellWindow->bottomMargin());
     }
 
-    if (m_window->geometry() != rect) {
-        m_window->setGeometry(rect);
-    }
+    m_window->setGeometry(rect);
+    onLayerChanged();
 }
 
 /**
@@ -325,41 +316,6 @@ void LayerShellEmulation::onScopeChanged()
     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

panels/dock/dockpanel.cpp

@@ -25,9 +25,14 @@
 #include <QDBusReply>
 #include <QDBusVariant>
 #include <QIcon>
+#include <QtGui/qguiapplication_platform.h>
 #include <DGuiApplicationHelper>
 #include <DPlatformTheme>
 
+#if defined(BUILD_WITH_X11)
+#include <xcb/xcb.h>
+#endif
+
 #define SETTINGS DockSettings::instance()
 
 Q_LOGGING_CATEGORY(dockLog, "org.deepin.dde.shell.dock")
@@ -120,6 +125,56 @@ QString readAppearanceStringProperty(const QString &propertyName)
     return reply.isValid() ? reply.value().variant().toString() : QString();
 }
 
+#if defined(BUILD_WITH_X11)
+xcb_window_t nativeTopLevelWindow(xcb_connection_t *connection, xcb_window_t window)
+{
+    xcb_window_t current = window;
+
+    while (current != XCB_WINDOW_NONE) {
+        xcb_query_tree_reply_t *reply = xcb_query_tree_reply(connection, xcb_query_tree(connection, current), nullptr);
+        if (!reply) {
+            return current;
+        }
+
+        const bool isTopLevel = reply->parent == reply->root || reply->parent == XCB_WINDOW_NONE;
+        const xcb_window_t parent = reply->parent;
+        free(reply);
+
+        if (isTopLevel) {
+            return current;
+        }
+
+        current = parent;
+    }
+
+    return window;
+}
+
+bool raiseX11Window(QWindow *window)
+{
+    if (!window) {
+        return false;
+    }
+
+    window->create();
+    const auto windowId = static_cast<xcb_window_t>(window->winId());
+    if (windowId == XCB_WINDOW_NONE) {
+        return false;
+    }
+
+    auto *x11App = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
+    if (!x11App || !x11App->connection()) {
+        return false;
+    }
+
+    const auto nativeWindowId = nativeTopLevelWindow(x11App->connection(), windowId);
+    const uint32_t values[] = { XCB_STACK_MODE_ABOVE };
+    xcb_configure_window(x11App->connection(), nativeWindowId, XCB_CONFIG_WINDOW_STACK_MODE, values);
+    xcb_flush(x11App->connection());
+    return true;
+}
+#endif
+
 void syncApplicationTheme(Dtk::Gui::DGuiApplicationHelper *helper,
                           const QString &globalThemeName,
                           const QString &gtkThemeName,
@@ -169,6 +224,8 @@ DockPanel::DockPanel(QObject *parent)
     , m_compositorReady(false)
     , m_launcherShown(false)
     , m_themeSyncTimer(new QTimer(this))
+    , m_launcherRaiseTimer(new QTimer(this))
+    , m_launcherRaisePasses(0)
     , m_contextDragging(false)
     , m_containsMouse(false)
     , m_reportedContainsMouse(false)
@@ -180,6 +237,26 @@ DockPanel::DockPanel(QObject *parent)
     m_themeSyncTimer->setInterval(80);
     connect(m_themeSyncTimer, &QTimer::timeout, this, &DockPanel::syncColorThemeWithSystem);
 
+    m_launcherRaiseTimer->setInterval(80);
+    connect(m_launcherRaiseTimer, &QTimer::timeout, this, [this] {
+        if (!m_launcherShown || m_launcherRaisePasses <= 0) {
+            m_launcherRaiseTimer->stop();
+            return;
+        }
+
+        if (window()) {
+            window()->raise();
+#if defined(BUILD_WITH_X11)
+            raiseX11Window(window());
+#endif
+        }
+
+        --m_launcherRaisePasses;
+        if (m_launcherRaisePasses <= 0) {
+            m_launcherRaiseTimer->stop();
+        }
+    });
+
     connect(this, &DockPanel::compositorReadyChanged, this, [this] {
         if (!m_compositorReady) return;
         m_loadTrayPlugins->loadDockPlugins();
@@ -617,6 +694,14 @@ void DockPanel::launcherVisibleChanged(bool visible)
     if (newHideState != oldHideState) {
         Q_EMIT hideStateChanged(newHideState);
     }
+
+    if (m_launcherShown) {
+        m_launcherRaisePasses = 10;
+        m_launcherRaiseTimer->start();
+    } else {
+        m_launcherRaisePasses = 0;
+        m_launcherRaiseTimer->stop();
+    }
 }
 
 void DockPanel::updateDockScreen()

panels/dock/dockpanel.h

@@ -164,6 +164,8 @@ private Q_SLOTS:
     bool m_compositorReady;
     bool m_launcherShown;
     QTimer *m_themeSyncTimer;
+    QTimer *m_launcherRaiseTimer;
+    int m_launcherRaisePasses;
     bool m_contextDragging;
     bool m_containsMouse;
     bool m_reportedContainsMouse;