Compositor 0.3

Don't require OpenGL

buildroot/package/compositor/compositor.mk

@@ -5,7 +5,7 @@
 #############################################################
 
 
-COMPOSITOR_VERSION = 0.2
+COMPOSITOR_VERSION = 0.3
 COMPOSITOR_SITE = $(TOPDIR)/../qwindow-compositor
 COMPOSITOR_SITE_METHOD = local
 COMPOSITOR_LICENSE = BSD-3c

qwindow-compositor/main.cpp

@@ -61,6 +61,7 @@ int main(int argc, char *argv[])
     window.setCompositor(&compositor);
     window.resize(800,600);
     window.show();
+    window.init();
 
     return app.exec();
 }

qwindow-compositor/qwindow-compositor.qrc

@@ -1,5 +1,5 @@
 <RCC>
     <qresource>
-        <file alias="background.jpg">background.jpg</file>
+        <file alias="wallpaper.png">wallpaper.png</file>
     </qresource>
 </RCC>

qwindow-compositor/window.cpp

@@ -51,16 +51,17 @@
 #include "window.h"
 
 #include <QMouseEvent>
-#include <QOpenGLWindow>
-#include <QOpenGLTexture>
-#include <QOpenGLFunctions>
+#include <QWindow>
+#include <QBackingStore>
 #include <QMatrix4x4>
 #include <QPainter>
 
 #include "compositor.h"
 #include <QtWaylandCompositor/qwaylandseat.h>
 
 Window::Window()
+	:QWindow()
+	, m_backingStore(new QBackingStore(this))
 {
 }
 
@@ -71,10 +72,12 @@ void Window::setCompositor(Compositor *comp) {
     connect(m_compositor, &Compositor::dragStarted, this, &Window::startDrag);
 }
 
-void Window::initializeGL()
+void Window::init()
 {
-    m_textureBlitter.create();
-    m_compositor->create(); // the compositor's hardware integration may depend on GL
+    m_compositor->create();
+    m_compositor->startRender();
+    drawBackground();
+    m_compositor->endRender();
 }
 
 void Window::drawBackground()
@@ -86,12 +89,14 @@ void Window::drawBackground()
     if(this->geometry().width() < backgroundImage.width() || this->geometry().height() < backgroundImage.height()) {
         backgroundImage = m_backgroundImage.scaled(this->geometry().size(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
     }
-    QPainter painter(this);
+    QPaintDevice *device = m_backingStore->paintDevice();
+    QPainter painter(device);
     int deltaX = this->geometry().width() - backgroundImage.width();
     int deltaY = this->geometry().height() - backgroundImage.height();
     painter.drawImage(this->geometry(), backgroundColorImage);
     painter.translate(deltaX / 2, deltaY / 2);
     painter.drawImage(backgroundImage.rect(), backgroundImage);
+    painter.end();
 }
 
 QPointF Window::getAnchorPosition(const QPointF &position, int resizeEdge, const QSize &windowSize)
@@ -112,53 +117,6 @@ QPointF Window::getAnchoredPosition(const QPointF &anchorPosition, int resizeEdg
     return anchorPosition - getAnchorPosition(QPointF(), resizeEdge, windowSize);
 }
 
-void Window::paintGL()
-{
-    m_compositor->startRender();
-    QOpenGLFunctions *functions = context()->functions();
-    functions->glClearColor(1.f, .6f, .0f, 0.5f);
-    functions->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    m_textureBlitter.bind();
-    drawBackground();
-
-    functions->glEnable(GL_BLEND);
-    functions->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    GLenum currentTarget = GL_TEXTURE_2D;
-    const auto views = m_compositor->views();
-    for (View *view : views) {
-        if (view->isCursor())
-            continue;
-        auto texture = view->getTexture();
-        if (!texture)
-            continue;
-        if (texture->target() != currentTarget) {
-            currentTarget = texture->target();
-            m_textureBlitter.bind(currentTarget);
-        }
-        QWaylandSurface *surface = view->surface();
-        if ((surface && surface->hasContent()) || view->isBufferLocked()) {
-            QSize s = view->size();
-            if (!s.isEmpty()) {
-                if (m_mouseView == view && m_grabState == ResizeGrab && m_resizeAnchored)
-                    view->setPosition(getAnchoredPosition(m_resizeAnchorPosition, m_resizeEdge, s));
-                QPointF pos = view->position() + view->parentPosition();
-                QRectF surfaceGeometry(pos, s);
-                auto surfaceOrigin = view->textureOrigin();
-                auto sf = view->animationFactor();
-                QRectF targetRect(surfaceGeometry.topLeft() * sf, surfaceGeometry.size() * sf);
-                QMatrix4x4 targetTransform = QOpenGLTextureBlitter::targetTransform(targetRect, QRect(QPoint(), size()));
-                m_textureBlitter.blit(texture->textureId(), targetTransform, surfaceOrigin);
-            }
-        }
-    }
-    functions->glDisable(GL_BLEND);
-
-    m_textureBlitter.release();
-    m_compositor->endRender();
-}
-
 View *Window::viewAt(const QPointF &point)
 {
     View *ret = nullptr;
@@ -281,3 +239,36 @@ void Window::keyReleaseEvent(QKeyEvent *e)
 {
     m_compositor->defaultSeat()->sendKeyReleaseEvent(e->nativeScanCode());
 }
+
+void Window::update()
+{
+    if (!isExposed())
+        return;
+
+    QRect rect(0, 0, width(), height());
+    m_backingStore->beginPaint(rect);
+
+    drawBackground();
+    m_backingStore->endPaint();
+    m_backingStore->flush(rect);
+}
+
+bool Window::event(QEvent *event)
+{
+    if (event->type() == QEvent::UpdateRequest) {
+        update();
+        return true;
+    }
+    return QWindow::event(event);
+}
+
+void Window::exposeEvent(QExposeEvent *)
+{
+    if (isExposed())
+        update();
+}
+
+void Window::resizeEvent(QResizeEvent *resizeEvent)
+{
+    m_backingStore->resize(resizeEvent->size());
+}

qwindow-compositor/window.h

@@ -51,26 +51,30 @@
 #ifndef COMPOSITORWINDOW_H
 #define COMPOSITORWINDOW_H
 
-#include <QOpenGLWindow>
+#include <QWindow>
 #include <QPointer>
-#include <QOpenGLTextureBlitter>
 
 QT_BEGIN_NAMESPACE
 
 class Compositor;
 class View;
-class QOpenGLTexture;
 
-class Window : public QOpenGLWindow
+class Window : public QWindow
 {
 public:
     Window();
 
     void setCompositor(Compositor *comp);
+    void init();
+
+public slots:
+    void update();
 
 protected:
-    void initializeGL() override;
-    void paintGL() override;
+    bool event(QEvent *event) override;
+
+    void resizeEvent(QResizeEvent *event) override;
+    void exposeEvent(QExposeEvent *event) override;
 
     void mousePressEvent(QMouseEvent *e) override;
     void mouseReleaseEvent(QMouseEvent *e) override;
@@ -94,9 +98,7 @@ private slots:
     static QPointF getAnchoredPosition(const QPointF &anchorPosition, int resizeEdge, const QSize &windowSize);
     static QPointF getAnchorPosition(const QPointF &position, int resizeEdge, const QSize &windowSize);
 
-    QOpenGLTextureBlitter m_textureBlitter;
-    QImage m_backgroundImage = QImage(QLatin1String(":/background.jpg"));
-    QOpenGLTexture *m_backgroundTexture = nullptr;
+    QImage m_backgroundImage = QImage(QLatin1String(":/wallpaper.png"));
     Compositor *m_compositor = nullptr;
     QPointer<View> m_mouseView;
     GrabState m_grabState = NoGrab;
@@ -107,6 +109,7 @@ private slots:
     QPointF m_mouseOffset;
     QPointF m_initialMousePos;
     View *m_dragIconView = nullptr;
+    QBackingStore *m_backingStore = nullptr;
 };
 
 QT_END_NAMESPACE