Changeset 120 for trunk/src/gui/kernel/qapplication_pm.cpp

Timestamp:

Aug 18, 2009, 4:30:00 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QWidget::setWindowState/setGeometry_sys/setWSGeometry in progress.

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -44 +44 @@
 #include "qt_os2.h"
 
+#include "qdebug.h"
+
 #include "qapplication.h"
 #include "qapplication_p.h"
@@ -61 +63 @@
 #include "qkeymapper_p.h"
 #include "qcursor_p.h"
+
+#define QT_DEBUGMSGFLOW
 
 QT_BEGIN_NAMESPACE
@@ -120 +124 @@
 //  void syncBackingStore(const QRegion &rgn) { d_func()->syncBackingStore(rgn); }
 //  void syncBackingStore() { d_func()->syncBackingStore(); }
-//  QWidgetData *dataPtr() { return data; }
-//  QWidgetPrivate *dptr() { return d_func(); }
+    QWidgetData *dataPtr() { return data; }
+    QWidgetPrivate *dptr() { return d_func(); }
 //  QRect frameStrut() const { return d_func()->frameStrut(); }
     bool        pmEvent(QMSG *m, MRESULT *r) { return QWidget::pmEvent(m, r); }
@@ -494 +498 @@
         // flip y coordinate
         qmsg.ptl.y = QApplication::desktop()->height() - (qmsg.ptl.y + 1);
+
+#if defined(QT_DEBUGMSGFLOW)
+        {
+            QString str = qStrQMSG(qmsg);
+            if (!str.isEmpty())
+                qDebug() << "*** [W]" << str.toUtf8().constData();
+        }
+#endif
 
         // send through app filter
@@ -709 +721 @@
 #endif
 
+        MRESULT rc = (MRESULT) FALSE;
+
         HWND hwndC = WinWindowFromID(hwnd, FID_CLIENT);
         QETWidget *widget = (QETWidget*)QWidget::find(hwndC);
@@ -714 +728 @@
             break;
 
+        Q_ASSERT(widget->isWindow());
+
+#if defined(QT_DEBUGMSGFLOW)
+        {
+            QMSG qmsg; // create QMSG structure
+            qmsg.hwnd = hwnd;
+            qmsg.msg = msg;
+            qmsg.mp1 = mp1;
+            qmsg.mp2 = mp2;
+            QString str = qStrQMSG(qmsg);
+            if (!str.isEmpty())
+                qDebug() << "*** [F]" << str.toUtf8().constData();
+        }
+#endif
+
         switch(msg) {
+
+        case WM_WINDOWPOSCHANGED: {
+            // We detect spontaneous min/max/restore events here instead of
+            // WM_MINMAXFRAME, because WM_MINMAXFRAME is a pre-process message
+            // (i.e. no actual changes have been made). We need actual changes
+            // in order to update the frame strut and send WindowStateChange.
+            rc = QtOldFrameProc(hwnd, msg, mp1, mp2);
+
+            ULONG awp = LONGFROMMP(mp2);
+
+            bool window_state_change = false;
+            Qt::WindowStates oldstate = Qt::WindowStates(widget->dataPtr()->window_state);
+
+            if (awp & AWP_MINIMIZED) {
+                window_state_change = true;
+                widget->dataPtr()->window_state |= Qt::WindowMinimized;
+                if (widget->isVisible()) {
+                    QHideEvent e;
+                    qt_sendSpontaneousEvent(widget, &e);
+                    widget->dptr()->hideChildren(true);
+                    const QString title = widget->windowIconText();
+                    if (!title.isEmpty())
+                        widget->dptr()->setWindowTitle_helper(title);
+                }
+            } else {
+                if (awp & AWP_MAXIMIZED) {
+                    widget->topData()->normalGeometry = widget->geometry();
+                }
+                if (awp & AWP_RESTORED) {
+                    window_state_change = true;
+                    if (awp & AWP_MAXIMIZED)
+                        widget->dataPtr()->window_state |= Qt::WindowMaximized;
+                    else if (!widget->isMinimized())
+                        widget->dataPtr()->window_state &= ~Qt::WindowMaximized;
+
+                    if (widget->isMinimized()) {
+                        widget->dataPtr()->window_state &= ~Qt::WindowMinimized;
+                        widget->dptr()->showChildren(true);
+                        QShowEvent e;
+                        qt_sendSpontaneousEvent(widget, &e);
+                        const QString title = widget->windowTitle();
+                        if (!title.isEmpty())
+                            widget->dptr()->setWindowTitle_helper(title);
+                    }
+                }
+            }
+
+            if (window_state_change) {
+                widget->dptr()->updateFrameStrut();
+                if (!widget->topData()->inSetWindowState) {
+                    // send WindowStateChange event if this message is NOT
+                    // originated from QWidget::setWindowState().
+                    QWindowStateChangeEvent e(oldstate);
+                    qt_sendSpontaneousEvent(widget, &e);
+                }
+            }
+
+            return rc;
+        }
+
         default:
             break;
@@ -1476 +1565 @@
     d_func()->hd = WinBeginPaint(internalWinId(), 0, &rcl);
 
-#if 1
-    qDebug("WM_PAINT: [%s] BEGIN %ld,%ld-%ld,%ld hps=%08lX",
-           QWidgetPrivate::name(this).constData(),
-           rcl.xLeft, rcl.yBottom, rcl.xRight, rcl.yTop, d_func()->hd);
+#if defined(QT_DEBUGMSGFLOW)
+    qDebug() << " PAINT BEGIN:" << rcl << "hps:" << qStrHPS(d_func()->hd);
 #endif
 
@@ -1501 +1588 @@
     // Mapping region from system to qt (32 bit) coordinate system.
     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
+#if defined(QT_DEBUGMSGFLOW)
+    qDebug() << " PAINT updRect:" << updRect;
+#endif
+
     // @todo use hrgn here converted to QRegion?
     d_func()->syncBackingStore(updRect);
@@ -1512 +1598 @@
     d_func()->hd = NULLHANDLE;
 
-#if 1
-    qDebug("WM_PAINT: [%s] END", QWidgetPrivate::name(this).constData());
+#if defined(QT_DEBUGMSGFLOW)
+    qDebug() << " PAINT END";
 #endif
 
@@ -1659 +1745 @@
 }
 
+
+/*!
+    Returns a QWidget pointer or 0 if there is no widget corresponding to the
+    given HWND. As opposed to QWidget::find(), correctly handles WC_FRAME
+    windows created for top level widgets. Used for debugging.
+ */
+QWidget *qWidgetFromHWND(HWND hwnd)
+{
+    char buf[10];
+    if (WinQueryClassName(hwnd, sizeof(buf), buf)) {
+        if (!strcmp(buf, "#1")) // WC_FRAME
+            hwnd = WinWindowFromID(hwnd, FID_CLIENT);
+        return QWidget::find(hwnd);
+    }
+    return 0;
+}
+
+/*!
+    \internal
+
+    Returns a human readable widget name in the form "class/name". Used for
+    debugging.
+ */
+QDbgStr qWidgetName(QWidget *w)
+{
+    if (w)
+        return QString()
+            .sprintf("%s.%s", w->metaObject()->className(),
+                     w->objectName().isEmpty() ? "<noname>" :
+                     w->objectName().toUtf8().constData());
+    return QString(QLatin1String("<no-widget>"));
+}
+
+QDbgStr qStrHWND(HWND hwnd)
+{
+    return QString().sprintf("%08lX/", hwnd) +
+           qWidgetName(qWidgetFromHWND(hwnd));
+}
+
+QDbgStr qStrHPS(HPS hps)
+{
+    return QString().sprintf("%08lX", hps);
+}
+
+QDbgStr qStrHPOINTER(HPOINTER hptr)
+{
+    return QString().sprintf("%08lX", hptr);
+}
+
+QDbgStr qStrHRGN(HRGN hrgn)
+{
+    return QString().sprintf("%08lX", hrgn);
+}
+
+QDbgStr qStrQMSG(const QMSG &qmsg)
+{
+    QString str;
+
+    #define myCaseBegin(a) case a: { \
+        str = QString().sprintf(#a ": hwnd %08lX.", qmsg.hwnd); \
+        str += qWidgetName(qWidgetFromHWND(qmsg.hwnd));
+    #define myCaseEnd() }
+
+    switch (qmsg.msg) {
+
+    myCaseBegin(WM_PAINT)
+        break;
+    myCaseEnd()
+
+    myCaseBegin(WM_SIZE)
+        str += QString().
+            sprintf(" old (%hd,%ld) new (%hd,%hd)",
+                    SHORT1FROMMP(qmsg.mp1), SHORT2FROMMP(qmsg.mp1),
+                    SHORT1FROMMP(qmsg.mp2), SHORT2FROMMP(qmsg.mp2));
+        break;
+    myCaseEnd()
+
+    myCaseBegin(WM_MOVE)
+        break;
+    myCaseEnd()
+
+    default:
+        break;
+    }
+
+    return str;
+
+    #undef myCaseEnd
+    #undef myCaseBegin
+}
+
+QDbgStr qStrRECTL(const RECTL &rcl)
+{
+    return QString().sprintf("RECTL(%ld,%ld %ld,%ld)",
+                             rcl.xLeft, rcl.yBottom, rcl.xRight, rcl.yTop);
+}
+
 QT_END_NAMESPACE