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

Timestamp:

Dec 22, 2009, 2:34:55 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented proper generation of possible key and modifier combinations for a given key event. This in particular enables Ctrl+<letter> shortcuts for non-Latin languages and also makes Ctrl+<letter>, Alt+<letter> and similar shortcuts language-neutral. See #50 for details.

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -65 +65 @@
 #include "qcursor_p.h"
 
+#define WM_KBDLAYERCHANGED   0x0BD4 // defined in OS2TK45/h/pmbidi.h
+
 //#define QT_DEBUGMSGFLOW
 
@@ -944 +946 @@
 
             case WM_CHAR: { // keyboard event
+                if (!(CHARMSG(&qmsg.msg)->fs & KC_KEYUP))
+                    qt_keymapper_private()->updateKeyMap(qmsg);
+
                 QWidget *g = QWidget::keyboardGrabber();
                 if (g)
@@ -966 +971 @@
                         return (MRESULT)TRUE;
                 }
+                break;
+            }
+
+            case WM_KBDLAYERCHANGED: { // Keyboard layout change
+                QKeyMapper::changeKeyboard();
                 break;
             }
@@ -2529 +2539 @@
     myCaseEnd()
 
+    myCaseBegin(WM_KBDLAYERCHANGED)
+        str += QString().sprintf(" mp1 %p mp2 %p", qmsg.mp1, qmsg.mp2);
+        break;
+    myCaseEnd()
+
     myCaseBegin(WM_PAINT)
         break;