Initial implementation of decorations for EGL windows.

Change-Id: I7521e583bf18f3690ecc6baacd05a5e92e9fd890
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

18 files changed, 559 insertions, 71 deletions

diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandegldecoration.cpp b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandegldecoration.cpp
new file mode 100644
index 000000000..5cf5239a8
--- /dev/null
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandegldecoration.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwaylandegldecoration.h"
+
+#include "qwaylandeglwindow.h"
+
+#include <QtGui/QPainter>
+#include <QtGui/QOpenGLPaintDevice>
+
+QWaylandEglDecoration::QWaylandEglDecoration(QWaylandEglWindow *window)
+    : QWaylandDecoration(window)
+{
+}
+
+QWaylandEglDecoration::~QWaylandEglDecoration()
+{
+}
+
+void QWaylandEglDecoration::paintDecoration()
+{
+    glClearColor(backgroundColor().redF(), backgroundColor().greenF(), backgroundColor().blueF(), backgroundColor().alphaF());
+    glClear(GL_COLOR_BUFFER_BIT);
+
+    QOpenGLPaintDevice device(window()->frameGeometry().size());
+    paint(&device);
+}
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandegldecoration.h b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandegldecoration.h
new file mode 100644
index 000000000..c1ef6d54a
--- /dev/null
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandegldecoration.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWAYLANDEGLDECORATION_H
+#define QWAYLANDEGLDECORATION_H
+
+#include "qwaylanddecoration.h"
+
+class QWaylandEglWindow;
+
+class QWaylandEglDecoration : public QWaylandDecoration
+{
+public:
+    QWaylandEglDecoration(QWaylandEglWindow *window);
+    ~QWaylandEglDecoration();
+
+    void paintDecoration();
+
+};
+
+#endif // QWAYLANDEGLDECORATION_H
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp
index e8599e41e..73768ddd6 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp
@@ -43,11 +43,15 @@
 
 #include "qwaylandscreen.h"
 #include "qwaylandglcontext.h"
+#include "qwaylandegldecoration.h"
 
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 
+#include <QDebug>
 #include <QtGui/QWindow>
 #include <qpa/qwindowsysteminterface.h>
+#include <QOpenGLFramebufferObject>
+#include <QOpenGLContext>
 
 #ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
 #include "windowmanager_integration/qwaylandwindowmanagerintegration.h"
@@ -56,11 +60,14 @@
 QWaylandEglWindow::QWaylandEglWindow(QWindow *window)
     : QWaylandWindow(window)
     , m_eglIntegration(static_cast<QWaylandEglIntegration *>(mDisplay->eglIntegration()))
-    , m_waylandEglWindow(wl_egl_window_create(mSurface,window->width(),window->height()))
+    , m_waylandEglWindow(0)
     , m_eglSurface(0)
     , m_eglConfig(0)
+    , m_contentFBO(0)
+    , m_resize(false)
     , m_format(window->format())
 {
+    setGeometry(window->geometry());
 }
 
 QWaylandEglWindow::~QWaylandEglWindow()
@@ -71,6 +78,8 @@ QWaylandEglWindow::~QWaylandEglWindow()
     }
 
     wl_egl_window_destroy(m_waylandEglWindow);
+
+    delete m_contentFBO;
 }
 
 QWaylandWindow::WindowType QWaylandEglWindow::windowType() const
@@ -80,14 +89,32 @@ QWaylandWindow::WindowType QWaylandEglWindow::windowType() const
 
 void QWaylandEglWindow::setGeometry(const QRect &rect)
 {
-    int current_width, current_height;
-    wl_egl_window_get_attached_size(m_waylandEglWindow,&current_width,&current_height);
-    if (current_width != rect.width() || current_height != rect.height()) {
-        waitForFrameSync();
-        wl_egl_window_resize(m_waylandEglWindow, rect.width(), rect.height(), 0, 0);
+    createDecoration();
+    QMargins margins = frameMargins();
+    QSize sizeWithMargins = rect.size() + QSize(margins.left() + margins.right(), margins.top() + margins.bottom());
+
+    if (m_waylandEglWindow) {
+        int current_width, current_height;
+        wl_egl_window_get_attached_size(m_waylandEglWindow,&current_width,&current_height);
+        if (current_width != sizeWithMargins.width() || current_height != sizeWithMargins.height()) {
+            waitForFrameSync();
+            wl_egl_window_resize(m_waylandEglWindow, sizeWithMargins.width(), sizeWithMargins.height(), 0, 0);
+
+            m_resize = true;
+        }
+    } else {
+        m_waylandEglWindow = wl_egl_window_create(mSurface, sizeWithMargins.width(), sizeWithMargins.height());
     }
     QWaylandWindow::setGeometry(rect);
 }
+
+QRect QWaylandEglWindow::contentsRect() const
+{
+    QRect r = geometry();
+    QMargins m = frameMargins();
+    return QRect(m.left(), m.bottom(), r.width(), r.height());
+}
+
 QSurfaceFormat QWaylandEglWindow::format() const
 {
     return m_format;
@@ -106,3 +133,36 @@ EGLSurface QWaylandEglWindow::eglSurface() const
     return m_eglSurface;
 }
 
+GLuint QWaylandEglWindow::contentFBO() const
+{
+    if (!decoration())
+        return 0;
+
+    if (m_resize || !m_contentFBO) {
+        QOpenGLFramebufferObject *old = m_contentFBO;
+        m_contentFBO = new QOpenGLFramebufferObject(geometry().width(), geometry().height(), QOpenGLFramebufferObject::CombinedDepthStencil);
+
+        delete old;
+        m_resize = false;
+    }
+
+    return m_contentFBO->handle();
+}
+
+GLuint QWaylandEglWindow::contentTexture() const
+{
+    return m_contentFBO->texture();
+}
+
+void QWaylandEglWindow::bindContentFBO()
+{
+    if (decoration()) {
+        contentFBO();
+        m_contentFBO->bind();
+    }
+}
+
+void QWaylandEglWindow::createDecorationInstance()
+{
+    new QWaylandEglDecoration(this);
+}
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.h b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.h
index 66b3d619c..1e1b99925 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.h
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.h
@@ -47,6 +47,7 @@
 #include "qwaylandeglintegration.h"
 
 class QWaylandGLContext;
+class QOpenGLFramebufferObject;
 
 class QWaylandEglWindow : public QWaylandWindow
 {
@@ -56,10 +57,19 @@ public:
     WindowType windowType() const;
     void setGeometry(const QRect &rect);
 
+    QRect contentsRect() const;
+
     EGLSurface eglSurface() const;
+    GLuint contentFBO() const;
+    GLuint contentTexture() const;
 
     QSurfaceFormat format() const;
 
+    void bindContentFBO();
+
+protected:
+    void createDecorationInstance();
+
 private:
     QWaylandEglIntegration *m_eglIntegration;
     struct wl_egl_window *m_waylandEglWindow;
@@ -68,6 +78,8 @@ private:
 
     mutable EGLSurface m_eglSurface;
     mutable EGLConfig m_eglConfig;
+    mutable QOpenGLFramebufferObject *m_contentFBO;
+    mutable bool m_resize;
 
     QSurfaceFormat m_format;
 };
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
index c869aaee7..f9ad280f7 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
@@ -44,17 +44,22 @@
 #include "qwaylanddisplay.h"
 #include "qwaylandwindow.h"
 #include "qwaylandeglwindow.h"
+#include "qwaylanddecoration.h"
 
+#include <QDebug>
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
+#include <QtGui/private/qopenglcontext_p.h>
 
 #include <qpa/qplatformopenglcontext.h>
 #include <QtGui/QSurfaceFormat>
+#include <QtGui/QOpenGLShaderProgram>
 
 QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, const QSurfaceFormat &format, QPlatformOpenGLContext *share)
     : QPlatformOpenGLContext()
     , m_eglDisplay(eglDisplay)
     , m_config(q_configFromGLFormat(m_eglDisplay, format, true))
     , m_format(q_glFormatFromConfig(m_eglDisplay, m_config))
+    , m_blitProgram(0)
 {
     m_shareEGLContext = share ? static_cast<QWaylandGLContext *>(share)->eglContext() : EGL_NO_CONTEXT;
 
@@ -75,13 +80,23 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, const QSurfaceFormat
 
 QWaylandGLContext::~QWaylandGLContext()
 {
+    delete m_blitProgram;
     eglDestroyContext(m_eglDisplay, m_context);
 }
 
 bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface)
 {
-    EGLSurface eglSurface = static_cast<QWaylandEglWindow *>(surface)->eglSurface();
-    return eglMakeCurrent(m_eglDisplay, eglSurface, eglSurface, m_context);
+    QWaylandEglWindow *window = static_cast<QWaylandEglWindow *>(surface);
+    EGLSurface eglSurface = window->eglSurface();
+    if (!eglMakeCurrent(m_eglDisplay, eglSurface, eglSurface, m_context))
+        return false;
+
+    // FIXME: remove this as soon as https://codereview.qt-project.org/#change,38879 is merged
+    QOpenGLContextPrivate::setCurrentContext(context());
+
+    window->bindContentFBO();
+
+    return true;
 }
 
 void QWaylandGLContext::doneCurrent()
@@ -91,10 +106,85 @@ void QWaylandGLContext::doneCurrent()
 
 void QWaylandGLContext::swapBuffers(QPlatformSurface *surface)
 {
-    EGLSurface eglSurface = static_cast<QWaylandEglWindow *>(surface)->eglSurface();
+    QWaylandEglWindow *window = static_cast<QWaylandEglWindow *>(surface);
+    EGLSurface eglSurface = window->eglSurface();
+
+    if (window->decoration()) {
+        makeCurrent(surface);
+
+        if (!m_blitProgram) {
+            m_blitProgram = new QOpenGLShaderProgram();
+            m_blitProgram->addShaderFromSourceCode(QOpenGLShader::Vertex, "attribute vec4 position;\n\
+                                                                        attribute vec4 texCoords;\n\
+                                                                        varying vec2 outTexCoords;\n\
+                                                                        void main()\n\
+                                                                        {\n\
+                                                                            gl_Position = position;\n\
+                                                                            outTexCoords = texCoords.xy;\n\
+                                                                        }");
+            m_blitProgram->addShaderFromSourceCode(QOpenGLShader::Fragment, "varying vec2 outTexCoords;\n\
+                                                                            uniform sampler2D texture;\n\
+                                                                            void main()\n\
+                                                                            {\n\
+                                                                                gl_FragColor = texture2D(texture, outTexCoords);\n\
+                                                                            }");
+
+            if (!m_blitProgram->link()) {
+                qDebug() << "Shader Program link failed.";
+                qDebug() << m_blitProgram->log();
+            }
+        }
+
+        glDisable(GL_DEPTH_TEST);
+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+        if (window->decoration())
+            window->decoration()->paintDecoration();
+
+        glActiveTexture(GL_TEXTURE0);
+        glBindTexture(GL_TEXTURE_2D, window->contentTexture());
+        QRect r = window->contentsRect();
+        glViewport(r.x(), r.y(), r.width(), r.height());
+
+        static const GLfloat squareVertices[] = {
+            -1.f, -1.f,
+            1.0f, -1.f,
+            -1.f,  1.0f,
+            1.0f,  1.0f,
+        };
+        static const GLfloat textureVertices[] = {
+            0.0f,  0.0f,
+            1.0f,  0.0f,
+            0.0f,  1.0f,
+            1.0f,  1.0f,
+        };
+
+        m_blitProgram->bind();
+
+        m_blitProgram->setUniformValue("texture", 0);
+
+        m_blitProgram->enableAttributeArray("position");
+        m_blitProgram->enableAttributeArray("texCoords");
+        m_blitProgram->setAttributeArray("position", squareVertices, 2);
+        m_blitProgram->setAttributeArray("texCoords", textureVertices, 2);
+
+        m_blitProgram->bind();
+
+        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+        m_blitProgram->disableAttributeArray("position");
+        m_blitProgram->disableAttributeArray("texCoords");
+        m_blitProgram->release();
+    }
+
     eglSwapBuffers(m_eglDisplay, eglSurface);
 }
 
+GLuint QWaylandGLContext::defaultFramebufferObject(QPlatformSurface *surface) const
+{
+    return static_cast<QWaylandEglWindow *>(surface)->contentFBO();
+}
+
 bool QWaylandGLContext::isSharing() const
 {
     return m_shareEGLContext != EGL_NO_CONTEXT;
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
index f30b6108f..767f188fb 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
@@ -50,6 +50,7 @@
 
 class QWaylandWindow;
 class QWaylandGLWindowSurface;
+class QOpenGLShaderProgram;
 
 class QWaylandGLContext : public QPlatformOpenGLContext {
 public:
@@ -61,6 +62,8 @@ public:
     bool makeCurrent(QPlatformSurface *surface);
     void doneCurrent();
 
+    GLuint defaultFramebufferObject(QPlatformSurface *surface) const;
+
     bool isSharing() const;
     bool isValid() const;
 
@@ -78,6 +81,7 @@ private:
     EGLContext m_shareEGLContext;
     EGLConfig m_config;
     QSurfaceFormat m_format;
+    QOpenGLShaderProgram *m_blitProgram;
 };
 
 
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri b/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri
index 5bda0074e..08f42b43d 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri
@@ -8,8 +8,10 @@
 INCLUDEPATH += $$PWD
 SOURCES += $$PWD/qwaylandeglintegration.cpp \
            $$PWD/qwaylandglcontext.cpp \
-           $$PWD/qwaylandeglwindow.cpp
+           $$PWD/qwaylandeglwindow.cpp \
+           $$PWD/qwaylandegldecoration.cpp
 
 HEADERS += $$PWD/qwaylandeglintegration.h \
            $$PWD/qwaylandglcontext.h \
-           $$PWD/qwaylandeglwindow.h
+           $$PWD/qwaylandeglwindow.h \
+           $$PWD/qwaylandegldecoration.h
diff --git a/src/plugins/platforms/wayland/qwaylanddecoration.cpp b/src/plugins/platforms/wayland/qwaylanddecoration.cpp
index 01de8be96..955a53ef3 100644
--- a/src/plugins/platforms/wayland/qwaylanddecoration.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddecoration.cpp
@@ -42,7 +42,6 @@
 #include "qwaylanddecoration.h"
 
 #include "qwaylandwindow.h"
-#include "qwaylandshmbackingstore.h"
 #include "qwaylandshellsurface.h"
 #include "qwaylandinputdevice.h"
 
@@ -50,13 +49,14 @@
 #include <QtGui/QCursor>
 #include <QtGui/QPainter>
 #include <QtGui/QRadialGradient>
-QWaylandDecoration::QWaylandDecoration(QWindow *window, QWaylandShmBackingStore *backing_store)
-    : m_window(window)
-    , m_wayland_window(static_cast<QWaylandWindow *>(window->handle()))
-    , m_backing_store(backing_store)
+
+QWaylandDecoration::QWaylandDecoration(QWaylandWindow *window)
+    : m_window(window->window())
+    , m_wayland_window(window)
     , m_margins(3,30,3,3)
     , m_hasSetCursor(false)
     , m_mouseButtons(Qt::NoButton)
+    , m_backgroundColor(90, 90, 100)
 {
     m_wayland_window->setDecoration(this);
     QTextOption option(Qt::AlignHCenter | Qt::AlignVCenter);
@@ -69,22 +69,22 @@ QWaylandDecoration::~QWaylandDecoration()
     m_wayland_window->setDecoration(0);
 }
 
-void QWaylandDecoration::paintDecoration()
+void QWaylandDecoration::paint(QPaintDevice *device)
 {
-    QRect surfaceRect(QPoint(), m_backing_store->entireSurface()->size());
+    QRect surfaceRect(QPoint(), window()->frameGeometry().size());
     QRect clips[] =
     {
-        QRect(0, 0, surfaceRect.width(), m_margins.top()),
-        QRect(0, surfaceRect.height() - m_margins.bottom(), surfaceRect.width(), m_margins.bottom()),
-        QRect(0, m_margins.top(), m_margins.left(), surfaceRect.height() - m_margins.top() - m_margins.bottom()),
-        QRect(surfaceRect.width() - m_margins.right(), m_margins.top(), m_margins.left(), surfaceRect.height() - m_margins.top() - m_margins.bottom())
+        QRect(0, 0, surfaceRect.width(), margins().top()),
+        QRect(0, surfaceRect.height() - margins().bottom(), surfaceRect.width(), margins().bottom()),
+        QRect(0, margins().top(), margins().left(), surfaceRect.height() - margins().top() - margins().bottom()),
+        QRect(surfaceRect.width() - margins().right(), margins().top(), margins().left(), surfaceRect.height() - margins().top() - margins().bottom())
     };
     QRect top = clips[0];
-    QPainter p(m_backing_store->entireSurface());
+    QPainter p(device);
     p.setRenderHint(QPainter::Antialiasing);
     QPoint gradCenter(top.center()+ QPoint(30,60));
     QRadialGradient grad(gradCenter, top.width() / 2, gradCenter);
-    QColor base(90, 90, 100);
+    QColor base(backgroundColor());
     grad.setColorAt(1, base);
     grad.setColorAt(0, base.lighter(123));
     QPainterPath roundedRect;
@@ -97,7 +97,7 @@ void QWaylandDecoration::paintDecoration()
     }
 
 
-    QString windowTitleText = m_window->windowTitle();
+    QString windowTitleText = window()->windowTitle();
     if (!windowTitleText.isEmpty()) {
         if (m_windowTitle.text() != windowTitleText) {
             m_windowTitle.setText(windowTitleText);
@@ -231,3 +231,8 @@ bool QWaylandDecoration::isLeftReleased(Qt::MouseButtons newMouseButtonState)
         return true;
     return false;
 }
+
+void QWaylandDecoration::setBackgroundColor(const QColor &c)
+{
+    m_backgroundColor = c;
+}
diff --git a/src/plugins/platforms/wayland/qwaylanddecoration.h b/src/plugins/platforms/wayland/qwaylanddecoration.h
index 609801388..92c9457db 100644
--- a/src/plugins/platforms/wayland/qwaylanddecoration.h
+++ b/src/plugins/platforms/wayland/qwaylanddecoration.h
@@ -46,7 +46,7 @@
 #include <QtCore/QPointF>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QCursor>
-#include <QtGui/QImage>
+#include <QtGui/QColor>
 #include <QtGui/QStaticText>
 
 #include <wayland-client.h>
@@ -58,15 +58,16 @@ class QPaintDevice;
 class QPainter;
 class QEvent;
 class QWaylandWindow;
-class QWaylandShmBackingStore;
 class QWaylandInputDevice;
 
 class QWaylandDecoration
 {
 public:
-    QWaylandDecoration(QWindow *window, QWaylandShmBackingStore *backing_store);
-    ~QWaylandDecoration();
-    void paintDecoration();
+    QWaylandDecoration(QWaylandWindow *window);
+    virtual ~QWaylandDecoration();
+
+    virtual void paintDecoration() = 0;
+
     void handleMouse(QWaylandInputDevice *inputDevice, const QPointF &local, const QPointF &global,Qt::MouseButtons b,Qt::KeyboardModifiers mods);
     void restoreMouseCursor();
     bool inMouseButtonPressedState() const;
@@ -74,6 +75,15 @@ public:
     void startResize(QWaylandInputDevice *inputDevice,enum wl_shell_surface_resize resize, Qt::MouseButtons buttons);
     void startMove(QWaylandInputDevice *inputDevice, Qt::MouseButtons buttons);
     QMargins margins() const;
+    QWindow *window() const;
+    QWaylandWindow *waylandWindow() const;
+
+    void setBackgroundColor(const QColor &c);
+    inline QColor backgroundColor() const;
+
+protected:
+    void paint(QPaintDevice *device);
+
 private:
     void overrideCursor(Qt::CursorShape shape);
 
@@ -87,16 +97,14 @@ private:
 
     QWindow *m_window;
     QWaylandWindow *m_wayland_window;
-    QWaylandShmBackingStore *m_backing_store;
 
     QMargins m_margins;
     bool m_hasSetCursor;
     Qt::CursorShape m_cursorShape;
     Qt::MouseButtons m_mouseButtons;
 
+    QColor m_backgroundColor;
     QStaticText m_windowTitle;
-
-    QImage m_borderImage;
 };
 
 inline QMargins QWaylandDecoration::margins() const
@@ -104,6 +112,21 @@ inline QMargins QWaylandDecoration::margins() const
     return m_margins;
 }
 
+inline QWindow *QWaylandDecoration::window() const
+{
+    return m_window;
+}
+
+inline QWaylandWindow *QWaylandDecoration::waylandWindow() const
+{
+    return m_wayland_window;
+}
+
+inline QColor QWaylandDecoration::backgroundColor() const
+{
+    return m_backgroundColor;
+}
+
 inline void QWaylandDecoration::overrideCursor(Qt::CursorShape shape)
 {
     if (m_hasSetCursor) {
diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
index bd6c33d5e..cb709736d 100644
--- a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
+++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp
@@ -134,9 +134,9 @@ QWaylandShmBackingStore::QWaylandShmBackingStore(QWindow *window)
     , mBackBuffer(0)
     , mFrontBufferIsDirty(false)
     , mPainting(false)
-    , mWindowDecoration(0)
     , mFrameCallback(0)
 {
+
 }
 
 QWaylandShmBackingStore::~QWaylandShmBackingStore()
@@ -155,9 +155,9 @@ QWaylandShmBackingStore::~QWaylandShmBackingStore()
 
 QPaintDevice *QWaylandShmBackingStore::paintDevice()
 {
-    if (!mWindowDecoration)
+    if (!windowDecoration())
         return mBackBuffer->image();
-    return mBackBuffer->imageInsideMargins(mWindowDecoration->margins());
+    return mBackBuffer->imageInsideMargins(windowDecorationMargins());
 }
 
 void QWaylandShmBackingStore::beginPaint(const QRegion &)
@@ -180,30 +180,8 @@ void QWaylandShmBackingStore::endPaint()
 
 void QWaylandShmBackingStore::ensureSize()
 {
-    bool decoration = false;
-    switch (window()->windowType()) {
-        case Qt::Window:
-    case Qt::Widget:
-    case Qt::Dialog:
-    case Qt::Tool:
-    case Qt::Drawer:
-        decoration = true;
-        break;
-    default:
-        break;
-    }
-    if (window()->windowFlags() & Qt::FramelessWindowHint) {
-        decoration = false;
-    }
-
-    if (decoration) {
-        if (!mWindowDecoration) {
-            mWindowDecoration = new QWaylandDecoration(window(), this);
-        }
-    } else {
-        delete mWindowDecoration;
-        mWindowDecoration = 0;
-    }
+    waylandWindow()->setBackingStore(this);
+    waylandWindow()->createDecoration();
     resize(mRequestedSize);
 }
 
@@ -260,8 +238,8 @@ void QWaylandShmBackingStore::resize(const QSize &size)
 
     mBackBuffer = new QWaylandShmBuffer(mDisplay, sizeWithMargins, format);
 
-    if (mWindowDecoration)
-        mWindowDecoration->paintDecoration();
+    if (windowDecoration())
+        windowDecoration()->paintDecoration();
 }
 
 QImage *QWaylandShmBackingStore::entireSurface() const
diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore.h b/src/plugins/platforms/wayland/qwaylandshmbackingstore.h
index 4ed5874ad..1eadb5ed7 100644
--- a/src/plugins/platforms/wayland/qwaylandshmbackingstore.h
+++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore.h
@@ -45,7 +45,7 @@
 #include "qwaylandbuffer.h"
 
 #include "qwaylanddecoration.h"
-#include "qwaylandwindow.h"
+#include "qwaylandshmwindow.h"
 
 #include <qpa/qplatformbackingstore.h>
 #include <QtGui/QImage>
@@ -84,11 +84,13 @@ public:
     void beginPaint(const QRegion &);
     void endPaint();
 
+    QWaylandDecoration *windowDecoration() const;
+
     QMargins windowDecorationMargins() const;
     QImage *entireSurface() const;
     void ensureSize();
 
-    QWaylandWindow *waylandWindow() const;
+    QWaylandShmWindow *waylandWindow() const;
     void iterateBuffer();
 
 private:
@@ -98,7 +100,6 @@ private:
     bool mFrontBufferIsDirty;
     bool mPainting;
 
-    QWaylandDecoration *mWindowDecoration;
     QSize mRequestedSize;
     Qt::WindowFlags mCurrentWindowFlags;
 
@@ -109,16 +110,21 @@ private:
     struct wl_callback *mFrameCallback;
 };
 
+inline QWaylandDecoration *QWaylandShmBackingStore::windowDecoration() const
+{
+    return waylandWindow()->decoration();
+}
+
 inline QMargins QWaylandShmBackingStore::windowDecorationMargins() const
 {
-    if (mWindowDecoration)
-        return mWindowDecoration->margins();
+    if (windowDecoration())
+        return windowDecoration()->margins();
     return QMargins();
 }
 
-inline QWaylandWindow *QWaylandShmBackingStore::waylandWindow() const
+inline QWaylandShmWindow *QWaylandShmBackingStore::waylandWindow() const
 {
-    return static_cast<QWaylandWindow *>(window()->handle());
+    return static_cast<QWaylandShmWindow *>(window()->handle());
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylandshmdecoration.cpp b/src/plugins/platforms/wayland/qwaylandshmdecoration.cpp
new file mode 100644
index 000000000..6c9373095
--- /dev/null
+++ b/src/plugins/platforms/wayland/qwaylandshmdecoration.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwaylandshmdecoration.h"
+
+#include "qwaylandshmwindow.h"
+#include "qwaylandshmbackingstore.h"
+
+QWaylandShmDecoration::QWaylandShmDecoration(QWaylandShmWindow *window)
+    : QWaylandDecoration(window)
+{
+
+}
+
+QWaylandShmDecoration::~QWaylandShmDecoration()
+{
+}
+
+void QWaylandShmDecoration::paintDecoration()
+{
+    paint(static_cast<QWaylandShmWindow *>(waylandWindow())->backingStore()->entireSurface());
+}
diff --git a/src/plugins/platforms/wayland/qwaylandshmdecoration.h b/src/plugins/platforms/wayland/qwaylandshmdecoration.h
new file mode 100644
index 000000000..4ff0da3d0
--- /dev/null
+++ b/src/plugins/platforms/wayland/qwaylandshmdecoration.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWAYLANDSHMDECORATION_H
+#define QWAYLANDSHMDECORATION_H
+
+#include "qwaylanddecoration.h"
+
+class QWaylandShmWindow;
+
+class QWaylandShmDecoration : public QWaylandDecoration
+{
+public:
+    QWaylandShmDecoration(QWaylandShmWindow *window);
+    ~QWaylandShmDecoration();
+
+    void paintDecoration();
+
+};
+
+#endif // QWAYLANDSHMDECORATION_H
diff --git a/src/plugins/platforms/wayland/qwaylandshmwindow.cpp b/src/plugins/platforms/wayland/qwaylandshmwindow.cpp
index 165df50b1..b7ec9d284 100644
--- a/src/plugins/platforms/wayland/qwaylandshmwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandshmwindow.cpp
@@ -42,6 +42,7 @@
 #include "qwaylandshmwindow.h"
 
 #include "qwaylandbuffer.h"
+#include "qwaylandshmdecoration.h"
 
 #include <QtCore/QVector>
 
@@ -49,6 +50,7 @@
 
 QWaylandShmWindow::QWaylandShmWindow(QWindow *window)
     : QWaylandWindow(window)
+    , mBackingStore(0)
 {
 }
 
@@ -62,3 +64,13 @@ QWaylandWindow::WindowType QWaylandShmWindow::windowType() const
     return QWaylandWindow::Shm;
 }
 
+void QWaylandShmWindow::setBackingStore(QWaylandShmBackingStore *backingStore)
+{
+    mBackingStore = backingStore;
+}
+
+void QWaylandShmWindow::createDecorationInstance()
+{
+    new QWaylandShmDecoration(this);
+}
+
diff --git a/src/plugins/platforms/wayland/qwaylandshmwindow.h b/src/plugins/platforms/wayland/qwaylandshmwindow.h
index 53b8096ea..ef5e5db07 100644
--- a/src/plugins/platforms/wayland/qwaylandshmwindow.h
+++ b/src/plugins/platforms/wayland/qwaylandshmwindow.h
@@ -45,6 +45,8 @@
 #include "qwaylandwindow.h"
 #include <QtGui/QRegion>
 
+class QWaylandShmBackingStore;
+
 class QWaylandShmWindow : public QWaylandWindow
 {
 public:
@@ -53,6 +55,20 @@ public:
 
     WindowType windowType() const;
     QSurfaceFormat format() const { return QSurfaceFormat(); }
+
+    void setBackingStore(QWaylandShmBackingStore *backingStore);
+    QWaylandShmBackingStore *backingStore() const;
+
+protected:
+    void createDecorationInstance();
+
+private:
+    QWaylandShmBackingStore *mBackingStore;
 };
 
+inline QWaylandShmBackingStore *QWaylandShmWindow::backingStore() const
+{
+    return mBackingStore;
+}
+
 #endif // QWAYLANDSHMWINDOW_H
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index c07ae0346..b41db4d17 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -310,6 +310,36 @@ void QWaylandWindow::setWindowFlags(Qt::WindowFlags flags)
         mExtendedWindow->setWindowFlags(flags);
 }
 
+bool QWaylandWindow::createDecoration()
+{
+    bool decoration = false;
+    switch (window()->windowType()) {
+        case Qt::Window:
+        case Qt::Widget:
+        case Qt::Dialog:
+        case Qt::Tool:
+        case Qt::Drawer:
+            decoration = true;
+            break;
+        default:
+            break;
+    }
+    if (window()->windowFlags() & Qt::FramelessWindowHint) {
+        decoration = false;
+    }
+
+    if (decoration) {
+        if (!mWindowDecoration) {
+            createDecorationInstance();
+        }
+    } else {
+        delete mWindowDecoration;
+        mWindowDecoration = 0;
+    }
+
+    return mWindowDecoration;
+}
+
 QWaylandDecoration *QWaylandWindow::decoration() const
 {
     return mWindowDecoration;
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.h b/src/plugins/platforms/wayland/qwaylandwindow.h
index 1d35a8c8e..cd1e860eb 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow.h
@@ -113,7 +113,12 @@ public:
                      Qt::KeyboardModifiers mods);
     void handleMouseEnter();
     void handleMouseLeave();
+
+    bool createDecoration();
+
 protected:
+    virtual void createDecorationInstance() {}
+
     QWaylandDisplay *mDisplay;
     struct wl_surface *mSurface;
     QWaylandShellSurface *mShellSurface;
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 6639febc6..f47f78cbc 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -30,7 +30,8 @@ SOURCES =   main.cpp \
             qwaylandtouch.cpp \
             qwaylandqtkey.cpp \
             $$PWD/../../../shared/qwaylandmimehelper.cpp \
-            qwaylanddecoration.cpp
+            qwaylanddecoration.cpp \
+            qwaylandshmdecoration.cpp
 
 HEADERS =   qwaylandintegration.h \
             qwaylandnativeinterface.h \
@@ -54,7 +55,8 @@ HEADERS =   qwaylandintegration.h \
             qwaylandtouch.h \
             qwaylandqtkey.h \
             $$PWD/../../../shared/qwaylandmimehelper.h \
-            qwaylanddecoration.h
+            qwaylanddecoration.h \
+            qwaylandshmdecoration.h
 
 DEFINES += Q_PLATFORM_WAYLAND