1 files changed, 26 insertions, 14 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp
index 4b8fe0a..f5626c8 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp
@@ -50,12 +50,13 @@
 
 //#define QT_DIRECTFB_DEBUG_SURFACES 1
 
-QDirectFBSurface::QDirectFBSurface(QDirectFBScreen* scr)
+QDirectFBSurface::QDirectFBSurface(DFBSurfaceFlipFlags flip, QDirectFBScreen* scr)
     : QDirectFBPaintDevice(scr)
 #ifndef QT_NO_DIRECTFB_WM
     , dfbWindow(0)
 #endif
     , engine(0)
+    , flipFlags(flip)
 {
     setSurfaceFlags(Opaque | Buffered);
 #ifdef QT_DIRECTFB_TIMING
@@ -64,12 +65,13 @@ QDirectFBSurface::QDirectFBSurface(QDirectFBScreen* scr)
 #endif
 }
 
-QDirectFBSurface::QDirectFBSurface(QDirectFBScreen* scr, QWidget *widget)
+QDirectFBSurface::QDirectFBSurface(DFBSurfaceFlipFlags flip, QDirectFBScreen *scr, QWidget *widget)
     : QWSWindowSurface(widget), QDirectFBPaintDevice(scr)
 #ifndef QT_NO_DIRECTFB_WM
     , dfbWindow(0)
 #endif
     , engine(0)
+    , flipFlags(flip)
 {
     onscreen = widget->testAttribute(Qt::WA_PaintOnScreen);
     if (onscreen)
@@ -244,7 +246,7 @@ void QDirectFBSurface::setPermanentState(const QByteArray &state)
 
 bool QDirectFBSurface::scroll(const QRegion &region, int dx, int dy)
 {
-    if (!dfbSurface)
+    if (!dfbSurface || !(flipFlags & DSFLIP_BLIT))
         return false;
 
     const QVector<QRect> rects = region.rects();
@@ -362,21 +364,31 @@ void QDirectFBSurface::flush(QWidget *widget, const QRegion &region,
     }
 #endif
 #ifndef QT_NO_DIRECTFB_WM
-    if (region.numRects() > 1) {
-        const QVector<QRect> rects = region.rects();
-        for (int i=0; i<rects.size(); ++i) {
-            const QRect &r = rects.at(i);
+    if (!(flipFlags & DSFLIP_BLIT)) {
+        dfbSurface->Flip(dfbSurface, 0, DFBSurfaceFlipFlags(flipFlags));
+    } else {
+        if (region.numRects() > 1) {
+            const QVector<QRect> rects = region.rects();
+            DFBSurfaceFlipFlags tmpFlags = flipFlags;
+            if (flipFlags & DSFLIP_WAIT)
+                tmpFlags = DFBSurfaceFlipFlags(flipFlags & ~DSFLIP_WAIT);
+            for (int i=0; i<rects.size(); ++i) {
+                const QRect &r = rects.at(i);
+                const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
+                                           r.x() + r.width() + offset.x(),
+                                           r.y() + r.height() + offset.y() };
+                dfbSurface->Flip(dfbSurface, &dfbReg,
+                                 i + 1 < rects.size()
+                                 ? tmpFlags
+                                 : flipFlags);
+            }
+        } else {
+            const QRect r = region.boundingRect();
             const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
                                        r.x() + r.width() + offset.x(),
                                        r.y() + r.height() + offset.y() };
-            dfbSurface->Flip(dfbSurface, &dfbReg, DSFLIP_ONSYNC);
+            dfbSurface->Flip(dfbSurface, &dfbReg, flipFlags);
         }
-    } else {
-        const QRect r = region.boundingRect();
-        const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(),
-                                   r.x() + r.width() + offset.x(),
-                                   r.y() + r.height() + offset.y() };
-        dfbSurface->Flip(dfbSurface, &dfbReg, DSFLIP_ONSYNC);
     }
 #endif
 #ifdef QT_DIRECTFB_TIMING