Changeset 784 for trunk/src

Timestamp:

Oct 7, 2010, 12:17:37 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Log more WM_* messages in debug mode.

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -1747 +1747 @@
 bool QETWidget::translateMouseEvent(const QMSG &qmsg)
 {
-#if defined(QT_DEBUGMSGFLOW) && 0
-    static const char *msgNames[] = { // 11 items
-        "WM_MOUSEMOVE",
-        "WM_BUTTON1DOWN", "WM_BUTTON1UP", "WM_BUTTON1DBLCLK",
-        "WM_BUTTON2DOWN", "WM_BUTTON2UP", "WM_BUTTON2DBLCLK",
-        "WM_BUTTON3DOWN", "WM_BUTTON3UP", "WM_BUTTON3DBLCLK",
-        "WM_???"
-    };
-    int msgIdx = qmsg.msg - WM_MOUSEMOVE;
-    if (msgIdx < 0 || msgIdx > 9)
-        msgIdx = 10;
-    qDebug("%s (%04lX): [%08lX/%p:%s] %04hd,%04hd hit=%04hX fl=%04hX",
-           msgNames[msgIdx], qmsg.msg, qmsg.hwnd, this, widgetName(this),
-           SHORT1FROMMP(qmsg.mp1), SHORT2FROMMP(qmsg.mp1),
-           SHORT1FROMMP(qmsg.mp2), SHORT2FROMMP(qmsg.mp2));
-#endif
-
     if (!isWindow() && testAttribute(Qt::WA_NativeWindow))
         Q_ASSERT(internalWinId() != NULLHANDLE);
@@ -2629 +2612 @@
     debug.nospace() << "SWP(" << swp.x << "," << swp.y
                     << " " << swp.cx << "x" << swp.cy << " "
-                    << qDebugFmtHex(swp.hwndInsertBehind)
+                    << qDebugFmtHex(swp.hwndInsertBehind) << " "
                     << fl.constData() << ")";
     return debug.space();
@@ -2640 +2623 @@
     #define myCaseEnd() }
 
+    bool isMouse = false;
+
     switch (qmsg.msg) {
+
+#if 1
+    myCaseBegin(WM_MOUSEMOVE)
+        isMouse = true; break;
+    myCaseEnd()
+    myCaseBegin(WM_BUTTON1DOWN)
+        isMouse = true; break;
+    myCaseEnd()
+    myCaseBegin(WM_BUTTON1UP)
+        isMouse = true; break;
+    myCaseEnd()
+    myCaseBegin(WM_BUTTON1DBLCLK)
+        isMouse = true; break;
+    myCaseEnd()
+    myCaseBegin(WM_BUTTON2DOWN)
+        isMouse = true; break;
+    myCaseEnd()
+    myCaseBegin(WM_BUTTON2UP)
+        isMouse = true; break;
+    myCaseEnd()
+    myCaseBegin(WM_BUTTON2DBLCLK)
+        isMouse = true; break;
+    myCaseEnd()
+    myCaseBegin(WM_BUTTON3DOWN)
+        isMouse = true; break;
+    myCaseEnd()
+    myCaseBegin(WM_BUTTON3UP)
+        isMouse = true; break;
+    myCaseEnd()
+    myCaseBegin(WM_BUTTON3DBLCLK)
+        isMouse = true; break;
+    myCaseEnd()
+#endif
 
     myCaseBegin(WM_CHAR)
@@ -2764 +2782 @@
     myCaseEnd()
 
+    myCaseBegin(WM_ADJUSTWINDOWPOS)
+        break;
+    myCaseEnd()
+
+    myCaseBegin(WM_VRNDISABLED)
+        break;
+    myCaseEnd()
+    myCaseBegin(WM_VRNENABLED)
+        break;
+    myCaseEnd()
+
+    myCaseBegin(WM_SHOW)
+        break;
+    myCaseEnd()
+
     default:
         debug.nospace() << "WM_" << qDebugFmtHex(qmsg.msg) << ":";
@@ -2771 +2804 @@
     }
 
+    if (isMouse) {
+        SHORT x = SHORT1FROMMP(qmsg.mp1);
+        SHORT y = SHORT2FROMMP(qmsg.mp1);
+        USHORT hit = SHORT1FROMMP(qmsg.mp2);
+        bool fl = SHORT2FROMMP(qmsg.mp2);
+        QByteArray hitstr;
+        myDefFlagEx(hit, HT_NORMAL, hitstr, "NORMAL");
+        myDefFlagEx(hit, HT_TRANSPARENT, hitstr, "TRANSPARENT");
+        myDefFlagEx(hit, HT_DISCARD, hitstr, "DISCARD");
+        myDefFlagEx(hit, HT_ERROR, hitstr, "ERROR");
+        QByteArray flstr;
+        myDefFlagEx(fl, KC_CHAR, flstr, "CHAR");
+        myDefFlagEx(fl, KC_VIRTUALKEY, flstr, "VIRT");
+        myDefFlagEx(fl, KC_SCANCODE, flstr, "SCAN");
+        myDefFlagEx(fl, KC_SHIFT, flstr, "SHIFT");
+        myDefFlagEx(fl, KC_CTRL, flstr, "CTRL");
+        myDefFlagEx(fl, KC_ALT, flstr, "ALT");
+        myDefFlagEx(fl, KC_KEYUP, flstr, "UP");
+        myDefFlagEx(fl, KC_PREVDOWN, flstr, "PREVDWN");
+        myDefFlagEx(fl, KC_LONEKEY, flstr, "LONE");
+        myDefFlagEx(fl, KC_DEADKEY, flstr, "DEAD");
+        myDefFlagEx(fl, KC_COMPOSITE, flstr, "COMP");
+        myDefFlagEx(fl, KC_INVALIDCOMP, flstr, "INVCMP");
+        myDefFlagEx(fl, KC_TOGGLE, flstr, "TGGL");
+        myDefFlagEx(fl, KC_INVALIDCHAR, flstr, "INVCHR");
+        myDefFlagEx(fl, KC_NONE, flstr, "NONE");
+        debug << "x" << x << "y" << y;
+        debug.nospace() << "HT(" << hitstr.constData() << ")";
+        debug.space();
+        debug.nospace() << "KC(" << qDebugFmtHex(fl) << ","
+                        << flstr.constData() << ")";
+        debug.space();
+    }
+
     return debug;