fix(shot): relay XRecord events when Dock grab blocks Qt input on X11

dengzhongyuan365-dev · dengzhongyuan365-dev · commit 4b849c2e14fd · 2026-05-25T17:51:56.000+08:00
When a Dock right-click menu is open, Qt's XGrabPointer routes all
pointer events to the Dock process. The screenshot overlay never
receives them via the normal Qt event path.

Fix by relaying XRecord events (which intercept at the protocol level,
unaffected by grabs) through QApplication::sendEvent in four handlers:

- onMouseMove: continuously relay during hover phase so window
  auto-highlight updates as the mouse moves
- onMouseDrag: relay during drag phase so the selection rectangle
  tracks the mouse
- onMousePress: relay the initial click so the drag state is entered
- onMouseRelease: relay the release so the toolbar appears

State flags (isFirstPressButton, isFirstReleaseButton, m_currentCursor)
are used as dedup guards: QueuedConnection ensures XRecord signals
arrive after Qt's synchronous event filter, so if Qt already handled
the event the guard condition is already true and the relay is skipped.

Log: 修复Dock右键菜单存在时截图工具鼠标事件被X11 Grab拦截的问题

PMS: BUG-330895

Influence: 修复后在Dock右键菜单打开状态下触发截图，窗口悬停检测、
框选拖拽、工具栏显示均可正常工作
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ AI config
 .npm-cache/
 .claude/
 .trellis/
+.codegraph/
diff --git a/src/main_window.cpp b/src/main_window.cpp
@@ -491,8 +491,10 @@ void MainWindow::initAttributes()
             m_connectionThreadObject->initConnection();
     #endif
         } else {
-            // x11自动识别窗口
-            Utils::getAllWindowInfo(static_cast<quint32>(this->winId()), m_screenWidth, m_screenHeight, windowRects, windowNames);
+            // x11: 窗口列表延迟到 showFullScreen 之后通过 refetchWindowInfo() 获取
+            // 避免右键菜单等弹出窗口残留在 windowRects 中
+            windowRects.clear();
+            windowNames.clear();
         }
         // 构建截屏工具栏按钮 by zyg
         m_toolBar = new ToolBar(this);
@@ -599,18 +601,34 @@ void MainWindow::initAttributes()
                                                 this,
                                                 SLOT(onLockScreenEvent(QDBusMessage)));
 
-        if (!isFirstMove && !Utils::isWaylandMode) {
-            qCDebug(dsrApp) << "发送鼠标事件!";
-            QMouseEvent *mouseMove =
-                new QMouseEvent(QEvent::MouseMove, this->cursor().pos(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-            QApplication::sendEvent(this, mouseMove);
-            delete mouseMove;
-        }
+        // 模拟鼠标事件延迟到 refetchWindowInfo() 中，与窗口列表获取同步
 
         qCInfo(dsrApp) << __LINE__ << __FUNCTION__ << "属性初始化已完成";
     }
 }
 
+void MainWindow::refetchWindowInfo()
+{
+    qCDebug(dsrApp) << "refetchWindowInfo() called.";
+    if (Utils::isWaylandMode || Utils::isTreelandMode) {
+        // Wayland 下窗口列表通过异步回调 waylandwindowinfo() 获取，无需在此处理
+        return;
+    }
+
+    windowRects.clear();
+    windowNames.clear();
+    Utils::getAllWindowInfo(static_cast<quint32>(this->winId()), m_screenWidth, m_screenHeight, windowRects, windowNames);
+    qCDebug(dsrApp) << "refetchWindowInfo: got" << windowRects.size() << "windows";
+
+    if (!isFirstMove) {
+        qCDebug(dsrApp) << "发送鼠标事件!";
+        QMouseEvent *mouseMove =
+            new QMouseEvent(QEvent::MouseMove, this->cursor().pos(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+        QApplication::sendEvent(this, mouseMove);
+        delete mouseMove;
+    }
+}
+
 void MainWindow::forceX11WindowPosition()
 {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -2268,6 +2286,7 @@ void MainWindow::topWindow()
     this->initLaunchMode("screenShot");
     this->showFullScreen();
     this->initResource();
+    refetchWindowInfo();
 
     // wayland 模式下不进入以下步骤
     if (Utils::isWaylandMode) {
@@ -2486,7 +2505,8 @@ void MainWindow::savePath(const QString &path)
     this->initLaunchMode("screenShot");
     this->showFullScreen();
     this->initResource();
-    
+    refetchWindowInfo();
+
     qCDebug(dsrApp) << "savePath end";
 }
 
@@ -2512,6 +2532,7 @@ void MainWindow::startScreenshotFor3rd(const QString &path)
     this->initLaunchMode("screenShot");
     this->showFullScreen();
     this->initResource();
+    refetchWindowInfo();
     m_shotWithPath = true;  // 自带路径
     m_noNotify = true;      // 关闭通知
     qCDebug(dsrApp) << "startScreenshotFor3rd end";
@@ -2525,6 +2546,7 @@ void MainWindow::noNotify()
     this->initLaunchMode("screenShot");
     this->showFullScreen();
     this->initResource();
+    refetchWindowInfo();
 }
 
 void MainWindow::initBackground()
@@ -6010,6 +6032,18 @@ void MainWindow::onMouseDrag(int x, int y)
     if (status::record == m_functionType) {
         showDragFeedback(x, y);
     }
+
+    // 截图模式：拖拽阶段（按下左键后移动）XRecord 发出 mouseDrag 而非 mouseMove。
+    // Dock Grab 存在时 Qt event filter 收不到拖拽移动事件，框选区域无法更新。
+    // 同样用坐标去重避免正常情况下双重触发。
+    if (status::shot == m_functionType && isFirstPressButton && !isFirstReleaseButton) {
+        QPoint pos(x, y);
+        if (m_currentCursor != pos) {
+            QMouseEvent *mouseDrag = new QMouseEvent(QEvent::MouseMove, pos, Qt::NoButton, Qt::LeftButton, Qt::NoModifier);
+            QApplication::sendEvent(this, mouseDrag);
+            delete mouseDrag;
+        }
+    }
 }
 
 // 通过x11从底层获取鼠标按压事件
@@ -6023,6 +6057,18 @@ void MainWindow::onMousePress(int x, int y)
     } else if (m_initScroll && status::scrollshot == m_functionType) {
         scrollShotMouseClickEvent(x, y);
     }
+
+    // 截图模式：Dock 右键菜单持有 X11 Pointer Grab 时，按下事件会被路由到
+    // Dock 而非截图工具，Qt event filter 收不到。通过 XRecord 补发，确保截图
+    // 工具能正确进入拖拽状态（isFirstPressButton = true）。
+    // 利用 QueuedConnection 的时序：Qt 同步处理已在前，此处排队到后——若 Qt
+    // 已处理（isFirstPressButton == true），条件不成立，不重复触发。
+    if (status::shot == m_functionType && !isFirstPressButton) {
+        QMouseEvent *mousePress = new QMouseEvent(QEvent::MouseButtonPress, QPoint(x, y),
+                                                  Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+        QApplication::sendEvent(this, mousePress);
+        delete mousePress;
+    }
 }
 
 // 通过x11从底层获取鼠标释放事件
@@ -6034,6 +6080,17 @@ void MainWindow::onMouseRelease(int x, int y)
     if (status::record == m_functionType) {
         showReleaseFeedback(x, y);
     }
+
+    // 截图模式：与 onMousePress 对应——Dock Grab 导致释放事件也路由到 Dock，
+    // Qt event filter 收不到，工具栏无法显示。通过 XRecord 补发释放事件。
+    // 同样利用 QueuedConnection 时序避免重复：Qt 已处理则 isFirstReleaseButton
+    // 为 true，条件不成立；isFirstPressButton 为 true 确保有匹配的按下事件。
+    if (status::shot == m_functionType && isFirstPressButton && !isFirstReleaseButton) {
+        QMouseEvent *mouseRelease = new QMouseEvent(QEvent::MouseButtonRelease, QPoint(x, y),
+                                                    Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+        QApplication::sendEvent(this, mouseRelease);
+        delete mouseRelease;
+    }
 }
 
 // 通过x11从底层获取鼠标移动事件
@@ -6050,11 +6107,20 @@ void MainWindow::onMouseMove(int x, int y)
         }
     }
 
-    // 启动截图或者录屏后第一次鼠标移动时需要通过此方法，后面都不会在进入此方法
-    if (!isFirstMove) {
-        QMouseEvent *mouseMove;
-        mouseMove = new QMouseEvent(QEvent::MouseMove, QPoint(x, y), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-        QApplication::sendEvent(QWidget::focusWidget(), mouseMove);
+    // 截图悬停阶段（未开始框选）通过 XRecord 持续补发鼠标移动事件。
+    // Dock Grab 存在时 Qt 正常事件通路被阻断，XRecord 在协议层拦截不受影响。
+    // 拖拽阶段由 onMouseDrag 负责补发，此处只覆盖悬停阶段（!isFirstPressButton）。
+    // 非截图模式保持原有逻辑：仅补发第一次（!isFirstMove）。
+    // m_currentCursor 在 mouseMoveEF 开头被更新：坐标已匹配说明 Qt 正常处理过，
+    // 无需重复补发，避免正常情况下双重触发。
+    bool inShotHoverPhase = status::shot == m_functionType && !isFirstPressButton;
+    if (!isFirstMove || inShotHoverPhase) {
+        QPoint pos(x, y);
+        if (m_currentCursor != pos) {
+            QMouseEvent *mouseMove = new QMouseEvent(QEvent::MouseMove, pos, Qt::NoButton, Qt::NoButton, Qt::NoModifier);
+            QApplication::sendEvent(this, mouseMove);
+            delete mouseMove;
+        }
     }
 }
 
diff --git a/src/main_window.h b/src/main_window.h
@@ -359,6 +359,12 @@ class MainWindow : public QMainWindow
     void initSaveShortcut();
 
     void initLaunchMode(const QString &launchMode);
+
+    /**
+     * @brief 在截图窗口 showFullScreen 之后重新获取窗口列表
+     * 解决右键菜单等弹出窗口残留在 windowRects 中的问题
+     */
+    void refetchWindowInfo();
     //void delayScreenshot(double num);
     void fullScreenshot();
 
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
@@ -49,6 +49,7 @@ void Screenshot::startScreenshot()
         qCDebug(dsrApp) << "Showing window in full screen mode for non-Wayland.";
     }
     m_window.createWinId();
+    m_window.refetchWindowInfo();
     qCDebug(dsrApp) << "Window ID created.";
     //平板模式截图录屏
     if (Utils::isTabletEnvironment) {
@@ -102,6 +103,7 @@ void Screenshot::delayScreenshot(double num)
         m_window.showFullScreen();
         m_window.initResource();
         m_window.createWinId();
+        m_window.refetchWindowInfo();
         qCDebug(dsrApp) << "Screenshot window initialized and shown after delay.";
     });
 }
@@ -133,6 +135,7 @@ void Screenshot::OcrScreenshot()
     m_window.initLaunchMode("screenOcr");
     m_window.showFullScreen();
     m_window.createWinId();
+    m_window.refetchWindowInfo();
     qCDebug(dsrApp) << "OCR screenshot window initialized and shown.";
 #else
     qCDebug(dsrApp) << "OCR_SCROLL_FLAGE_ON is not defined, skipping OCR screenshot initialization.";
@@ -152,6 +155,7 @@ void Screenshot::ScrollScreenshot()
         m_window.initLaunchMode("screenScroll");
         m_window.showFullScreen();
         m_window.createWinId();
+        m_window.refetchWindowInfo();
         qCDebug(dsrApp) << "Scroll screenshot window initialized and shown.";
     } else {
         qCDebug(dsrApp) << "Scroll shot exit. Window effects not supported.";
