Changeset 126

Timestamp:

Sep 13, 2006, 11:12:08 PM (19 years ago)

Author:

dmik

Message:

Kernel: Fixed keyboard pocessing: Let the standard OS/2 Alt+ddd shortcut (that composed chars from typed in ASCII codes) work correctly by resetting both virtual key code and text (to "hide" them from Qt).

File:

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

trunk/src/kernel/qapplication_pm.cpp

@@ -2774 +2774 @@
         if ( ch != 0xE0 ) {
             state |= Qt::Keypad;
-            if ( ch ) {
-                // override code to make it Qt::Key_0..Qt::Key_9 etc.
-                code = toupper( ch );
+            if ( (state & Qt::AltButton) && chm.vkey != VK_DELETE ) {
+                // reset both code and ch to "hide" them from Qt widgets and let
+                // the standard OS/2 Alt+ddd shortcut (that composed chars from
+                // typed in ASCII codes) work correctly. If we don't do that,
+                // widgets will see both individual digits (or cursor movements
+                // if NumLock is off) and the char composed by Alt+ddd.
+                code = ch = 0;
+            } else {
+                if ( ch ) {
+                    // override code to make it Qt::Key_0..Qt::Key_9 etc.
+                    code = toupper( ch );
+                }
             }
         } else {
@@ -2786 +2795 @@
     switch ( chm.scancode ) {
         case 0x4C: // 5
-            // scancode is zero if Numlock is set
-            if ( !code ) code = Qt::Key_Clear;
             state |= Qt::Keypad;
+            if ( state & Qt::AltButton ) {
+                // reset both code and ch to "hide" them from Qt (see above)
+                code = ch = 0;
+            } else {
+                // scancode is zero if Numlock is set
+                if ( !code ) code = Qt::Key_Clear;
+            }
             break;
         case 0x37: // *