fix: resolve master rebase build regressions

Author: shule1987

frame/layershell/x11dlayershellemulation.cpp

@@ -17,6 +17,7 @@
 #include <xcb/xcb.h>
 #include <xcb/xcb_ewmh.h>
 #include <xcb/xcb_icccm.h>
+#include <xcb/shape.h>
 
 DS_BEGIN_NAMESPACE
 
@@ -316,6 +317,38 @@ 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()) {
+        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);
+    }
+
+    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/taskmanager/dockglobalelementmodel.cpp

@@ -951,14 +951,6 @@ QVariant DockGlobalElementModel::data(const QModelIndex &index, int role) const
         QModelIndex groupIndex = model->index(row, 0);
         return groupIndex.data(TaskManager::WindowsRole).toStringList();
     }
-    case TaskManager::ActiveRole:
-    case TaskManager::AttentionRole: {
-        if (model == m_activeAppModel) {
-            return model->index(row, 0).data(role);
-        }
-        return false;
-    }
-
     case TaskManager::MenusRole: {
         return getMenus(index);
     }

panels/dock/taskmanager/taskmanager.cpp

@@ -1007,6 +1007,7 @@ TaskManager::TaskManager(QObject *parent)
     qmlRegisterUncreatableType<TextCalculatorAttached>("org.deepin.ds.dock.taskmanager", 1, 0, "TextCalculatorAttached", "TextCalculator Attached");
 
     connect(Settings, &TaskManagerSettings::allowedForceQuitChanged, this, &TaskManager::allowedForceQuitChanged);
+    connect(Settings, &TaskManagerSettings::showAttentionAnimationChanged, this, &TaskManager::showAttentionAnimationChanged);
     connect(Settings, &TaskManagerSettings::windowSplitChanged, this, &TaskManager::windowSplitChanged);
 
     if (auto *thumbnailProvider = Dtk::Gui::DThumbnailProvider::instance()) {
@@ -1291,6 +1292,11 @@ bool TaskManager::allowForceQuit()
     return Settings->isAllowedForceQuit();
 }
 
+bool TaskManager::showAttentionAnimation()
+{
+    return Settings->showAttentionAnimation();
+}
+
 QString TaskManager::desktopIdToAppId(const QString& desktopId) const
 {
     return Q_LIKELY(desktopId.endsWith(".desktop")) ? desktopId.chopped(8) : desktopId;