Changeset 116 for trunk/src/gui/kernel

Timestamp:

Aug 17, 2009, 7:09:10 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented size/move event translation.

File:

• trunk/src/gui/kernel/qapplication_pm.cpp (modified) (8 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -56 +56 @@
 
 #include "private/qeventdispatcher_pm_p.h"
+
 
 #include "qwidget_p.h"
@@ -105 +106 @@
 
 extern void qt_WinQueryClipRegionOrRect(HWND hwnd, HRGN hrgn); // qwidget_pm.cpp
+
+
 
 MRESULT EXPENTRY QtWndProc(HWND, ULONG, MPARAM, MPARAM);
@@ -132 +135 @@
 //  inline void showChildren(bool spontaneous) { d_func()->showChildren(spontaneous); }
 //  inline void hideChildren(bool spontaneous) { d_func()->hideChildren(spontaneous); }
-    inline void validateObstacles() { d_func()->validateObstacles(); }
+  inline void validateObstacles() { d_func()->validateObstacles(); }
 //  inline uint testWindowState(uint teststate){ return dataPtr()->window_state & teststate; }
 //  inline void forceUpdate() {
@@ -1447 +1450 @@
     // qwidget_pm.cpp), we have to validate areas that intersect with our
     // children and siblings, taking their clip regions into account.
-    validateObstacles();
+    validateObstacles();
 
     Q_ASSERT(testAttribute(Qt::WA_WState_Created));
@@ -1463 +1466 @@
 
     // @todo not sure we need it
-//  const QRegion dirtyInBackingStore(qt_dirtyRegion(this));
-//  // Make sure the invalidated region contains the region we're about to repaint.
-//  // BeginPaint will set the clip to the invalidated region and it is impossible
-//  // to enlarge it afterwards (only shrink it). Using GetDCEx is not suffient
-//  // as it may return an invalid context (especially on Windows Vista).
-//  if (!dirtyInBackingStore.isEmpty())
-//      InvalidateRgn(internalWinId(), dirtyInBackingStore.handle(), false);
+    const QRegion dirtyInBackingStore(qt_dirtyRegion(this));
+    // Make sure the invalidated region contains the region we're about to repaint.
+    // BeginPaint will set the clip to the invalidated region and it is impossible
+    // to enlarge it afterwards (only shrink it).
+    if (!dirtyInBackingStore.isEmpty())
+      WinInvalidateRegion(internalWinId(), dirtyInBackingStore.handle(), FALSE);
 
     RECTL rcl;
@@ -1475 +1477 @@
 
 #if 1
-    qDebug("WM_PAINT: [%s] %ld,%ld:%ld,%ld",
+    qDebug("WM_PAINT: [%s] ",
            QWidgetPrivate::name(this).constData(),
-           rcl.xLeft, rcl.yBottom, rcl.xRight, rcl.yTop);
+           rcl.xLeft, rcl.yBottom, rcl.xRight, rcl.yTop);
 #endif
 
@@ -1489 +1491 @@
     }
 
-    if (WinQueryClipRegion( internalWinId(), 0) != QCRGN_NO_CLIP_REGION) {
-        // Correct the update region by intersecting it with the clip
-        // region (PM doesn't do that itself). It is necessary
-        // to have a correct QRegion in QPaintEvent.
-        HRGN hcrgn = GpiCreateRegion(displayPS, 0, NULL);
-        WinQueryClipRegion(internalWinId(), hcrgn);
-        GpiCombineRegion(displayPS, hrgn, hrgn, hcrgn, CRGN_AND);
-        GpiDestroyRegion(displayPS, hcrgn);
-    }
-
     // flip y coordinate
     rcl.yBottom = height() - (rcl.yBottom + 1);
     rcl.yTop = height() - (rcl.yTop + 1);
 
-    const QRect updateRect(QPoint(rcl.xLeft, rcl.yBottom),
-                           QPoint(rcl.xRight, rcl.yTop));
+    // note: right top point is exlusive in rcl
+    QRect updRect(QPoint(rcl.xLeft, rcl.yTop + 1),
+                  QPoint(rcl.xRight - 1, rcl.yBottom));
 
     // Mapping region from system to qt (32 bit) coordinate system.
-    // @todo use hrgn here once we implement QRegion<->HRGN relationship
-    d_func()->syncBackingStore(updateRect.translated(data->wrect.topLeft()));
+    updRect.translate(data->wrect.topLeft());
+#if 1
+    qDebug("WM_PAINT: [%s] update=%d,%d/%d,%d",
+           QWidgetPrivate::name(this).constData(),
+           updRect.x(), updRect.y(), updRect.width(), updRect.height());
+#endif
+    // @todo use hrgn here converted to QRegion?
+    d_func()->syncBackingStore(updRect);
 
     WinEndPaint(d_func()->hd);
     d_func()->hd = NULLHANDLE;
+
+
+
+
 
     return true;
@@ -1522 +1525 @@
 bool QETWidget::translateConfigEvent(const QMSG &qmsg)
 {
-    // @todo implement
-    return false;
+    if (!testAttribute(Qt::WA_WState_Created)) // in QWidget::create()
+        return true;
+
+    if (testAttribute(Qt::WA_WState_ConfigPending)) {
+        // it's possible that we're trying to set the frame size smaller
+        // than it possible for WC_FRAME in QWidget::setGeometry_sys().
+        // here we correct this (crect there is set before WinSetWindowPos()
+        // that sends WM_SIZE).
+        QSize newSize(SHORT1FROMMP(qmsg.mp2), SHORT2FROMMP(qmsg.mp2));
+        if (qmsg.msg == WM_SIZE && size() != newSize)
+            data->crect.setSize(newSize);
+        return true;
+    }
+
+    if (testAttribute(Qt::WA_DontShowOnScreen))
+        return true;
+    // @todo check if this is actually called for !isWindow() widget
+//  if (!isWindow())
+//      return true;
+
+    setAttribute(Qt::WA_WState_ConfigPending); // set config flag
+
+    HWND fId = NULLHANDLE;
+    ULONG fStyle = 0;
+    if (isWindow()) {
+        fId = d_func()->frameWinId();
+        fStyle = WinQueryWindowULong(fId, QWL_STYLE);
+    }
+
+    QRect cr = geometry();
+    if (qmsg.msg == WM_SIZE) { // resize event
+        QSize oldSize = size();
+        QSize newSize(SHORT1FROMMP(qmsg.mp2), SHORT2FROMMP(qmsg.mp2));
+        cr.setSize(newSize);
+        data->crect = cr;
+        if (isWindow()) {                        // update title/icon text
+            d_func()->createTLExtra();
+            QString title;
+            if ((fStyle & WS_MINIMIZED))
+                title = windowIconText();
+            if (title.isEmpty())
+                title = windowTitle();
+            if (!title.isEmpty())
+                d_func()->setWindowTitle_helper(title);
+        }
+        if (oldSize != newSize) {
+            // Spontaneous (external to Qt) WM_SIZE messages should occur only
+            // on top-level widgets. If we get them for a non top-level widget,
+            // the result will most likely be incorrect because widget masks will
+            // not be properly processed (i.e. in the way it is done in
+            // QWidget::setGeometry_sys() when the geometry is changed from
+            // within Qt). So far, I see no need to support this (who will ever
+            // need to move a non top-level window of a foreign process?).
+            Q_ASSERT(isWindow());
+            if (isVisible()) {
+                QTLWExtra *tlwExtra = d_func()->maybeTopData();
+                static bool slowResize = qgetenv("QT_SLOW_TOPLEVEL_RESIZE").toInt();
+                const bool hasStaticContents = tlwExtra && tlwExtra->backingStore
+                                               && tlwExtra->backingStore->hasStaticContents();
+                // If we have a backing store with static contents, we have to disable the top-level
+                // resize optimization in order to get invalidated regions for resized widgets.
+                // The optimization discards all invalidateBuffer() calls since we're going to
+                // repaint everything anyways, but that's not the case with static contents.
+                if (!slowResize && tlwExtra && !hasStaticContents)
+                    tlwExtra->inTopLevelResize = true;
+                QResizeEvent e(newSize, oldSize);
+                QApplication::sendSpontaneousEvent(this, &e);
+                if (d_func()->paintOnScreen()) {
+                    QRegion updateRegion(rect());
+                    if (testAttribute(Qt::WA_StaticContents))
+                        updateRegion -= QRect(0, 0, oldSize.width(), oldSize.height());
+                    // syncBackingStore() should have already flushed the widget
+                    // contents to the screen, so no need to redraw the exposed
+                    // areas in WM_PAINT once more
+                    d_func()->syncBackingStore(updateRegion);
+                    WinValidateRect(internalWinId(),
+                                    updateRegion.handle(newSize.height()), FALSE);
+                } else {
+                    d_func()->syncBackingStore();
+                    // see above
+                    RECTL rcl = { 0, 0, newSize.width(), newSize.height() };
+                    WinValidateRect(internalWinId(), &rcl, FALSE);
+                }
+                if (!slowResize && tlwExtra)
+                    tlwExtra->inTopLevelResize = false;
+            } else {
+                QResizeEvent *e = new QResizeEvent(newSize, oldSize);
+                QApplication::postEvent(this, e);
+            }
+        }
+    } else if (qmsg.msg == WM_MOVE) { // move event
+        QPoint oldPos = geometry().topLeft();
+        SWP swp;
+        if (isWindow()) {
+            WinQueryWindowPos(fId, &swp);
+            // flip y coordinate
+            swp.y = QApplication::desktop()->height() - (swp.y + swp.cy);
+            QTLWExtra *top = d_func()->topData();
+            swp.x += top->frameStrut.left();
+            swp.y += top->frameStrut.top();
+        } else {
+            WinQueryWindowPos(internalWinId(), &swp);
+            // flip y coordinate
+            swp.y = parentWidget()->height() - (swp.y + swp.cy);
+        }
+        QPoint newCPos(swp.x, swp.y);
+        if (newCPos != oldPos) {
+            cr.moveTopLeft(newCPos);
+            data->crect = cr;
+            if (isVisible()) {
+                QMoveEvent e(newCPos, oldPos); // cpos (client position)
+                QApplication::sendSpontaneousEvent(this, &e);
+            } else {
+                QMoveEvent *e = new QMoveEvent(newCPos, oldPos);
+                QApplication::postEvent(this, e);
+            }
+        }
+    }
+    setAttribute(Qt::WA_WState_ConfigPending, false);                // clear config flag
+    return true;
 }