From 90b2aa25e0bd4f31c4e8e64a8d2961ce8cbafb8e Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Mon, 18 Sep 2023 16:45:44 +0200
Subject: [PATCH] compositor: fix the hardware cursor with rotated screens

---
 src/backends/drm/drm_egl_cursor_layer.cpp |  5 +++
 src/backends/drm/drm_egl_cursor_layer.h   |  1 +
 src/compositor.cpp                        | 40 ++++++++++++++---------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/backends/drm/drm_egl_cursor_layer.cpp b/src/backends/drm/drm_egl_cursor_layer.cpp
index 345979449b..d95be2d7f1 100644
--- a/src/backends/drm/drm_egl_cursor_layer.cpp
+++ b/src/backends/drm/drm_egl_cursor_layer.cpp
@@ -83,4 +83,9 @@ std::chrono::nanoseconds EglGbmCursorLayer::queryRenderTime() const
 {
     return m_surface.queryRenderTime();
 }
+
+std::optional<QSize> EglGbmCursorLayer::fixedSize() const
+{
+    return m_pipeline->gpu()->cursorSize();
+}
 }
diff --git a/src/backends/drm/drm_egl_cursor_layer.h b/src/backends/drm/drm_egl_cursor_layer.h
index 358e53b8e3..62213c372f 100644
--- a/src/backends/drm/drm_egl_cursor_layer.h
+++ b/src/backends/drm/drm_egl_cursor_layer.h
@@ -36,6 +36,7 @@ public:
     void releaseBuffers() override;
     quint32 format() const override;
     std::chrono::nanoseconds queryRenderTime() const override;
+    std::optional<QSize> fixedSize() const override;
 
 private:
     EglGbmLayerSurface m_surface;
diff --git a/src/compositor.cpp b/src/compositor.cpp
index ba18ff18e4..e3aecc8122 100644
--- a/src/compositor.cpp
+++ b/src/compositor.cpp
@@ -380,12 +380,12 @@ void Compositor::addOutput(Output *output)
     cursorLayer->setParent(workspaceLayer);
     cursorLayer->setSuperlayer(workspaceLayer);
 
-    auto updateCursorLayer = [this, output, cursorLayer]() {
-        static bool valid;
-        static const bool forceSoftwareCursor = qEnvironmentVariableIntValue("KWIN_FORCE_SW_CURSOR", &valid) == 1 && valid;
+    static bool valid;
+    static const bool forceSoftwareCursor = qEnvironmentVariableIntValue("KWIN_FORCE_SW_CURSOR", &valid) == 1 && valid;
 
+    auto updateCursorLayer = [this, output, cursorLayer]() {
         const Cursor *cursor = Cursors::self()->currentCursor();
-        const QRectF layerRect = output->mapFromGlobal(cursor->geometry());
+        const QRectF outputLocalRect = output->mapFromGlobal(cursor->geometry());
         const auto outputLayer = m_backend->cursorLayer(output);
         if (!cursor->isOnOutput(output)) {
             if (outputLayer && outputLayer->isEnabled()) {
@@ -393,23 +393,24 @@ void Compositor::addOutput(Output *output)
                 output->updateCursorLayer();
             }
             cursorLayer->setVisible(false);
-            return;
+            return true;
         }
         const auto renderHardwareCursor = [&]() {
             if (!outputLayer || forceSoftwareCursor) {
                 return false;
             }
             const QMatrix4x4 monitorMatrix = Output::logicalToNativeMatrix(output->rect(), output->scale(), output->transform());
-            const QRectF nativeCursorRect = monitorMatrix.mapRect(layerRect);
+            QRectF nativeCursorRect = monitorMatrix.mapRect(outputLocalRect);
             QSize bufferSize(std::ceil(nativeCursorRect.width()), std::ceil(nativeCursorRect.height()));
             if (const auto fixedSize = outputLayer->fixedSize()) {
                 if (fixedSize->width() < bufferSize.width() || fixedSize->height() < bufferSize.height()) {
                     return false;
                 }
                 bufferSize = *fixedSize;
+                nativeCursorRect = monitorMatrix.mapRect(QRectF(outputLocalRect.topLeft(), QSizeF(bufferSize) / output->scale()));
             }
             outputLayer->setPosition(nativeCursorRect.topLeft());
-            outputLayer->setHotspot(monitorMatrix.map(cursor->hotspot()));
+            outputLayer->setHotspot(Output::logicalToNativeMatrix(QRectF(QPointF(), QSizeF(bufferSize) / output->scale()), output->scale(), output->transform()).map(cursor->hotspot()));
             outputLayer->setSize(bufferSize);
             if (auto beginInfo = outputLayer->beginFrame()) {
                 const RenderTarget &renderTarget = beginInfo->renderTarget;
@@ -431,29 +432,36 @@ void Compositor::addOutput(Output *output)
         };
         if (renderHardwareCursor()) {
             cursorLayer->setVisible(false);
+            return true;
         } else {
             if (outputLayer && outputLayer->isEnabled()) {
                 outputLayer->setEnabled(false);
                 output->updateCursorLayer();
             }
             cursorLayer->setVisible(cursor->isOnOutput(output));
-            cursorLayer->setGeometry(layerRect);
+            cursorLayer->setGeometry(outputLocalRect);
             cursorLayer->addRepaintFull();
+            return false;
         }
     };
-    auto moveCursorLayer = [this, output, cursorLayer]() {
+    auto moveCursorLayer = [this, output, cursorLayer, updateCursorLayer]() {
         const Cursor *cursor = Cursors::self()->currentCursor();
-        const QRectF layerRect = output->mapFromGlobal(cursor->geometry());
-        const QMatrix4x4 monitorMatrix = Output::logicalToNativeMatrix(output->rect(), output->scale(), output->transform());
-        const QRectF nativeCursorRect = monitorMatrix.mapRect(layerRect);
+        const QRectF outputLocalRect = output->mapFromGlobal(cursor->geometry());
         const auto outputLayer = m_backend->cursorLayer(output);
         bool hardwareCursor = false;
-        if (outputLayer && outputLayer->isEnabled()) {
-            outputLayer->setPosition(nativeCursorRect.topLeft());
-            hardwareCursor = output->updateCursorLayer();
+        if (outputLayer) {
+            if (outputLayer->isEnabled()) {
+                const QMatrix4x4 monitorMatrix = Output::logicalToNativeMatrix(output->rect(), output->scale(), output->transform());
+                const QRectF nativeCursorRect = monitorMatrix.mapRect(QRectF(outputLocalRect.topLeft(), outputLayer->size() / output->scale()));
+                outputLayer->setPosition(nativeCursorRect.topLeft());
+                hardwareCursor = output->updateCursorLayer();
+            } else if (!cursorLayer->isVisible() && !forceSoftwareCursor) {
+                // this is for the case that the cursor wasn't visible because it was on a different output before
+                hardwareCursor = updateCursorLayer();
+            }
         }
         cursorLayer->setVisible(cursor->isOnOutput(output) && !hardwareCursor);
-        cursorLayer->setGeometry(layerRect);
+        cursorLayer->setGeometry(outputLocalRect);
         cursorLayer->addRepaintFull();
     };
     updateCursorLayer();