generic: various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/kcontrol/componentchooser/windowmanagers/CMakeLists.txt b/kcontrol/componentchooser/windowmanagers/CMakeLists.txt
index b05c7e6..b8b4d02 100644 (file)
--- a/kcontrol/componentchooser/windowmanagers/CMakeLists.txt
+++ b/kcontrol/componentchooser/windowmanagers/CMakeLists.txt
@@ -7,13 +7,6 @@ install(
     marco.desktop
     metacity.desktop
     openbox.desktop
+    xfwm4.desktop
     DESTINATION ${DATA_INSTALL_DIR}/ksmserver/windowmanagers
 )
-
-if(OPENGLES_FOUND)
-    install(
-        FILES
-        kwin_gles.desktop
-        DESTINATION ${DATA_INSTALL_DIR}/ksmserver/windowmanagers
-    )
-endif()

diff --git a/kwin/paintredirector.cpp b/kwin/paintredirector.cpp
index 370c466..7aa8e9e 100644 (file)
--- a/kwin/paintredirector.cpp
+++ b/kwin/paintredirector.cpp
@@ -258,48 +258,10 @@ void PaintRedirector::paint(DecorationPixmap border, const QRect& r, const QRect
 
 
 
-
-// ------------------------------------------------------------------
-
-
-
-
-ImageBasedPaintRedirector::ImageBasedPaintRedirector(Client *c, QWidget *widget)
-    : PaintRedirector(c, widget)
-{
-}
-
-ImageBasedPaintRedirector::~ImageBasedPaintRedirector()
-{
-}
-
-QPaintDevice *ImageBasedPaintRedirector::recreateScratch(const QSize &size)
-{
-    m_scratchImage = QImage(size, QImage::Format_ARGB32_Premultiplied);
-    return &m_scratchImage;
-}
-
-QPaintDevice *ImageBasedPaintRedirector::scratch()
-{
-    return &m_scratchImage;
-}
-
-void ImageBasedPaintRedirector::fillScratch(Qt::GlobalColor color)
-{
-    m_scratchImage.fill(color);
-}
-
-void ImageBasedPaintRedirector::discardScratch()
-{
-    m_scratchImage = QImage();
-}
-
-
 // ------------------------------------------------------------------
 
-
 RasterXRenderPaintRedirector::RasterXRenderPaintRedirector(Client *c, QWidget *widget)
-    : ImageBasedPaintRedirector(c, widget)
+    : PaintRedirector(c, widget)
     , m_gc(0)
 {
     for (int i=0; i<PixmapCount; ++i) {
@@ -358,11 +320,36 @@ void RasterXRenderPaintRedirector::paint(PaintRedirector::DecorationPixmap borde
         xcb_create_gc(connection(), m_gc, m_pixmaps[border], 0, NULL);
     }
 
-    const QImage img(scratchImage().copy(QRect(bounding.topLeft() - b.topLeft(), bounding.size())));
+    const QImage img(m_scratchImage.copy(QRect(bounding.topLeft() - b.topLeft(), bounding.size())));
     xcb_put_image(connection(), XCB_IMAGE_FORMAT_Z_PIXMAP, m_pixmaps[border], m_gc,
                   img.width(), img.height(), offset.x(), offset.y(), 0, 32, img.byteCount(), img.constBits());
 }
 
+QPaintDevice *RasterXRenderPaintRedirector::recreateScratch(const QSize &size)
+{
+    m_scratchImage = QImage(size, QImage::Format_ARGB32_Premultiplied);
+    return &m_scratchImage;
+}
+
+QPaintDevice *RasterXRenderPaintRedirector::scratch()
+{
+    return &m_scratchImage;
+}
+
+void RasterXRenderPaintRedirector::fillScratch(Qt::GlobalColor color)
+{
+    m_scratchImage.fill(color);
+}
+
+void RasterXRenderPaintRedirector::discardScratch()
+{
+    m_scratchImage = QImage();
+}
+
+
+
+// ------------------------------------------------------------------
+
 NativeXRenderPaintRedirector::NativeXRenderPaintRedirector(Client *c, QWidget *widget)
     : PaintRedirector(c, widget)
 {

diff --git a/kwin/paintredirector.h b/kwin/paintredirector.h
index 97cb998..59ab7a1 100644 (file)
--- a/kwin/paintredirector.h
+++ b/kwin/paintredirector.h
@@ -118,22 +118,6 @@ private:
     bool m_requiresRepaint;
 };
 
-class ImageBasedPaintRedirector : public PaintRedirector
-{
-    Q_OBJECT
-public:
-    virtual ~ImageBasedPaintRedirector();
-protected:
-    ImageBasedPaintRedirector(Client *c, QWidget *widget);
-    virtual QPaintDevice *recreateScratch(const QSize &size);
-    virtual QPaintDevice *scratch();
-    virtual void fillScratch(Qt::GlobalColor color);
-    virtual void discardScratch();
-    const QImage &scratchImage() const;
-private:
-    QImage m_scratchImage;
-};
-
 class NativeXRenderPaintRedirector : public PaintRedirector
 {
     Q_OBJECT
@@ -154,7 +138,7 @@ private:
     QPixmap m_scratch;
 };
 
-class RasterXRenderPaintRedirector : public ImageBasedPaintRedirector
+class RasterXRenderPaintRedirector : public PaintRedirector
 {
     Q_OBJECT
 public:
@@ -166,12 +150,18 @@ protected:
     virtual void resize(DecorationPixmap border, const QSize &size);
     virtual void paint(DecorationPixmap border, const QRect &r, const QRect &b, const QRegion &reg);
     virtual void preparePaint(const QPixmap &pending);
+
+    virtual QPaintDevice *recreateScratch(const QSize &size);
+    virtual QPaintDevice *scratch();
+    virtual void fillScratch(Qt::GlobalColor color);
+    virtual void discardScratch();
 private:
     QSize m_sizes[PixmapCount];
     xcb_pixmap_t m_pixmaps[PixmapCount];
     xcb_gcontext_t m_gc;
     XRenderPicture* m_pictures[PixmapCount];
     QImage m_tempImage;
+    QImage m_scratchImage;
 };
 
 template <>
@@ -202,12 +192,6 @@ xcb_render_picture_t PaintRedirector::topDecoPixmap() const
     return picture(TopPixmap);
 }
 
-inline
-const QImage &ImageBasedPaintRedirector::scratchImage() const
-{
-    return m_scratchImage;
-}
-
 } // namespace
 
 #endif