From 4b82c639e08d0f4d21646af7cd93a28853eb416a Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Tue, 20 Sep 2022 12:40:08 +0200
Subject: [PATCH] effects/contrast: use effect-local data instead of window
 data

---
 src/effects/backgroundcontrast/contrast.cpp | 31 ++++++++++-----------
 src/effects/backgroundcontrast/contrast.h   |  7 ++++-
 src/libkwineffects/kwineffects.h            |  1 -
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/effects/backgroundcontrast/contrast.cpp b/src/effects/backgroundcontrast/contrast.cpp
index 7c6cd0454a..4ee1aee4e4 100644
--- a/src/effects/backgroundcontrast/contrast.cpp
+++ b/src/effects/backgroundcontrast/contrast.cpp
@@ -96,6 +96,7 @@ void ContrastEffect::slotScreenGeometryChanged()
 void ContrastEffect::updateContrastRegion(EffectWindow *w)
 {
     QRegion region;
+    QMatrix4x4 matrix;
     float colorTransform[16];
     bool valid = false;
 
@@ -118,8 +119,7 @@ void ContrastEffect::updateContrastRegion(EffectWindow *w)
                 colorTransform[j] = floatCardinals[i + j];
             }
 
-            QMatrix4x4 colorMatrix(colorTransform);
-            m_colorMatrices[w] = colorMatrix;
+            matrix = QMatrix4x4(colorTransform);
         }
 
         valid = !value.isNull();
@@ -129,7 +129,7 @@ void ContrastEffect::updateContrastRegion(EffectWindow *w)
 
     if (surf && surf->contrast()) {
         region = surf->contrast()->region();
-        m_colorMatrices[w] = colorMatrix(surf->contrast()->contrast(), surf->contrast()->intensity(), surf->contrast()->saturation());
+        matrix = colorMatrix(surf->contrast()->contrast(), surf->contrast()->intensity(), surf->contrast()->saturation());
         valid = true;
     }
 
@@ -150,19 +150,18 @@ void ContrastEffect::updateContrastRegion(EffectWindow *w)
             if (!ok) {
                 saturation = 1.0;
             }
-            m_colorMatrices[w] = colorMatrix(contrast, intensity, saturation);
+            matrix = colorMatrix(contrast, intensity, saturation);
             valid = true;
         }
     }
 
-    // If the specified region is empty, enable the contrast effect for the whole window.
-    if (region.isEmpty() && valid) {
-        // Set the data to a dummy value.
-        // This is needed to be able to distinguish between the value not
-        // being set, and being set to an empty region.
-        w->setData(WindowBackgroundContrastRole, 1);
+    if (valid) {
+        m_windowData[w] = {
+            .colorMatrix = matrix,
+            .contrastRegion = region,
+        };
     } else {
-        w->setData(WindowBackgroundContrastRole, region);
+        m_windowData.remove(w);
     }
 }
 
@@ -204,8 +203,8 @@ void ContrastEffect::slotWindowDeleted(EffectWindow *w)
     if (m_contrastChangedConnections.contains(w)) {
         disconnect(m_contrastChangedConnections[w]);
         m_contrastChangedConnections.remove(w);
-        m_colorMatrices.remove(w);
     }
+    m_windowData.remove(w);
 }
 
 void ContrastEffect::slotPropertyNotify(EffectWindow *w, long atom)
@@ -290,10 +289,8 @@ bool ContrastEffect::supported()
 QRegion ContrastEffect::contrastRegion(const EffectWindow *w) const
 {
     QRegion region;
-
-    const QVariant value = w->data(WindowBackgroundContrastRole);
-    if (value.isValid()) {
-        const QRegion appRegion = qvariant_cast<QRegion>(value);
+    if (const auto it = m_windowData.find(w); it != m_windowData.end()) {
+        const QRegion &appRegion = it->contrastRegion;
         if (!appRegion.isEmpty()) {
             region |= appRegion.translated(w->contentsRect().topLeft().toPoint()) & w->decorationInnerRect().toRect();
         } else {
@@ -434,7 +431,7 @@ void ContrastEffect::doContrast(EffectWindow *w, const QRegion &shape, const QRe
 
     // Draw the texture on the offscreen framebuffer object, while blurring it horizontally
 
-    m_shader->setColorMatrix(m_colorMatrices.value(w));
+    m_shader->setColorMatrix(m_windowData.value(w).colorMatrix);
     m_shader->bind();
 
     m_shader->setOpacity(opacity);
diff --git a/src/effects/backgroundcontrast/contrast.h b/src/effects/backgroundcontrast/contrast.h
index 26dbefd9a7..516b4e3a55 100644
--- a/src/effects/backgroundcontrast/contrast.h
+++ b/src/effects/backgroundcontrast/contrast.h
@@ -67,8 +67,13 @@ private:
 private:
     std::unique_ptr<ContrastShader> m_shader;
     long m_net_wm_contrast_region = 0;
-    QHash<const EffectWindow *, QMatrix4x4> m_colorMatrices;
     QHash<const EffectWindow *, QMetaObject::Connection> m_contrastChangedConnections; // used only in Wayland to keep track of effect changed
+    struct Data
+    {
+        QMatrix4x4 colorMatrix;
+        QRegion contrastRegion;
+    };
+    QHash<const EffectWindow *, Data> m_windowData;
     static KWaylandServer::ContrastManagerInterface *s_contrastManager;
     static QTimer *s_contrastManagerRemoveTimer;
 };
diff --git a/src/libkwineffects/kwineffects.h b/src/libkwineffects/kwineffects.h
index 3f7ef88f10..bb9e6cee5b 100644
--- a/src/libkwineffects/kwineffects.h
+++ b/src/libkwineffects/kwineffects.h
@@ -175,7 +175,6 @@ enum DataRole {
     WindowUnminimizedGrabRole,
     WindowForceBlurRole, ///< For fullscreen effects to enforce blurring of windows,
     WindowForceBackgroundContrastRole, ///< For fullscreen effects to enforce the background contrast,
-    WindowBackgroundContrastRole, ///< For single windows to enable Background contrast
 };
 
 /**