Changeset 561 for trunk/src/gui/painting/qwindowsurface_x11.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_x11.cpp (modified) (9 diffs)

trunk/src/gui/painting/qwindowsurface_x11.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$
 **
@@ -95 +95 @@
 {
 #ifndef QT_NO_XRENDER
+    Q_ASSERT(!d_ptr->device.isNull());
+
     if (d_ptr->translucentBackground) {
         if (d_ptr->device.depth() != 32)
-            static_cast<QX11PixmapData *>(d_ptr->device.data_ptr())->convertToARGB32();
+            static_cast<QX11PixmapData *>(d_ptr->device.data_ptr().data())->convertToARGB32();
         ::Picture src = X11->getSolidFill(d_ptr->device.x11Info().screen(), Qt::transparent);
         ::Picture dst = d_ptr->device.x11PictureHandle();
@@ -129 +131 @@
 //         qDebug() << "XSetClipRectangles";
 //         for  (int i = 0; i < num; ++i)
-//             qDebug() << " " << i << rects[i].x << rects[i].x << rects[i].y << rects[i].width << rects[i].height;
-    XSetClipRectangles(X11->display, gc, 0, 0, rects, num, YXBanded);
+//             qDebug() << ' ' << i << rects[i].x << rects[i].x << rects[i].y << rects[i].width << rects[i].height;
+    if (num != 1)
+        XSetClipRectangles(X11->display, gc, 0, 0, rects, num, YXBanded);
     XCopyArea(X11->display, d_ptr->device.handle(), widget->handle(), gc,
               br.x() + offset.x(), br.y() + offset.y(), br.width(), br.height(), wbr.x(), wbr.y());
+    if (num != 1)
+        XSetClipMask(X11->display, gc, XNone);
 }
 
@@ -140 +145 @@
 
     const QSize size = rect.size();
-    if (d_ptr->device.size() == size)
+
+    if (d_ptr->device.size() == size || size.width() <= 0 || size.height() <= 0)
         return;
 #ifndef QT_NO_XRENDER
@@ -154 +160 @@
 
         QX11PixmapData *oldData = static_cast<QX11PixmapData *>(d_ptr->device.pixmapData());
-        Q_ASSERT(oldData);
-        if (!oldData->uninit && hasStaticContents()) {
+
+        if (oldData && !(oldData->flags & QX11PixmapData::Uninitialized) && hasStaticContents()) {
             // Copy the content of the old pixmap into the new one.
             QX11PixmapData *newData = new QX11PixmapData(QPixmapData::PixmapType);
@@ -176 +182 @@
                       qMin(boundingRect.height(), size.height()), dx, dy);
             XFreeGC(X11->display, tmpGc);
-            newData->uninit = false;
+            newData->flags &= ~QX11PixmapData::Uninitialized;
 
             d_ptr->device = QPixmap(newData);
@@ -184 +190 @@
     }
 
-    if (gc)
+    if (gc) {
         XFreeGC(X11->display, gc);
-    gc = XCreateGC(X11->display, d_ptr->device.handle(), 0, 0);
-    XSetGraphicsExposures(X11->display, gc, False);
+        gc = 0;
+    }
+    if (!d_ptr->device.isNull()) {
+        gc = XCreateGC(X11->display, d_ptr->device.handle(), 0, 0);
+        XSetGraphicsExposures(X11->display, gc, False);
+    }
 }