1 files changed, 49 insertions, 11 deletions

diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
index ce2329724a..06db4d83ac 100644
--- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
@@ -303,21 +303,30 @@ QXcbBackingStore::~QXcbBackingStore()
 
 QPaintDevice *QXcbBackingStore::paintDevice()
 {
-    return m_image ? m_image->image() : 0;
+    if (!m_image)
+        return 0;
+    return m_rgbImage.isNull() ? m_image->image() : &m_rgbImage;
 }
 
 void QXcbBackingStore::beginPaint(const QRegion &region)
 {
     if (!m_image)
         return;
-    const int dpr = int(m_image->image()->devicePixelRatio());
-    QRegion xRegion =  dpr == 1 ? region : QTransform::fromScale(dpr,dpr).map(region);
-    m_image->preparePaint(xRegion);
+
+    int dpr = int(m_image->image()->devicePixelRatio());
+    const int windowDpr = int(window()->devicePixelRatio());
+    if (windowDpr != dpr) {
+        resize(window()->size(), QRegion());
+        dpr = int(m_image->image()->devicePixelRatio());
+    }
+
+    m_paintRegion = dpr == 1 ? region : QTransform::fromScale(dpr,dpr).map(region);
+    m_image->preparePaint(m_paintRegion);
 
     if (m_image->image()->hasAlphaChannel()) {
-        QPainter p(m_image->image());
+        QPainter p(paintDevice());
         p.setCompositionMode(QPainter::CompositionMode_Source);
-        const QVector<QRect> rects = xRegion.rects();
+        const QVector<QRect> rects = m_paintRegion.rects();
         const QColor blank = Qt::transparent;
         for (QVector<QRect>::const_iterator it = rects.begin(); it != rects.end(); ++it) {
             p.fillRect(*it, blank);
@@ -325,6 +334,24 @@ void QXcbBackingStore::beginPaint(const QRegion &region)
     }
 }
 
+void QXcbBackingStore::endPaint()
+{
+    QXcbWindow *platformWindow = static_cast<QXcbWindow *>(window()->handle());
+    if (!platformWindow || !platformWindow->imageNeedsRgbSwap())
+        return;
+
+    // Slow path: the paint device was m_rgbImage. Now copy with swapping red
+    // and blue into m_image.
+    const QVector<QRect> rects = m_paintRegion.rects();
+    if (rects.isEmpty())
+        return;
+    QPainter p(m_image->image());
+    for (QVector<QRect>::const_iterator it = rects.begin(); it != rects.end(); ++it) {
+        const QRect rect = *it;
+        p.drawImage(rect.topLeft(), m_rgbImage.copy(rect).rgbSwapped());
+    }
+}
+
 #ifndef QT_NO_OPENGL
 QImage QXcbBackingStore::toImage() const
 {
@@ -342,7 +369,15 @@ void QXcbBackingStore::flush(QWindow *window, const QRegion &region, const QPoin
     if (!m_image || m_image->size().isEmpty())
         return;
 
-    QSize imageSize = m_image->size();
+    const int dpr = int(window->devicePixelRatio());
+
+#ifndef QT_NO_DEBUG
+    const int imageDpr = int(m_image->image()->devicePixelRatio());
+    if (dpr != imageDpr)
+        qWarning() <<  "QXcbBackingStore::flush() wrong devicePixelRatio for backingstore image" << dpr << imageDpr;
+#endif
+
+    QSize imageSize = m_image->size() / dpr; //because we multiply with the DPR later
 
     QRegion clipped = region;
     clipped &= QRect(0, 0, window->width(), window->height());
@@ -361,8 +396,6 @@ void QXcbBackingStore::flush(QWindow *window, const QRegion &region, const QPoin
         return;
     }
 
-    const int dpr = int(window->devicePixelRatio());
-
     QVector<QRect> rects = clipped.rects();
     for (int i = 0; i < rects.size(); ++i) {
         QRect rect = QRect(rects.at(i).topLeft() * dpr, rects.at(i).size() * dpr);
@@ -399,8 +432,7 @@ void QXcbBackingStore::resize(const QSize &size, const QRegion &)
 {
     const int dpr = int(window()->devicePixelRatio());
     const QSize xSize = size * dpr;
-
-    if (m_image && xSize == m_image->size())
+    if (m_image && xSize == m_image->size() && dpr == m_image->image()->devicePixelRatio())
         return;
     Q_XCB_NOOP(connection());
 
@@ -415,6 +447,12 @@ void QXcbBackingStore::resize(const QSize &size, const QRegion &)
     delete m_image;
     m_image = new QXcbShmImage(screen, xSize, win->depth(), win->imageFormat());
     m_image->image()->setDevicePixelRatio(dpr);
+    // Slow path for bgr888 VNC: Create an additional image, paint into that and
+    // swap R and B while copying to m_image after each paint.
+    if (win->imageNeedsRgbSwap()) {
+        m_rgbImage = QImage(xSize, win->imageFormat());
+        m_rgbImage.setDevicePixelRatio(dpr);
+    }
     Q_XCB_NOOP(connection());
 }