Changeset 802

Timestamp:

Oct 20, 2010, 9:39:11 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed: Make sure that pressing Shift[+Ctrl]]+<numpad_digit> will generate a cursor movement code in NumLock mode off instead of a digit. This is necessary to make it possible to select text using numpad keys with Shift pressed (closes #183).

File:

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

trunk/src/gui/kernel/qkeymapper_pm.cpp

@@ -592 +592 @@
         state = state ^ Qt::MetaModifier;
 
+    bool isNumLockOn = WinGetKeyState(HWND_DESKTOP, VK_NUMLOCK) & 0x0001;
+
     // detect numeric keypad keys
     if (chm.vkey == VK_ENTER || chm.vkey == VK_NUMLOCK) {
@@ -598 +600 @@
     } else if (((chm.vkey >= VK_PAGEUP && chm.vkey <= VK_DOWN) ||
                 chm.vkey == VK_INSERT || chm.vkey == VK_DELETE)) {
+        // these are numbers 0-9 and the numeric comma/dot
         if ((chm.chr & 0xFF) != 0xE0) {
             state |= Qt::KeypadModifier;
@@ -608 +611 @@
                 return false;
             }
+            if (state & (Qt::KeyboardModifierMask & ~Qt::KeypadModifier)) {
+                // the OS/2 keyboard driver tends to invert the NumLock state
+                // when some modifiers (e.g. Shift) are pressed so that cursor
+                // movement event becomes a digit and and vice versa; we want
+                // to cancel replacing movements with digits to make it possible
+                // to e.g. select the text using numpad keys in NumLock OFF mode
+                // with Shift pressed. It seems that other applications (e.g.
+                // standard PM controls) do exactly the same.
+                if (!isNumLockOn) {
+                    // suppress generation of digits
+                    chm.chr = 0;
+                    chm.fs &= ~KC_CHAR;
+                }
+            }
         }
     }
@@ -618 +635 @@
                 // hide the key from Qt (see above)
                 return false;
-            } else {
-                // scancode is zero if Numlock is set
-                if (!code)
-                    code = Qt::Key_Clear;
-            }
+            }
+            if (state & (Qt::KeyboardModifierMask & ~Qt::KeypadModifier)) {
+                if (!isNumLockOn) {
+                    // suppress generation of digits, see above (note that
+                    // standard PM applications don't seem to do that for the
+                    // "5" key; we correct it here as it seems more logical)
+                    chm.chr = 0;
+                    chm.fs &= ~KC_CHAR;
+                }
+            }
+            // scancode is zero if Numlock is set
+            if (!code)
+                code = Qt::Key_Clear;
+            // this key doesn't have a virtual key assigned, but pretend we're
+            // a virtual key to avoid interpreting chm.chr as DBCS below
+            chm.fs |= KC_VIRTUALKEY;
             break;
         case 0x37: // *