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

Timestamp:

Aug 28, 2009, 7:46:09 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented QKeyMapper (#33).

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -508 +508 @@
 #if defined(QT_DEBUGMSGFLOW)
         {
-            QString str = qStrQMSG(qmsg);
+            QDbgStr str = qStrQMSG(qmsg);
             if (!str.isEmpty())
-                qDebug() << "*** [W]" << str.toUtf8().constData();
+                qDebug() << "*** [W]" << str;
         }
 #endif
@@ -602 +602 @@
         } else {
             switch(msg) {
+
+            case WM_CHAR: { // keyboard event
+                QWidget *g = QWidget::keyboardGrabber();
+                if (g)
+                    widget = (QETWidget*)g;
+                else if (QApplication::activePopupWidget())
+                    widget = (QETWidget*)QApplication::activePopupWidget()->focusWidget()
+                           ? (QETWidget*)QApplication::activePopupWidget()->focusWidget()
+                           : (QETWidget*)QApplication::activePopupWidget();
+                else if (qApp->focusWidget())
+                    widget = (QETWidget*)QApplication::focusWidget();
+                else if (widget->internalWinId() == WinQueryFocus(HWND_DESKTOP)) {
+                    // We faked the message to go to exactly that widget.
+                    widget = (QETWidget*)widget->window();
+                }
+                if (widget->isEnabled()) {
+                    bool result =
+#if !defined (QT_NO_SESSIONMANAGER)
+                        sm_blockUserInput ? true :
+#endif
+                        qt_keymapper_private()->translateKeyEvent(widget, qmsg, g != 0);
+                    if (result)
+                        return (MRESULT)TRUE;
+                }
+                break;
+            }
 
             case WM_PAINT: { // paint event
@@ -811 +837 @@
 #if defined(QT_DEBUGMSGFLOW)
         {
-            QString str = qStrQMSG(qmsg);
+            QDbgStr str = qStrQMSG(qmsg);
             if (!str.isEmpty())
-                qDebug() << "*** [F]" << str.toUtf8().constData();
+                qDebug() << "*** [F]" << str;
         }
 #endif
@@ -1033 +1059 @@
  *****************************************************************************/
 
-// State holder for LWIN/RWIN and ALTGr keys
-// (ALTGr is also necessary since OS/2 doesn't report ALTGr as KC_ALT)
-static int qt_extraKeyState = 0;
-
 static int mouseButtonState()
 {
@@ -1122 +1144 @@
             bst |= Qt::ControlModifier;
     }
-    if ((qt_extraKeyState & Qt::AltModifier))
+    if (qt_keymapper_private()->extraKeyState & Qt::AltModifier)
         bst |= Qt::AltModifier;
-    if (qt_extraKeyState & Qt::MetaModifier)
+    if (qt_keymapper_private()->extraKeyState & Qt::MetaModifier)
         bst |= Qt::MetaModifier;
 
@@ -1547 +1569 @@
         state |= Qt::ShiftModifier;
     if (WinGetKeyState(HWND_DESKTOP, VK_ALT) & 0x8000 ||
-        (qt_extraKeyState & Qt::AltModifier))
+        (qt_keymapper_private()->extraKeyState & Qt::AltModifier))
         state |= Qt::AltModifier;
     if (WinGetKeyState(HWND_DESKTOP, VK_CTRL) & 0x8000)
         state |= Qt::ControlModifier;
-    if (qt_extraKeyState & Qt::MetaModifier)
+    if (qt_keymapper_private()->extraKeyState & Qt::MetaModifier)
         state |= Qt::MetaModifier;
 
@@ -1909 +1931 @@
     switch (qmsg.msg) {
 
+    myCaseBegin(WM_CHAR)
+        USHORT fl = SHORT1FROMMP(qmsg.mp1);
+        UCHAR repeat = CHAR3FROMMP(qmsg.mp1);
+        UCHAR scan = CHAR4FROMMP(qmsg.mp1);
+        USHORT ch = SHORT1FROMMP(qmsg.mp2);
+        USHORT vk = SHORT2FROMMP(qmsg.mp2);
+        str += QString().
+            sprintf(" rep %02d scan %02X ch %04X (%ls) vk %04X",
+                    repeat, scan, ch, (ch > 32 && ch < 254) ?
+                    QString::fromLocal8Bit((char *)&ch, 1).utf16() :
+                    QString(QChar(' ')).utf16(), vk);
+        QString 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");
+        str += QString().sprintf(" KC(%04X,", fl) + flstr + QCStr(")");
+        break;
+    myCaseEnd()
+
     myCaseBegin(WM_PAINT)
         break;