Extract Effect into its own header

After merging libkwineffects and libkwin, EffectsHandler and EffectWindow
have effectively become redundant. On the other hand, Effect and the
associated factory code is still relevant. In order to split relevant and
"legacy" code, this change extracts the Effect class in its own header.
It's also a good idea to split kwineffects.h header because it's quite
huge...

src/CMakeLists.txt

@@ -109,6 +109,7 @@ target_sources(kwin PRIVATE
     layershellv1integration.cpp
     layershellv1window.cpp
     libkwineffects/anidata.cpp
+    libkwineffects/effect.cpp
     libkwineffects/effectframe.cpp
     libkwineffects/effecttogglablestate.cpp
     libkwineffects/kwinanimationeffect.cpp
@@ -435,6 +436,7 @@ install(FILES
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/utils COMPONENT Devel)
 
 install(FILES
+    libkwineffects/effect.h
     libkwineffects/kwinanimationeffect.h
     libkwineffects/kwineffects.h
     libkwineffects/kwinglobals.h

src/libkwineffects/effect.cpp

@@ -0,0 +1,580 @@
+/*
+    SPDX-FileCopyrightText: 2006 Lubos Lunak <l.lunak@kde.org>
+    SPDX-FileCopyrightText: 2009 Lucas Murray <lmurray@undefinedfire.com>
+    SPDX-FileCopyrightText: 2018 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+
+    SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
+#include "libkwineffects/effect.h"
+#include "libkwineffects/kwineffects.h"
+
+#include <KConfigGroup>
+
+#include <QMatrix4x4>
+#include <QVector3D>
+
+namespace KWin
+{
+
+void WindowPrePaintData::setTranslucent()
+{
+    mask |= Effect::PAINT_WINDOW_TRANSLUCENT;
+    mask &= ~Effect::PAINT_WINDOW_OPAQUE;
+    opaque = QRegion(); // cannot clip, will be transparent
+}
+
+void WindowPrePaintData::setTransformed()
+{
+    mask |= Effect::PAINT_WINDOW_TRANSFORMED;
+}
+
+class PaintDataPrivate
+{
+public:
+    PaintDataPrivate()
+        : scale(1., 1., 1.)
+        , rotationAxis(0, 0, 1.)
+        , rotationAngle(0.)
+    {
+    }
+    QVector3D scale;
+    QVector3D translation;
+
+    QVector3D rotationAxis;
+    QVector3D rotationOrigin;
+    qreal rotationAngle;
+};
+
+PaintData::PaintData()
+    : d(std::make_unique<PaintDataPrivate>())
+{
+}
+
+PaintData::~PaintData() = default;
+
+qreal PaintData::xScale() const
+{
+    return d->scale.x();
+}
+
+qreal PaintData::yScale() const
+{
+    return d->scale.y();
+}
+
+qreal PaintData::zScale() const
+{
+    return d->scale.z();
+}
+
+void PaintData::setScale(const QVector2D &scale)
+{
+    d->scale.setX(scale.x());
+    d->scale.setY(scale.y());
+}
+
+void PaintData::setScale(const QVector3D &scale)
+{
+    d->scale = scale;
+}
+void PaintData::setXScale(qreal scale)
+{
+    d->scale.setX(scale);
+}
+
+void PaintData::setYScale(qreal scale)
+{
+    d->scale.setY(scale);
+}
+
+void PaintData::setZScale(qreal scale)
+{
+    d->scale.setZ(scale);
+}
+
+const QVector3D &PaintData::scale() const
+{
+    return d->scale;
+}
+
+void PaintData::setXTranslation(qreal translate)
+{
+    d->translation.setX(translate);
+}
+
+void PaintData::setYTranslation(qreal translate)
+{
+    d->translation.setY(translate);
+}
+
+void PaintData::setZTranslation(qreal translate)
+{
+    d->translation.setZ(translate);
+}
+
+void PaintData::translate(qreal x, qreal y, qreal z)
+{
+    translate(QVector3D(x, y, z));
+}
+
+void PaintData::translate(const QVector3D &t)
+{
+    d->translation += t;
+}
+
+qreal PaintData::xTranslation() const
+{
+    return d->translation.x();
+}
+
+qreal PaintData::yTranslation() const
+{
+    return d->translation.y();
+}
+
+qreal PaintData::zTranslation() const
+{
+    return d->translation.z();
+}
+
+const QVector3D &PaintData::translation() const
+{
+    return d->translation;
+}
+
+qreal PaintData::rotationAngle() const
+{
+    return d->rotationAngle;
+}
+
+QVector3D PaintData::rotationAxis() const
+{
+    return d->rotationAxis;
+}
+
+QVector3D PaintData::rotationOrigin() const
+{
+    return d->rotationOrigin;
+}
+
+void PaintData::setRotationAngle(qreal angle)
+{
+    d->rotationAngle = angle;
+}
+
+void PaintData::setRotationAxis(Qt::Axis axis)
+{
+    switch (axis) {
+    case Qt::XAxis:
+        setRotationAxis(QVector3D(1, 0, 0));
+        break;
+    case Qt::YAxis:
+        setRotationAxis(QVector3D(0, 1, 0));
+        break;
+    case Qt::ZAxis:
+        setRotationAxis(QVector3D(0, 0, 1));
+        break;
+    }
+}
+
+void PaintData::setRotationAxis(const QVector3D &axis)
+{
+    d->rotationAxis = axis;
+}
+
+void PaintData::setRotationOrigin(const QVector3D &origin)
+{
+    d->rotationOrigin = origin;
+}
+
+QMatrix4x4 PaintData::toMatrix(qreal deviceScale) const
+{
+    QMatrix4x4 ret;
+    if (d->translation != QVector3D(0, 0, 0)) {
+        ret.translate(d->translation * deviceScale);
+    }
+    if (d->scale != QVector3D(1, 1, 1)) {
+        ret.scale(d->scale);
+    }
+
+    if (d->rotationAngle != 0) {
+        ret.translate(d->rotationOrigin * deviceScale);
+        ret.rotate(d->rotationAngle, d->rotationAxis);
+        ret.translate(-d->rotationOrigin * deviceScale);
+    }
+
+    return ret;
+}
+
+class WindowPaintDataPrivate
+{
+public:
+    qreal opacity;
+    qreal saturation;
+    qreal brightness;
+    int screen;
+    qreal crossFadeProgress;
+    QMatrix4x4 projectionMatrix;
+};
+
+WindowPaintData::WindowPaintData()
+    : WindowPaintData(QMatrix4x4())
+{
+}
+
+WindowPaintData::WindowPaintData(const QMatrix4x4 &projectionMatrix)
+    : PaintData()
+    , d(std::make_unique<WindowPaintDataPrivate>())
+{
+    setProjectionMatrix(projectionMatrix);
+    setOpacity(1.0);
+    setSaturation(1.0);
+    setBrightness(1.0);
+    setScreen(0);
+    setCrossFadeProgress(0.0);
+}
+
+WindowPaintData::WindowPaintData(const WindowPaintData &other)
+    : PaintData()
+    , d(std::make_unique<WindowPaintDataPrivate>())
+{
+    setXScale(other.xScale());
+    setYScale(other.yScale());
+    setZScale(other.zScale());
+    translate(other.translation());
+    setRotationOrigin(other.rotationOrigin());
+    setRotationAxis(other.rotationAxis());
+    setRotationAngle(other.rotationAngle());
+    setOpacity(other.opacity());
+    setSaturation(other.saturation());
+    setBrightness(other.brightness());
+    setScreen(other.screen());
+    setCrossFadeProgress(other.crossFadeProgress());
+    setProjectionMatrix(other.projectionMatrix());
+}
+
+WindowPaintData::~WindowPaintData() = default;
+
+qreal WindowPaintData::opacity() const
+{
+    return d->opacity;
+}
+
+qreal WindowPaintData::saturation() const
+{
+    return d->saturation;
+}
+
+qreal WindowPaintData::brightness() const
+{
+    return d->brightness;
+}
+
+int WindowPaintData::screen() const
+{
+    return d->screen;
+}
+
+void WindowPaintData::setOpacity(qreal opacity)
+{
+    d->opacity = opacity;
+}
+
+void WindowPaintData::setSaturation(qreal saturation) const
+{
+    d->saturation = saturation;
+}
+
+void WindowPaintData::setBrightness(qreal brightness)
+{
+    d->brightness = brightness;
+}
+
+void WindowPaintData::setScreen(int screen) const
+{
+    d->screen = screen;
+}
+
+qreal WindowPaintData::crossFadeProgress() const
+{
+    return d->crossFadeProgress;
+}
+
+void WindowPaintData::setCrossFadeProgress(qreal factor)
+{
+    d->crossFadeProgress = std::clamp(factor, 0.0, 1.0);
+}
+
+qreal WindowPaintData::multiplyOpacity(qreal factor)
+{
+    d->opacity *= factor;
+    return d->opacity;
+}
+
+qreal WindowPaintData::multiplySaturation(qreal factor)
+{
+    d->saturation *= factor;
+    return d->saturation;
+}
+
+qreal WindowPaintData::multiplyBrightness(qreal factor)
+{
+    d->brightness *= factor;
+    return d->brightness;
+}
+
+void WindowPaintData::setProjectionMatrix(const QMatrix4x4 &matrix)
+{
+    d->projectionMatrix = matrix;
+}
+
+QMatrix4x4 WindowPaintData::projectionMatrix() const
+{
+    return d->projectionMatrix;
+}
+
+QMatrix4x4 &WindowPaintData::rprojectionMatrix()
+{
+    return d->projectionMatrix;
+}
+
+WindowPaintData &WindowPaintData::operator*=(qreal scale)
+{
+    this->setXScale(this->xScale() * scale);
+    this->setYScale(this->yScale() * scale);
+    this->setZScale(this->zScale() * scale);
+    return *this;
+}
+
+WindowPaintData &WindowPaintData::operator*=(const QVector2D &scale)
+{
+    this->setXScale(this->xScale() * scale.x());
+    this->setYScale(this->yScale() * scale.y());
+    return *this;
+}
+
+WindowPaintData &WindowPaintData::operator*=(const QVector3D &scale)
+{
+    this->setXScale(this->xScale() * scale.x());
+    this->setYScale(this->yScale() * scale.y());
+    this->setZScale(this->zScale() * scale.z());
+    return *this;
+}
+
+WindowPaintData &WindowPaintData::operator+=(const QPointF &translation)
+{
+    return this->operator+=(QVector3D(translation));
+}
+
+WindowPaintData &WindowPaintData::operator+=(const QPoint &translation)
+{
+    return this->operator+=(QVector3D(translation));
+}
+
+WindowPaintData &WindowPaintData::operator+=(const QVector2D &translation)
+{
+    return this->operator+=(QVector3D(translation));
+}
+
+WindowPaintData &WindowPaintData::operator+=(const QVector3D &translation)
+{
+    translate(translation);
+    return *this;
+}
+
+Effect::Effect(QObject *parent)
+    : QObject(parent)
+{
+}
+
+Effect::~Effect()
+{
+}
+
+void Effect::reconfigure(ReconfigureFlags)
+{
+}
+
+void Effect::windowInputMouseEvent(QEvent *)
+{
+}
+
+void Effect::grabbedKeyboardEvent(QKeyEvent *)
+{
+}
+
+bool Effect::borderActivated(ElectricBorder)
+{
+    return false;
+}
+
+void Effect::prePaintScreen(ScreenPrePaintData &data, std::chrono::milliseconds presentTime)
+{
+    effects->prePaintScreen(data, presentTime);
+}
+
+void Effect::paintScreen(const RenderTarget &renderTarget, const RenderViewport &viewport, int mask, const QRegion &region, Output *screen)
+{
+    effects->paintScreen(renderTarget, viewport, mask, region, screen);
+}
+
+void Effect::postPaintScreen()
+{
+    effects->postPaintScreen();
+}
+
+void Effect::prePaintWindow(EffectWindow *w, WindowPrePaintData &data, std::chrono::milliseconds presentTime)
+{
+    effects->prePaintWindow(w, data, presentTime);
+}
+
+void Effect::paintWindow(const RenderTarget &renderTarget, const RenderViewport &viewport, EffectWindow *w, int mask, QRegion region, WindowPaintData &data)
+{
+    effects->paintWindow(renderTarget, viewport, w, mask, region, data);
+}
+
+void Effect::postPaintWindow(EffectWindow *w)
+{
+    effects->postPaintWindow(w);
+}
+
+bool Effect::provides(Feature)
+{
+    return false;
+}
+
+bool Effect::isActive() const
+{
+    return true;
+}
+
+QString Effect::debug(const QString &) const
+{
+    return QString();
+}
+
+void Effect::drawWindow(const RenderTarget &renderTarget, const RenderViewport &viewport, EffectWindow *w, int mask, const QRegion &region, WindowPaintData &data)
+{
+    effects->drawWindow(renderTarget, viewport, w, mask, region, data);
+}
+
+void Effect::setPositionTransformations(WindowPaintData &data, QRect &region, EffectWindow *w,
+                                        const QRect &r, Qt::AspectRatioMode aspect)
+{
+    QSizeF size = w->size();
+    size.scale(r.size(), aspect);
+    data.setXScale(size.width() / double(w->width()));
+    data.setYScale(size.height() / double(w->height()));
+    int width = int(w->width() * data.xScale());
+    int height = int(w->height() * data.yScale());
+    int x = r.x() + (r.width() - width) / 2;
+    int y = r.y() + (r.height() - height) / 2;
+    region = QRect(x, y, width, height);
+    data.setXTranslation(x - w->x());
+    data.setYTranslation(y - w->y());
+}
+
+QPointF Effect::cursorPos()
+{
+    return effects->cursorPos();
+}
+
+double Effect::animationTime(const KConfigGroup &cfg, const QString &key, int defaultTime)
+{
+    int time = cfg.readEntry(key, 0);
+    return time != 0 ? time : std::max(defaultTime * effects->animationTimeFactor(), 1.);
+}
+
+double Effect::animationTime(int defaultTime)
+{
+    // at least 1ms, otherwise 0ms times can break some things
+    return std::max(defaultTime * effects->animationTimeFactor(), 1.);
+}
+
+int Effect::requestedEffectChainPosition() const
+{
+    return 0;
+}
+
+xcb_connection_t *Effect::xcbConnection() const
+{
+    return effects->xcbConnection();
+}
+
+xcb_window_t Effect::x11RootWindow() const
+{
+    return effects->x11RootWindow();
+}
+
+bool Effect::touchDown(qint32 id, const QPointF &pos, std::chrono::microseconds time)
+{
+    return false;
+}
+
+bool Effect::touchMotion(qint32 id, const QPointF &pos, std::chrono::microseconds time)
+{
+    return false;
+}
+
+bool Effect::touchUp(qint32 id, std::chrono::microseconds time)
+{
+    return false;
+}
+
+bool Effect::perform(Feature feature, const QVariantList &arguments)
+{
+    return false;
+}
+
+bool Effect::tabletToolEvent(QTabletEvent *event)
+{
+    return false;
+}
+
+bool Effect::tabletToolButtonEvent(uint button, bool pressed, quint64 tabletToolId)
+{
+    return false;
+}
+
+bool Effect::tabletPadButtonEvent(uint button, bool pressed, void *tabletPadId)
+{
+    return false;
+}
+
+bool Effect::tabletPadStripEvent(int number, int position, bool isFinger, void *tabletPadId)
+{
+    return false;
+}
+
+bool Effect::tabletPadRingEvent(int number, int position, bool isFinger, void *tabletPadId)
+{
+    return false;
+}
+
+bool Effect::blocksDirectScanout() const
+{
+    return true;
+}
+
+EffectPluginFactory::EffectPluginFactory()
+{
+}
+
+EffectPluginFactory::~EffectPluginFactory()
+{
+}
+
+bool EffectPluginFactory::enabledByDefault() const
+{
+    return true;
+}
+
+bool EffectPluginFactory::isSupported() const
+{
+    return true;
+}
+
+} // namespace KWin
+
+#include "moc_effect.cpp"

src/libkwineffects/kwineffects.cpp

@@ -29,9 +29,6 @@
 #include <QWindow>
 #include <QtMath>
 
-#include <kconfiggroup.h>
-#include <ksharedconfig.h>
-
 #include <optional>
 
 namespace KWin
@@ -65,571 +62,6 @@ static void deleteWindowProperty(xcb_window_t win, long int atom)
     xcb_delete_property(kwinApp()->x11Connection(), win, atom);
 }
 
-void WindowPrePaintData::setTranslucent()
-{
-    mask |= Effect::PAINT_WINDOW_TRANSLUCENT;
-    mask &= ~Effect::PAINT_WINDOW_OPAQUE;
-    opaque = QRegion(); // cannot clip, will be transparent
-}
-
-void WindowPrePaintData::setTransformed()
-{
-    mask |= Effect::PAINT_WINDOW_TRANSFORMED;
-}
-
-class PaintDataPrivate
-{
-public:
-    PaintDataPrivate()
-        : scale(1., 1., 1.)
-        , rotationAxis(0, 0, 1.)
-        , rotationAngle(0.)
-    {
-    }
-    QVector3D scale;
-    QVector3D translation;
-
-    QVector3D rotationAxis;
-    QVector3D rotationOrigin;
-    qreal rotationAngle;
-};
-
-PaintData::PaintData()
-    : d(std::make_unique<PaintDataPrivate>())
-{
-}
-
-PaintData::~PaintData() = default;
-
-qreal PaintData::xScale() const
-{
-    return d->scale.x();
-}
-
-qreal PaintData::yScale() const
-{
-    return d->scale.y();
-}
-
-qreal PaintData::zScale() const
-{
-    return d->scale.z();
-}
-
-void PaintData::setScale(const QVector2D &scale)
-{
-    d->scale.setX(scale.x());
-    d->scale.setY(scale.y());
-}
-
-void PaintData::setScale(const QVector3D &scale)
-{
-    d->scale = scale;
-}
-void PaintData::setXScale(qreal scale)
-{
-    d->scale.setX(scale);
-}
-
-void PaintData::setYScale(qreal scale)
-{
-    d->scale.setY(scale);
-}
-
-void PaintData::setZScale(qreal scale)
-{
-    d->scale.setZ(scale);
-}
-
-const QVector3D &PaintData::scale() const
-{
-    return d->scale;
-}
-
-void PaintData::setXTranslation(qreal translate)
-{
-    d->translation.setX(translate);
-}
-
-void PaintData::setYTranslation(qreal translate)
-{
-    d->translation.setY(translate);
-}
-
-void PaintData::setZTranslation(qreal translate)
-{
-    d->translation.setZ(translate);
-}
-
-void PaintData::translate(qreal x, qreal y, qreal z)
-{
-    translate(QVector3D(x, y, z));
-}
-
-void PaintData::translate(const QVector3D &t)
-{
-    d->translation += t;
-}
-
-qreal PaintData::xTranslation() const
-{
-    return d->translation.x();
-}
-
-qreal PaintData::yTranslation() const
-{
-    return d->translation.y();
-}
-
-qreal PaintData::zTranslation() const
-{
-    return d->translation.z();
-}
-
-const QVector3D &PaintData::translation() const
-{
-    return d->translation;
-}
-
-qreal PaintData::rotationAngle() const
-{
-    return d->rotationAngle;
-}
-
-QVector3D PaintData::rotationAxis() const
-{
-    return d->rotationAxis;
-}
-
-QVector3D PaintData::rotationOrigin() const
-{
-    return d->rotationOrigin;
-}
-
-void PaintData::setRotationAngle(qreal angle)
-{
-    d->rotationAngle = angle;
-}
-
-void PaintData::setRotationAxis(Qt::Axis axis)
-{
-    switch (axis) {
-    case Qt::XAxis:
-        setRotationAxis(QVector3D(1, 0, 0));
-        break;
-    case Qt::YAxis:
-        setRotationAxis(QVector3D(0, 1, 0));
-        break;
-    case Qt::ZAxis:
-        setRotationAxis(QVector3D(0, 0, 1));
-        break;
-    }
-}
-
-void PaintData::setRotationAxis(const QVector3D &axis)
-{
-    d->rotationAxis = axis;
-}
-
-void PaintData::setRotationOrigin(const QVector3D &origin)
-{
-    d->rotationOrigin = origin;
-}
-
-QMatrix4x4 PaintData::toMatrix(qreal deviceScale) const
-{
-    QMatrix4x4 ret;
-    if (d->translation != QVector3D(0, 0, 0)) {
-        ret.translate(d->translation * deviceScale);
-    }
-    if (d->scale != QVector3D(1, 1, 1)) {
-        ret.scale(d->scale);
-    }
-
-    if (d->rotationAngle != 0) {
-        ret.translate(d->rotationOrigin * deviceScale);
-        ret.rotate(d->rotationAngle, d->rotationAxis);
-        ret.translate(-d->rotationOrigin * deviceScale);
-    }
-
-    return ret;
-}
-
-class WindowPaintDataPrivate
-{
-public:
-    qreal opacity;
-    qreal saturation;
-    qreal brightness;
-    int screen;
-    qreal crossFadeProgress;
-    QMatrix4x4 projectionMatrix;
-};
-
-WindowPaintData::WindowPaintData()
-    : WindowPaintData(QMatrix4x4())
-{
-}
-
-WindowPaintData::WindowPaintData(const QMatrix4x4 &projectionMatrix)
-    : PaintData()
-    , d(std::make_unique<WindowPaintDataPrivate>())
-{
-    setProjectionMatrix(projectionMatrix);
-    setOpacity(1.0);
-    setSaturation(1.0);
-    setBrightness(1.0);
-    setScreen(0);
-    setCrossFadeProgress(0.0);
-}
-
-WindowPaintData::WindowPaintData(const WindowPaintData &other)
-    : PaintData()
-    , d(std::make_unique<WindowPaintDataPrivate>())
-{
-    setXScale(other.xScale());
-    setYScale(other.yScale());
-    setZScale(other.zScale());
-    translate(other.translation());
-    setRotationOrigin(other.rotationOrigin());
-    setRotationAxis(other.rotationAxis());
-    setRotationAngle(other.rotationAngle());
-    setOpacity(other.opacity());
-    setSaturation(other.saturation());
-    setBrightness(other.brightness());
-    setScreen(other.screen());
-    setCrossFadeProgress(other.crossFadeProgress());
-    setProjectionMatrix(other.projectionMatrix());
-}
-
-WindowPaintData::~WindowPaintData() = default;
-
-qreal WindowPaintData::opacity() const
-{
-    return d->opacity;
-}
-
-qreal WindowPaintData::saturation() const
-{
-    return d->saturation;
-}
-
-qreal WindowPaintData::brightness() const
-{
-    return d->brightness;
-}
-
-int WindowPaintData::screen() const
-{
-    return d->screen;
-}
-
-void WindowPaintData::setOpacity(qreal opacity)
-{
-    d->opacity = opacity;
-}
-
-void WindowPaintData::setSaturation(qreal saturation) const
-{
-    d->saturation = saturation;
-}
-
-void WindowPaintData::setBrightness(qreal brightness)
-{
-    d->brightness = brightness;
-}
-
-void WindowPaintData::setScreen(int screen) const
-{
-    d->screen = screen;
-}
-
-qreal WindowPaintData::crossFadeProgress() const
-{
-    return d->crossFadeProgress;
-}
-
-void WindowPaintData::setCrossFadeProgress(qreal factor)
-{
-    d->crossFadeProgress = std::clamp(factor, 0.0, 1.0);
-}
-
-qreal WindowPaintData::multiplyOpacity(qreal factor)
-{
-    d->opacity *= factor;
-    return d->opacity;
-}
-
-qreal WindowPaintData::multiplySaturation(qreal factor)
-{
-    d->saturation *= factor;
-    return d->saturation;
-}
-
-qreal WindowPaintData::multiplyBrightness(qreal factor)
-{
-    d->brightness *= factor;
-    return d->brightness;
-}
-
-void WindowPaintData::setProjectionMatrix(const QMatrix4x4 &matrix)
-{
-    d->projectionMatrix = matrix;
-}
-
-QMatrix4x4 WindowPaintData::projectionMatrix() const
-{
-    return d->projectionMatrix;
-}
-
-QMatrix4x4 &WindowPaintData::rprojectionMatrix()
-{
-    return d->projectionMatrix;
-}
-
-WindowPaintData &WindowPaintData::operator*=(qreal scale)
-{
-    this->setXScale(this->xScale() * scale);
-    this->setYScale(this->yScale() * scale);
-    this->setZScale(this->zScale() * scale);
-    return *this;
-}
-
-WindowPaintData &WindowPaintData::operator*=(const QVector2D &scale)
-{
-    this->setXScale(this->xScale() * scale.x());
-    this->setYScale(this->yScale() * scale.y());
-    return *this;
-}
-
-WindowPaintData &WindowPaintData::operator*=(const QVector3D &scale)
-{
-    this->setXScale(this->xScale() * scale.x());
-    this->setYScale(this->yScale() * scale.y());
-    this->setZScale(this->zScale() * scale.z());
-    return *this;
-}
-
-WindowPaintData &WindowPaintData::operator+=(const QPointF &translation)
-{
-    return this->operator+=(QVector3D(translation));
-}
-
-WindowPaintData &WindowPaintData::operator+=(const QPoint &translation)
-{
-    return this->operator+=(QVector3D(translation));
-}
-
-WindowPaintData &WindowPaintData::operator+=(const QVector2D &translation)
-{
-    return this->operator+=(QVector3D(translation));
-}
-
-WindowPaintData &WindowPaintData::operator+=(const QVector3D &translation)
-{
-    translate(translation);
-    return *this;
-}
-
-//****************************************
-// Effect
-//****************************************
-
-Effect::Effect(QObject *parent)
-    : QObject(parent)
-{
-}
-
-Effect::~Effect()
-{
-}
-
-void Effect::reconfigure(ReconfigureFlags)
-{
-}
-
-void Effect::windowInputMouseEvent(QEvent *)
-{
-}
-
-void Effect::grabbedKeyboardEvent(QKeyEvent *)
-{
-}
-
-bool Effect::borderActivated(ElectricBorder)
-{
-    return false;
-}
-
-void Effect::prePaintScreen(ScreenPrePaintData &data, std::chrono::milliseconds presentTime)
-{
-    effects->prePaintScreen(data, presentTime);
-}
-
-void Effect::paintScreen(const RenderTarget &renderTarget, const RenderViewport &viewport, int mask, const QRegion &region, Output *screen)
-{
-    effects->paintScreen(renderTarget, viewport, mask, region, screen);
-}
-
-void Effect::postPaintScreen()
-{
-    effects->postPaintScreen();
-}
-
-void Effect::prePaintWindow(EffectWindow *w, WindowPrePaintData &data, std::chrono::milliseconds presentTime)
-{
-    effects->prePaintWindow(w, data, presentTime);
-}
-
-void Effect::paintWindow(const RenderTarget &renderTarget, const RenderViewport &viewport, EffectWindow *w, int mask, QRegion region, WindowPaintData &data)
-{
-    effects->paintWindow(renderTarget, viewport, w, mask, region, data);
-}
-
-void Effect::postPaintWindow(EffectWindow *w)
-{
-    effects->postPaintWindow(w);
-}
-
-bool Effect::provides(Feature)
-{
-    return false;
-}
-
-bool Effect::isActive() const
-{
-    return true;
-}
-
-QString Effect::debug(const QString &) const
-{
-    return QString();
-}
-
-void Effect::drawWindow(const RenderTarget &renderTarget, const RenderViewport &viewport, EffectWindow *w, int mask, const QRegion &region, WindowPaintData &data)
-{
-    effects->drawWindow(renderTarget, viewport, w, mask, region, data);
-}
-
-void Effect::setPositionTransformations(WindowPaintData &data, QRect &region, EffectWindow *w,
-                                        const QRect &r, Qt::AspectRatioMode aspect)
-{
-    QSizeF size = w->size();
-    size.scale(r.size(), aspect);
-    data.setXScale(size.width() / double(w->width()));
-    data.setYScale(size.height() / double(w->height()));
-    int width = int(w->width() * data.xScale());
-    int height = int(w->height() * data.yScale());
-    int x = r.x() + (r.width() - width) / 2;
-    int y = r.y() + (r.height() - height) / 2;
-    region = QRect(x, y, width, height);
-    data.setXTranslation(x - w->x());
-    data.setYTranslation(y - w->y());
-}
-
-QPointF Effect::cursorPos()
-{
-    return effects->cursorPos();
-}
-
-double Effect::animationTime(const KConfigGroup &cfg, const QString &key, int defaultTime)
-{
-    int time = cfg.readEntry(key, 0);
-    return time != 0 ? time : std::max(defaultTime * effects->animationTimeFactor(), 1.);
-}
-
-double Effect::animationTime(int defaultTime)
-{
-    // at least 1ms, otherwise 0ms times can break some things
-    return std::max(defaultTime * effects->animationTimeFactor(), 1.);
-}
-
-int Effect::requestedEffectChainPosition() const
-{
-    return 0;
-}
-
-xcb_connection_t *Effect::xcbConnection() const
-{
-    return effects->xcbConnection();
-}
-
-xcb_window_t Effect::x11RootWindow() const
-{
-    return effects->x11RootWindow();
-}
-
-bool Effect::touchDown(qint32 id, const QPointF &pos, std::chrono::microseconds time)
-{
-    return false;
-}
-
-bool Effect::touchMotion(qint32 id, const QPointF &pos, std::chrono::microseconds time)
-{
-    return false;
-}
-
-bool Effect::touchUp(qint32 id, std::chrono::microseconds time)
-{
-    return false;
-}
-
-bool Effect::perform(Feature feature, const QVariantList &arguments)
-{
-    return false;
-}
-
-bool Effect::tabletToolEvent(QTabletEvent *event)
-{
-    return false;
-}
-
-bool Effect::tabletToolButtonEvent(uint button, bool pressed, quint64 tabletToolId)
-{
-    return false;
-}
-
-bool Effect::tabletPadButtonEvent(uint button, bool pressed, void *tabletPadId)
-{
-    return false;
-}
-
-bool Effect::tabletPadStripEvent(int number, int position, bool isFinger, void *tabletPadId)
-{
-    return false;
-}
-
-bool Effect::tabletPadRingEvent(int number, int position, bool isFinger, void *tabletPadId)
-{
-    return false;
-}
-
-bool Effect::blocksDirectScanout() const
-{
-    return true;
-}
-
-//****************************************
-// EffectFactory
-//****************************************
-EffectPluginFactory::EffectPluginFactory()
-{
-}
-
-EffectPluginFactory::~EffectPluginFactory()
-{
-}
-
-bool EffectPluginFactory::enabledByDefault() const
-{
-    return true;
-}
-
-bool EffectPluginFactory::isSupported() const
-{
-    return true;
-}
-
 //****************************************
 // EffectsHandler
 //****************************************

src/libkwineffects/kwinquickeffect.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include "libkwineffects/kwinoffscreenquickview.h"
 
 #include <QQmlComponent>

src/plugins/backgroundcontrast/contrast.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include "opengl/glplatform.h"
 #include "opengl/glutils.h"
 

src/plugins/blur/blur.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include "opengl/glutils.h"
 
 #include <QList>

src/plugins/colorpicker/colorpicker.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include <QColor>
 #include <QDBusContext>
 #include <QDBusMessage>

src/plugins/diminactive/diminactive.cpp

@@ -11,6 +11,7 @@
 
 // own
 #include "diminactive.h"
+#include "libkwineffects/kwineffects.h"
 
 // KConfigSkeleton
 #include "diminactiveconfig.h"

src/plugins/diminactive/diminactive.h

@@ -12,12 +12,14 @@
 #pragma once
 
 // kwineffects
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin
 {
 
+class EffectWindowGroup;
+
 class DimInactiveEffect : public Effect
 {
     Q_OBJECT

src/plugins/mouseclick/mouseclick.h

@@ -9,8 +9,8 @@
 
 #pragma once
 
+#include "libkwineffects/effect.h"
 #include "libkwineffects/effectframe.h"
-#include "libkwineffects/kwineffects.h"
 #include "opengl/glutils.h"
 #include <KLocalizedString>
 #include <QFont>

src/plugins/mousemark/mousemark.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include "opengl/glutils.h"
 
 namespace KWin

src/plugins/outputlocator/outputlocator.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 
 #include <QTimer>
 

src/plugins/screenedge/screenedgeeffect.h

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 
 #include <KConfigWatcher>
 

src/plugins/screenshot/screenshot.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 
 #include <QFuture>
 #include <QImage>

src/plugins/screenshot/screenshotdbusinterface2.cpp

@@ -8,6 +8,7 @@
 
 #include "screenshotdbusinterface2.h"
 #include "core/output.h"
+#include "libkwineffects/kwineffects.h"
 #include "screenshot2adaptor.h"
 #include "screenshotlogging.h"
 #include "utils/filedescriptor.h"

src/plugins/screentransform/screentransform.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin

src/plugins/showpaint/showpaint.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 
 namespace KWin
 {

src/plugins/snaphelper/snaphelper.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin

src/plugins/startupfeedback/startupfeedback.h

@@ -8,7 +8,7 @@
 */
 
 #pragma once
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include <KConfigWatcher>
 #include <KStartupInfo>
 #include <QObject>

src/plugins/thumbnailaside/thumbnailaside.cpp

@@ -9,11 +9,11 @@
 */
 
 #include "thumbnailaside.h"
+#include "core/renderviewport.h"
+#include "libkwineffects/kwineffects.h"
 // KConfigSkeleton
 #include "thumbnailasideconfig.h"
 
-#include "core/renderviewport.h"
-
 #include <KGlobalAccel>
 #include <KLocalizedString>
 

src/plugins/thumbnailaside/thumbnailaside.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 
 #include <QHash>
 

src/plugins/touchpoints/touchpoints.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 
 namespace KWin
 {

src/plugins/trackmouse/trackmouse.h

@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 
 class QAction;
 

src/plugins/zoom/zoom.h

@@ -12,7 +12,7 @@
 
 #include <config-kwin.h>
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effect.h"
 #include <QTime>
 #include <QTimeLine>