Merge remote branch 'raster/master' into merge_raster

5 files changed, 112 insertions, 92 deletions

diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp
index 5605fc1..62a60d7 100644
--- a/src/gui/painting/qgraphicssystemfactory.cpp
+++ b/src/gui/painting/qgraphicssystemfactory.cpp
@@ -45,6 +45,7 @@
 #include "qmutex.h"
 
 #include "qapplication.h"
+#include <private/qapplication_p.h>
 #include "qgraphicssystem_raster_p.h"
 #include "qgraphicssystem_runtime_p.h"
 #include "qdebug.h"
@@ -79,6 +80,7 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key)
     }
 #endif
 
+    QApplicationPrivate::graphics_system_name = system;
     if (system == QLatin1String("raster"))
         return new QRasterGraphicsSystem;
     else if (system == QLatin1String("runtime"))
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index c64f572..3876c3d 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -70,7 +70,7 @@ QPaintDevice *QUnifiedToolbarSurface::paintDevice()
     return &d_ptr->image->image;
 }
 
-void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, const QPoint &offset)
+void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, QWidget *parent_toolbar, const QPoint &offset)
 {
     if (object != 0) {
         if (object->isWidgetType()) {
@@ -82,9 +82,10 @@ void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, const QPoint &of
                 widget->d_func()->unifiedSurface = this;
                 widget->d_func()->isInUnifiedToolbar = true;
                 widget->d_func()->toolbar_offset = offset;
+                widget->d_func()->toolbar_ancestor = parent_toolbar;
 
                 for (int i = 0; i < object->children().size(); ++i) {
-                    recursiveRedirect(object->children().at(i), offset);
+                    recursiveRedirect(object->children().at(i), parent_toolbar, offset);
                 }
             }
         }
@@ -94,7 +95,35 @@ void QUnifiedToolbarSurface::recursiveRedirect(QObject *object, const QPoint &of
 void QUnifiedToolbarSurface::insertToolbar(QWidget *toolbar, const QPoint &offset)
 {
     setGeometry(QRect(QPoint(0, 0), QSize(offset.x() + toolbar->width(), 100))); // FIXME
-    recursiveRedirect(toolbar, offset);
+    recursiveRedirect(toolbar, toolbar, offset);
+}
+
+// We basically undo what we set in recursiveRedirect().
+void QUnifiedToolbarSurface::recursiveRemoval(QObject *object)
+{
+    if (object != 0) {
+        if (object->isWidgetType()) {
+            QWidget *widget = qobject_cast<QWidget *>(object);
+
+            // If it's a pop-up or something similar, we don't redirect it.
+            if (widget->windowType() & Qt::Window)
+                return;
+
+            widget->d_func()->unifiedSurface = 0;
+            widget->d_func()->isInUnifiedToolbar = false;
+            widget->d_func()->toolbar_offset = QPoint();
+            widget->d_func()->toolbar_ancestor = 0;
+        }
+
+        for (int i = 0; i < object->children().size(); ++i) {
+            recursiveRemoval(object->children().at(i));
+        }
+    }
+}
+
+void QUnifiedToolbarSurface::removeToolbar(QToolBar *toolbar)
+{
+    recursiveRemoval(toolbar);
 }
 
 void QUnifiedToolbarSurface::setGeometry(const QRect &rect)
@@ -126,70 +155,25 @@ void QUnifiedToolbarSurface::updateToolbarOffset(QWidget *widget)
     mlayout->updateUnifiedToolbarOffset();
 }
 
-void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint &offset)
+void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &region, const QPoint &offset)
 {
-    Q_D(QUnifiedToolbarSurface);
-
-    QRegion flushingRegion(widget->rect());
-
-    if (!d->image || rgn.rectCount() == 0) {
-        return;
-    }
-
+    Q_UNUSED(region);
     Q_UNUSED(offset);
 
-    // Get a context for the widget.
-    CGContextRef context;
-    if (!(widget->d_func()->hasOwnContext)) {
-        widget->d_func()->ut_rg = rgn;
-        widget->d_func()->ut_pt = offset;
-        qt_mac_display(widget);
-        return;
-    } else {
-        // We render the content of the toolbar in the surface.
-        updateToolbarOffset(widget);
-        QRect beginPaintRect(widget->d_func()->toolbar_offset.x(), widget->d_func()->toolbar_offset.y(), widget->geometry().width(), widget->geometry().height());
-        QRegion beginPaintRegion(beginPaintRect);
-
-        context = widget->d_func()->cgContext;
-        beginPaint(beginPaintRegion);
-        widget->render(widget->d_func()->unifiedSurface->paintDevice(), widget->d_func()->toolbar_offset, QRegion(), QWidget::DrawChildren);
-    }
+    this->flush(widget);
+}
 
-    CGContextSaveGState(context);
+void QUnifiedToolbarSurface::flush(QWidget *widget)
+{
+    Q_D(QUnifiedToolbarSurface);
 
-    int areaX = widget->d_func()->toolbar_offset.x();
-    int areaY = widget->d_func()->toolbar_offset.y();
-    int areaWidth = widget->geometry().width();
-    int areaHeight = widget->geometry().height();
-    const CGRect area = CGRectMake(areaX, areaY, areaWidth, areaHeight);
+    if (!d->image)
+        return;
 
-    // Clip to region.
-    const QVector<QRect> &rects = flushingRegion.rects();
-    for (int i = 0; i < rects.size(); ++i) {
-        const QRect &rect = rects.at(i);
-        CGContextAddRect(context, CGRectMake(rect.x(), rect.y(), rect.width(), rect.height()));
+    if (widget->d_func()->flushRequested) {
+        // We call display: directly to avoid flickering in the toolbar.
+        qt_mac_display(widget);
     }
-    CGContextAddRect(context, area);
-    CGContextClip(context);
-
-
-    CGImageRef image = CGBitmapContextCreateImage(d->image->cg);
-    CGImageRef subImage = CGImageCreateWithImageInRect(image, area);
-
-    const CGRect drawingArea = CGRectMake(0, 0, areaWidth, areaHeight);
-    qt_mac_drawCGImage(context, &drawingArea, subImage);
-
-    CGImageRelease(subImage);
-    CGImageRelease(image);
-
-    CGContextFlush(context);
-
-    // Restore context.
-    CGContextRestoreGState(context);
-    CGContextRelease(context);
-    widget->d_func()->cgContext = 0;
-    widget->d_func()->hasOwnContext = false;
 }
 
 void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widget)
@@ -197,7 +181,7 @@ void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widge
     Q_D(QUnifiedToolbarSurface);
 
     int width = geometry().width();
-    int height = geometry().height();
+    int height = 100; // FIXME
     if (d->image) {
         width = qMax(d->image->width(), width);
         height = qMax(d->image->height(), height);
@@ -253,6 +237,28 @@ void QUnifiedToolbarSurface::prepareBuffer(QImage::Format format, QWidget *widge
     delete oldImage;
 }
 
+CGContextRef QUnifiedToolbarSurface::imageContext()
+{
+    Q_D(QUnifiedToolbarSurface);
+    return d->image->cg;
+}
+
+void QUnifiedToolbarSurface::renderToolbar(QWidget *widget, bool forceFlush)
+{
+    QWidget *toolbar = widget->d_func()->toolbar_ancestor;
+
+    updateToolbarOffset(toolbar);
+    QRect beginPaintRect(toolbar->d_func()->toolbar_offset.x(), toolbar->d_func()->toolbar_offset.y(), toolbar->geometry().width(), toolbar->geometry().height());
+    QRegion beginPaintRegion(beginPaintRect);
+
+    beginPaint(beginPaintRegion);
+    toolbar->render(paintDevice(), toolbar->d_func()->toolbar_offset, QRegion(toolbar->geometry()), QWidget::DrawChildren);
+    toolbar->d_func()->flushRequested = true;
+
+    if (forceFlush)
+        flush(toolbar);
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_MAC_USE_COCOA
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index e1157d7..0a7ebf1 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -55,6 +55,7 @@
 
 #include <private/qwindowsurface_raster_p.h>
 #include <QWidget>
+#include <QToolBar>
 #include <private/qwidget_p.h>
 #include <private/qnativeimage_p.h>
 
@@ -78,16 +79,22 @@ public:
     QUnifiedToolbarSurface(QWidget *widget);
     ~QUnifiedToolbarSurface();
 
+    void flush(QWidget *widget);
     void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
     void setGeometry(const QRect &rect);
     void beginPaint(const QRegion &rgn);
     void insertToolbar(QWidget *toolbar, const QPoint &offset);
+    void removeToolbar(QToolBar *toolbar);
+    void updateToolbarOffset(QWidget *widget);
+    void renderToolbar(QWidget *widget, bool forceFlush = false);
+    void recursiveRedirect(QObject *widget, QWidget *parent_toolbar, const QPoint &offset);
 
-private:
     QPaintDevice *paintDevice();
-    void updateToolbarOffset(QWidget *widget);
+    CGContextRef imageContext();
+
+private:
     void prepareBuffer(QImage::Format format, QWidget *widget);
-    void recursiveRedirect(QObject *widget, const QPoint &offset);
+    void recursiveRemoval(QObject *object);
 
     Q_DECLARE_PRIVATE(QUnifiedToolbarSurface)
     QScopedPointer<QUnifiedToolbarSurfacePrivate> d_ptr;
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index 3a5dcc3..a5c45c0 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -103,6 +103,11 @@ QRasterWindowSurface::QRasterWindowSurface(QWidget *window, bool setDefaultSurfa
 #endif
     d_ptr->image = 0;
     d_ptr->inSetGeometry = false;
+
+#ifdef QT_MAC_USE_COCOA
+    needsFlush = false;
+    regionToFlush = QRegion();
+#endif // QT_MAC_USE_COCOA
 }
 
 
@@ -271,41 +276,26 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
 
 #ifdef Q_WS_MAC
 
+    Q_UNUSED(offset);
+
     // This is mainly done for native components like native "open file" dialog.
     if (widget->testAttribute(Qt::WA_DontShowOnScreen)) {
         return;
     }
 
 #ifdef QT_MAC_USE_COCOA
-    // Unified toolbar hack.
-    QMainWindow* mWindow = qobject_cast<QMainWindow*>(widget->window());
-    if (mWindow) {
-        QMainWindowLayout *mLayout = qobject_cast<QMainWindowLayout*>(mWindow->layout());
-        QList<QToolBar *> toolbarList = mLayout->qtoolbarsInUnifiedToolbarList;
 
-        for (int i = 0; i < toolbarList.size(); ++i) {
-            QToolBar* toolbar = toolbarList.at(i);
-            if (mLayout->toolBarArea(toolbar) == Qt::TopToolBarArea) {
-                QWidget* tbWidget = (QWidget*) toolbar;
-                if (tbWidget->d_func()->unifiedSurface) {
-                    tbWidget->d_func()->unifiedSurface->flush(tbWidget, rgn, offset);
-                }
-            }
-        }
-    }
-#endif // QT_MAC_USE_COCOA
+    this->needsFlush = true;
+    this->regionToFlush += rgn;
 
-    Q_UNUSED(offset);
+    // The actual flushing will be processed in [view drawRect:rect]
+    qt_mac_setNeedsDisplay(widget);
+
+#else
     // Get a context for the widget.
-#ifndef QT_MAC_USE_COCOA
     CGContextRef context;
     CGrafPtr port = GetWindowPort(qt_mac_window_for(widget));
     QDBeginCGContext(port, &context);
-#else
-    QMacCocoaAutoReleasePool pool;
-    extern CGContextRef qt_mac_graphicsContextFor(QWidget *);
-    CGContextRef context = qt_mac_graphicsContextFor(widget);
-#endif
     CGContextRetain(context);
     CGContextSaveGState(context);
 
@@ -331,16 +321,12 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     CGImageRelease(subImage);
     CGImageRelease(image);
 
-#ifndef QT_MAC_USE_COCOA
     QDEndCGContext(port, &context);
-#else
-    CGContextFlush(context);
-#endif
 
     // Restore context.
     CGContextRestoreGState(context);
     CGContextRelease(context);
-
+#endif // QT_MAC_USE_COCOA
 
 #endif // Q_WS_MAC
 
@@ -491,4 +477,12 @@ void QRasterWindowSurface::prepareBuffer(QImage::Format format, QWidget *widget)
     delete oldImage;
 }
 
+#ifdef QT_MAC_USE_COCOA
+CGContextRef QRasterWindowSurface::imageContext()
+{
+    Q_D(QRasterWindowSurface);
+    return d->image->cg;
+}
+#endif // QT_MAC_USE_COCOA
+
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h
index ad57d48..669511d 100644
--- a/src/gui/painting/qwindowsurface_raster_p.h
+++ b/src/gui/painting/qwindowsurface_raster_p.h
@@ -56,6 +56,10 @@
 #include <qglobal.h>
 #include "private/qwindowsurface_p.h"
 
+#ifdef QT_MAC_USE_COCOA
+# include <private/qt_cocoa_helpers_mac_p.h>
+#endif // QT_MAC_USE_COCOA
+
 QT_BEGIN_NAMESPACE
 
 #ifdef Q_WS_WIN
@@ -107,6 +111,13 @@ public:
     bool scroll(const QRegion &area, int dx, int dy);
     bool hasStaticContentsSupport() const;
 
+#ifdef QT_MAC_USE_COCOA
+    CGContextRef imageContext();
+
+    bool needsFlush;
+    QRegion regionToFlush;
+#endif // QT_MAC_USE_COCOA
+
 private:
 #if defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
     void syncX();