Changeset 561 for trunk/src/gui/painting/qwindowsurface_raster.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/qwindowsurface_raster.cpp (modified) (20 diffs)

trunk/src/gui/painting/qwindowsurface_raster.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -44 +44 @@
 #include <qglobal.h> // for Q_WS_WIN define (non-PCH)
 #ifdef Q_WS_WIN
+#include <qlibrary.h>
 #include <qt_windows.h>
 #endif
@@ -80 +81 @@
 QT_BEGIN_NAMESPACE
 
-#ifdef Q_WS_WIN
-PtrUpdateLayeredWindowIndirect ptrUpdateLayeredWindowIndirect;
-#endif
-
 #if defined(Q_WS_PM) && defined(QT_LOG_BLITSPEED)
 unsigned long long qt_total_blit_ms = 0;
@@ -99 +96 @@
     uint translucentBackground : 1;
 #endif
-#endif
-#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE)
-    uint canUseLayeredWindow : 1;
 #endif
     uint inSetGeometry : 1;
@@ -116 +110 @@
 #endif
 #endif
-#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE)
-    d_ptr->canUseLayeredWindow = ptrUpdateLayeredWindowIndirect
-        && (qt_widget_private(window)->data.window_flags & Qt::FramelessWindowHint);
-#endif
     d_ptr->image = 0;
     d_ptr->inSetGeometry = false;
@@ -133 +123 @@
     if (d_ptr->image)
         delete d_ptr->image;
-
-    delete d_ptr;
 }
 
@@ -145 +133 @@
 void QRasterWindowSurface::beginPaint(const QRegion &rgn)
 {
-#if (defined(Q_WS_X11) && !defined(QT_NO_XRENDER)) || (defined(Q_WS_WIN) && !defined(Q_OS_WINCE))
-    if (!qt_widget_private(window())->isOpaque) {
-#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE)
-        if (d_ptr->image->image.format() != QImage::Format_ARGB32_Premultiplied
-            && d_ptr->canUseLayeredWindow)
+#if (defined(Q_WS_X11) && !defined(QT_NO_XRENDER)) || (defined(Q_WS_WIN) && !defined(Q_WS_WINCE))
+    if (!qt_widget_private(window())->isOpaque && window()->testAttribute(Qt::WA_TranslucentBackground)) {
+#if defined(Q_WS_WIN) && !defined(Q_WS_WINCE)
+        if (d_ptr->image->image.format() != QImage::Format_ARGB32_Premultiplied)
             prepareBuffer(QImage::Format_ARGB32_Premultiplied, window());
 #endif
@@ -160 +147 @@
         }
     }
-#endif
-#if defined(Q_OS_WINCE)
+#else
     Q_UNUSED(rgn);
 #endif
@@ -172 +158 @@
     // Not ready for painting yet, bail out. This can happen in
     // QWidget::create_sys()
-    if (!d->image)
+    if (!d->image || rgn.rectCount() == 0)
         return;
 
@@ -178 +164 @@
     QRect br = rgn.boundingRect();
 
-#ifndef Q_OS_WINCE
-    if (!qt_widget_private(window())->isOpaque && d->canUseLayeredWindow) {
+#ifndef Q_WS_WINCE
+    if (!qt_widget_private(window())->isOpaque
+        && window()->testAttribute(Qt::WA_TranslucentBackground)
+        && (qt_widget_private(window())->data.window_flags & Qt::FramelessWindowHint))
+    {
         QRect r = window()->frameGeometry();
         QPoint frameOffset = qt_widget_private(window())->frameStrut().topLeft();
@@ -187 +176 @@
         POINT ptDst = {r.x(), r.y()};
         POINT ptSrc = {0, 0};
-        Q_BLENDFUNCTION blend = {AC_SRC_OVER, 0, (int)(255.0 * window()->windowOpacity()), Q_AC_SRC_ALPHA};
+        BLENDFUNCTION blend = {AC_SRC_OVER, 0, (int)(255.0 * window()->windowOpacity()), Q_AC_SRC_ALPHA};
         RECT dirty = {dirtyRect.x(), dirtyRect.y(),
             dirtyRect.x() + dirtyRect.width(), dirtyRect.y() + dirtyRect.height()};
         Q_UPDATELAYEREDWINDOWINFO info = {sizeof(info), NULL, &ptDst, &size, d->image->hdc, &ptSrc, 0, &blend, Q_ULW_ALPHA, &dirty};
-
-        (*ptrUpdateLayeredWindowIndirect)(window()->internalWinId(), &info);
+        ptrUpdateLayeredWindowIndirect(window()->internalWinId(), &info);
     } else
 #endif
@@ -395 +383 @@
     QRect wbr = wrgn.boundingRect();
 
-    int num;
-    XRectangle *rects = (XRectangle *)qt_getClipRects(wrgn, num);
-    XSetClipRectangles(X11->display, d_ptr->gc, 0, 0, rects, num, YXBanded);
+    if (wrgn.rectCount() != 1) {
+        int num;
+        XRectangle *rects = (XRectangle *)qt_getClipRects(wrgn, num);
+        XSetClipRectangles(X11->display, d_ptr->gc, 0, 0, rects, num, YXBanded);
+    }
 
     QRect br = rgn.boundingRect().translated(offset);
@@ -405 +395 @@
                   br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
         XSync(X11->display, False);
+    } else if (d_ptr->image->xshmimg) {
+        const QImage &src = d->image->image;
+        br = br.intersected(src.rect());
+        XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
+                     br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
+        XSync(X11->display, False);
     } else
 #endif
@@ -410 +406 @@
         const QImage &src = d->image->image;
         br = br.intersected(src.rect());
-        if (src.format() != QImage::Format_RGB32) {
+        if (src.format() != QImage::Format_RGB32 || widget->x11Info().depth() < 24) {
+            Q_ASSERT(src.depth() >= 16);
+            const QImage sub_src(src.scanLine(br.y()) + br.x() * (uint(src.depth()) / 8),
+                                 br.width(), br.height(), src.bytesPerLine(), src.format());
             QX11PixmapData *data = new QX11PixmapData(QPixmapData::PixmapType);
             data->xinfo = widget->x11Info();
-            data->fromImage(src, Qt::AutoColor);
+            data->fromImage(sub_src, Qt::NoOpaqueDetection);
             QPixmap pm = QPixmap(data);
-            XCopyArea(X11->display, pm.handle(), widget->handle(), d_ptr->gc, br.x() , br.y() , br.width(), br.height(), wbr.x(), wbr.y());
+            XCopyArea(X11->display, pm.handle(), widget->handle(), d_ptr->gc, 0 , 0 , br.width(), br.height(), wbr.x(), wbr.y());
         } else {
             // qpaintengine_x11.cpp
@@ -422 +421 @@
         }
     }
+
+    if (wrgn.rectCount() != 1)
+        XSetClipMask(X11->display, d_ptr->gc, XNone);
 #endif // FALCON
 
@@ -430 +432 @@
 //     d->image->image.save("flush.png");
 
+    Q_UNUSED(offset);
     // Get a context for the widget.
 #ifndef QT_MAC_USE_COCOA
@@ -476 +479 @@
 #endif
 #endif
+
+#ifdef Q_OS_SYMBIAN
+    Q_UNUSED(widget);
+    Q_UNUSED(rgn);
+    Q_UNUSED(offset);
+#endif
 }
 
@@ -484 +493 @@
     d->inSetGeometry = true;
     if (d->image == 0 || d->image->width() < rect.width() || d->image->height() < rect.height()) {
-#if (defined(Q_WS_X11) && !defined(QT_NO_XRENDER)) || (defined(Q_WS_WIN) && !defined(Q_OS_WINCE))
+#if (defined(Q_WS_X11) && !defined(QT_NO_XRENDER)) || (defined(Q_WS_WIN) && !defined(Q_WS_WINCE))
 #ifndef Q_WS_WIN
         if (d_ptr->translucentBackground)
 #else
-        if (!qt_widget_private(window())->isOpaque && d->canUseLayeredWindow)
+        if (!qt_widget_private(window())->isOpaque)
 #endif
             prepareBuffer(QImage::Format_ARGB32_Premultiplied, window());