[wayland] Move FramebufferQPainterBackend into backends/fbdev

CMakeLists.txt

@@ -437,6 +437,7 @@ if(HAVE_WAYLAND)
             ${kwin_KDEINIT_SRCS}
             abstract_backend.cpp
             backends/fbdev/fb_backend.cpp
+            backends/fbdev/scene_qpainter_fb_backend.cpp
             backends/fbdev/screens_fb.cpp
             backends/wayland/screens_wayland.cpp
             backends/x11/screens_x11windowed.cpp

backends/fbdev/fb_backend.cpp

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "fb_backend.h"
 #include "composite.h"
 #include "logind.h"
-#include "scene_qpainter.h"
+#include "scene_qpainter_fb_backend.h"
 #include "screens_fb.h"
 #include "virtual_terminal.h"
 // Qt

backends/fbdev/scene_qpainter_fb_backend.cpp

@@ -0,0 +1,105 @@
+/********************************************************************
+ KWin - the KDE window manager
+ This file is part of the KDE project.
+
+Copyright (C) 2015 Martin Gräßlin <mgraesslin@kde.org>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************/
+#include "scene_qpainter_fb_backend.h"
+#include "fb_backend.h"
+#include "composite.h"
+#include "cursor.h"
+#include "virtual_terminal.h"
+// Qt
+#include <QPainter>
+
+namespace KWin
+{
+FramebufferQPainterBackend::FramebufferQPainterBackend(FramebufferBackend *backend)
+    : QObject()
+    , QPainterBackend()
+    , m_renderBuffer(backend->size(), QImage::Format_RGB32)
+    , m_backend(backend)
+{
+    m_renderBuffer.fill(Qt::black);
+
+    m_backend->map();
+
+    m_backBuffer = QImage((uchar*)backend->mappedMemory(),
+                          backend->bytesPerLine() / (backend->bitsPerPixel() / 8),
+                          backend->bufferSize() / backend->bytesPerLine(),
+                          backend->bytesPerLine(), backend->imageFormat());
+
+    m_backBuffer.fill(Qt::black);
+    connect(VirtualTerminal::self(), &VirtualTerminal::activeChanged, this,
+        [this] (bool active) {
+            if (active) {
+                Compositor::self()->bufferSwapComplete();
+                Compositor::self()->addRepaintFull();
+            } else {
+                Compositor::self()->aboutToSwapBuffers();
+            }
+        }
+    );
+}
+
+FramebufferQPainterBackend::~FramebufferQPainterBackend() = default;
+
+QImage *FramebufferQPainterBackend::buffer()
+{
+    return &m_renderBuffer;
+}
+
+bool FramebufferQPainterBackend::needsFullRepaint() const
+{
+    return false;
+}
+
+void FramebufferQPainterBackend::prepareRenderingFrame()
+{
+}
+
+void FramebufferQPainterBackend::present(int mask, const QRegion &damage)
+{
+    Q_UNUSED(mask)
+    Q_UNUSED(damage)
+    if (!VirtualTerminal::self()->isActive()) {
+        return;
+    }
+    QPainter p(&m_backBuffer);
+    p.drawImage(QPoint(0, 0), m_renderBuffer);
+}
+
+bool FramebufferQPainterBackend::usesOverlayWindow() const
+{
+    return false;
+}
+
+void FramebufferQPainterBackend::renderCursor(QPainter *painter)
+{
+    if (!m_backend->usesSoftwareCursor()) {
+        return;
+    }
+    const QImage img = m_backend->softwareCursor();
+    if (img.isNull()) {
+        return;
+    }
+    const QPoint cursorPos = Cursor::pos();
+    const QPoint hotspot = m_backend->softwareCursorHotspot();
+    painter->drawImage(cursorPos - hotspot, img);
+    m_backend->markCursorAsRendered();
+}
+
+}

backends/fbdev/scene_qpainter_fb_backend.h

@@ -0,0 +1,52 @@
+/********************************************************************
+ KWin - the KDE window manager
+ This file is part of the KDE project.
+
+Copyright (C) 2015 Martin Gräßlin <mgraesslin@kde.org>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************/
+#ifndef KWIN_SCENE_QPAINTER_FB_BACKEND_H
+#define KWIN_SCENE_QPAINTER_FB_BACKEND_H
+#include "scene_qpainter.h"
+
+#include <QObject>
+
+namespace KWin
+{
+class FramebufferBackend;
+
+class FramebufferQPainterBackend : public QObject, public QPainterBackend
+{
+    Q_OBJECT
+public:
+    FramebufferQPainterBackend(FramebufferBackend *backend);
+    virtual ~FramebufferQPainterBackend();
+
+    QImage *buffer() override;
+    bool needsFullRepaint() const override;
+    bool usesOverlayWindow() const override;
+    void prepareRenderingFrame() override;
+    void present(int mask, const QRegion &damage) override;
+    void renderCursor(QPainter *painter) override;
+
+private:
+    QImage m_renderBuffer;
+    QImage m_backBuffer;
+    FramebufferBackend *m_backend;
+};
+
+}
+
+#endif

scene_qpainter.cpp

@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "screens.h"
 #include "toplevel.h"
 #if HAVE_WAYLAND
-#include "backends/fbdev/fb_backend.h"
-#include "virtual_terminal.h"
 #include "backends/wayland/wayland_backend.h"
 #include "wayland_server.h"
 #include "backends/x11/x11windowed_backend.h"
@@ -266,84 +264,6 @@ bool X11WindowedQPainterBackend::usesOverlayWindow() const
     return false;
 }
 
-//****************************************
-// FramebufferBackend
-//****************************************
-FramebufferQPainterBackend::FramebufferQPainterBackend(FramebufferBackend *backend)
-    : QObject()
-    , QPainterBackend()
-    , m_renderBuffer(backend->size(), QImage::Format_RGB32)
-    , m_backend(backend)
-{
-    m_renderBuffer.fill(Qt::black);
-
-    m_backend->map();
-
-    m_backBuffer = QImage((uchar*)backend->mappedMemory(),
-                          backend->bytesPerLine() / (backend->bitsPerPixel() / 8),
-                          backend->bufferSize() / backend->bytesPerLine(),
-                          backend->bytesPerLine(), backend->imageFormat());
-
-    m_backBuffer.fill(Qt::black);
-    connect(VirtualTerminal::self(), &VirtualTerminal::activeChanged, this,
-        [this] (bool active) {
-            if (active) {
-                Compositor::self()->bufferSwapComplete();
-                Compositor::self()->addRepaintFull();
-            } else {
-                Compositor::self()->aboutToSwapBuffers();
-            }
-        }
-    );
-}
-
-FramebufferQPainterBackend::~FramebufferQPainterBackend() = default;
-
-QImage *FramebufferQPainterBackend::buffer()
-{
-    return &m_renderBuffer;
-}
-
-bool FramebufferQPainterBackend::needsFullRepaint() const
-{
-    return false;
-}
-
-void FramebufferQPainterBackend::prepareRenderingFrame()
-{
-}
-
-void FramebufferQPainterBackend::present(int mask, const QRegion &damage)
-{
-    Q_UNUSED(mask)
-    Q_UNUSED(damage)
-    if (!VirtualTerminal::self()->isActive()) {
-        return;
-    }
-    QPainter p(&m_backBuffer);
-    p.drawImage(QPoint(0, 0), m_renderBuffer);
-}
-
-bool FramebufferQPainterBackend::usesOverlayWindow() const
-{
-    return false;
-}
-
-void FramebufferQPainterBackend::renderCursor(QPainter *painter)
-{
-    if (!m_backend->usesSoftwareCursor()) {
-        return;
-    }
-    const QImage img = m_backend->softwareCursor();
-    if (img.isNull()) {
-        return;
-    }
-    const QPoint cursorPos = Cursor::pos();
-    const QPoint hotspot = m_backend->softwareCursorHotspot();
-    painter->drawImage(cursorPos - hotspot, img);
-    m_backend->markCursorAsRendered();
-}
-
 #endif
 
 //****************************************

scene_qpainter.h

@@ -44,7 +44,6 @@ namespace Wayland
 {
 class WaylandBackend;
 }
-class FramebufferBackend;
 class X11WindowedBackend;
 
 class QPainterBackend
@@ -167,26 +166,6 @@ private:
     X11WindowedBackend *m_backend;
 };
 
-class FramebufferQPainterBackend : public QObject, public QPainterBackend
-{
-    Q_OBJECT
-public:
-    FramebufferQPainterBackend(FramebufferBackend *backend);
-    virtual ~FramebufferQPainterBackend();
-
-    QImage *buffer() override;
-    bool needsFullRepaint() const override;
-    bool usesOverlayWindow() const override;
-    void prepareRenderingFrame() override;
-    void present(int mask, const QRegion &damage) override;
-    void renderCursor(QPainter *painter) override;
-
-private:
-    QImage m_renderBuffer;
-    QImage m_backBuffer;
-    FramebufferBackend *m_backend;
-};
-
 #endif
 
 class SceneQPainter : public Scene