From e862bfe569694bc6d7b94101ea1616ee3286d4b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= <fredrik@kde.org>
Date: Sat, 16 Mar 2013 14:45:14 +0100
Subject: [PATCH] kwin: Refactor some code in the PaintRedirector

Add virtual resizePixmaps() and updatePixmaps() methods that resizes and
updates all the pixmaps. Make resize() and paint() regular virtuals
with stub implementations.

The new methods will be used by OpenGLPaintRedirector in the next commit.
---
 paintredirector.cpp | 64 +++++++++++++++++++++++++++++++++------------
 paintredirector.h   |  7 +++--
 2 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/paintredirector.cpp b/paintredirector.cpp
index 41974d2126..34ef613a47 100644
--- a/paintredirector.cpp
+++ b/paintredirector.cpp
@@ -187,9 +187,7 @@ void PaintRedirector::ensurePixmapsPainted()
     QRect rects[PixmapCount];
     m_client->layoutDecorationRects(rects[LeftPixmap], rects[TopPixmap], rects[RightPixmap], rects[BottomPixmap], Client::DecorationRelative);
 
-    for (int i=0; i<PixmapCount; ++i) {
-        repaintPixmap(DecorationPixmap(i), rects[i], pending);
-    }
+    updatePixmaps(rects, pending);
 
     pending = QRegion();
     scheduled = QRegion();
@@ -197,30 +195,33 @@ void PaintRedirector::ensurePixmapsPainted()
     xcb_flush(connection());
 }
 
+void PaintRedirector::updatePixmaps(const QRect *rects, const QRegion &region)
+{
+    for (int i = 0; i < PixmapCount; ++i) {
+        if (!rects[i].isValid())
+            continue;
+
+        const QRect bounding = region.boundingRect();
+        const QRegion reg = region & rects[i];
+
+        if (reg.isEmpty())
+            continue;
+
+        paint(DecorationPixmap(i), rects[i], bounding, reg);
+    }
+}
+
 void PaintRedirector::preparePaint(const QPixmap &pending)
 {
     Q_UNUSED(pending)
 }
 
-void PaintRedirector::repaintPixmap(DecorationPixmap border, const QRect &r, QRegion reg)
-{
-    if (!r.isValid())
-        return;
-    const QRect b = reg.boundingRect();
-    reg &= r;
-    if (reg.isEmpty())
-        return;
-    paint(border, r, b, reg);
-}
-
 void PaintRedirector::resizePixmaps()
 {
     QRect rects[PixmapCount];
     m_client->layoutDecorationRects(rects[LeftPixmap], rects[TopPixmap], rects[RightPixmap], rects[BottomPixmap], Client::DecorationRelative);
 
-    for (int i=0; i<PixmapCount; ++i) {
-        resize(DecorationPixmap(i), rects[i].size());
-    }
+    resizePixmaps(rects);
 
     // repaint
     if (widget) {
@@ -228,6 +229,13 @@ void PaintRedirector::resizePixmaps()
     }
 }
 
+void PaintRedirector::resizePixmaps(const QRect *rects)
+{
+    for (int i = 0; i < PixmapCount; ++i) {
+        resize(DecorationPixmap(i), rects[i].size());
+    }
+}
+
 GLTexture *PaintRedirector::texture(PaintRedirector::DecorationPixmap border) const
 {
     Q_UNUSED(border)
@@ -240,6 +248,28 @@ xcb_render_picture_t PaintRedirector::picture(PaintRedirector::DecorationPixmap
     return XCB_RENDER_PICTURE_NONE;
 }
 
+void PaintRedirector::resize(DecorationPixmap border, const QSize &size)
+{
+    Q_UNUSED(border)
+    Q_UNUSED(size)
+}
+
+void PaintRedirector::paint(DecorationPixmap border, const QRect& r, const QRect &b, const QRegion &reg)
+{
+    Q_UNUSED(border)
+    Q_UNUSED(r)
+    Q_UNUSED(b)
+    Q_UNUSED(reg)
+}
+
+
+
+
+// ------------------------------------------------------------------
+
+
+
+
 ImageBasedPaintRedirector::ImageBasedPaintRedirector(Client *c, QWidget *widget)
     : PaintRedirector(c, widget)
 {
diff --git a/paintredirector.h b/paintredirector.h
index 15502449ee..118b93e455 100644
--- a/paintredirector.h
+++ b/paintredirector.h
@@ -92,13 +92,16 @@ protected:
     PaintRedirector(Client *c, QWidget* widget);
     virtual xcb_render_picture_t picture(DecorationPixmap border) const;
     virtual GLTexture *texture(DecorationPixmap border) const;
-    virtual void resize(DecorationPixmap border, const QSize &size) = 0;
+    virtual void resizePixmaps(const QRect *rects);
+    virtual void resize(DecorationPixmap border, const QSize &size);
     virtual void preparePaint(const QPixmap &pending);
-    virtual void paint(DecorationPixmap border, const QRect& r, const QRect &b, const QRegion &reg) = 0;
+    virtual void updatePixmaps(const QRect *rects, const QRegion &region);
+    virtual void paint(DecorationPixmap border, const QRect& r, const QRect &b, const QRegion &reg);
     virtual QPaintDevice *scratch() = 0;
     virtual QPaintDevice *recreateScratch(const QSize &size) = 0;
     virtual void fillScratch(Qt::GlobalColor color) = 0;
     virtual void discardScratch() = 0;
+
 private:
     void added(QWidget* widget);
     void removed(QWidget* widget);