Changeset 9924 for trunk/src

Timestamp:

Mar 19, 2003, 11:29:48 AM (22 years ago)

Author:

sandervl

Message:

PF: Shift/Ctrl/Alt+Numpad keys illegal behaviour. Generic numpad keys like (/*-+) produced garbage

File:

• trunk/src/user32/oslibmsgtranslate.cpp (modified) (8 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.103 2003-03-04 15:57:35 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.104 2003-03-19 10:29:48 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -634 +634 @@
         // special char message from the keyboard hook
         dprintf(("PM: WM_CHAR_SPECIAL_ALTGRCONTROL"));
-        
       // NO BREAK! FALLTHRU CASE!
     }
@@ -645 +644 @@
             dprintf(("PM: WM_CHAR_SPECIAL"));
         }
-        
       // NO BREAK! FALLTHRU CASE!
     }
@@ -688 +686 @@
             winMsg->lParam = winMsg->lParam | WIN_KEY_EXTENDED;
 
-        if (!numPressed && (scanCode >= PMSCAN_PAD7) && (scanCode <= PMSCAN_PADPERIOD))
+        //PF When we press shift we enable non-numeric functions of Numpad
+        if ((!numPressed || (flags & KC_SHIFT)) && (scanCode >= PMSCAN_PAD7) && (scanCode <= PMSCAN_PADPERIOD))
              winMsg->wParam = ConvertNumPadKey(scanCode);
 
@@ -1035 +1034 @@
   TEB *teb;
   MSG extramsg;
-
+  BOOL   numPressed = (BOOL)(WinGetKeyState(HWND_DESKTOP,VK_NUMLOCK) & 1);       
   teb = GetThreadTEB();
   if(!teb)
@@ -1042 +1041 @@
   UCHAR ucPMScanCode = CHAR4FROMMP(teb->o.odin.os2msg.mp1);
   ULONG fl = SHORT1FROMMP(teb->o.odin.os2msg.mp1);
- 
+    
   
     //NOTE: These actually need to be posted so that the next message retrieved by GetMessage contains
@@ -1064 +1063 @@
         break;
       }
+      
+      // PF With NumLock off do not generate any WM_CHAR messages at all
+      // PADMINUS,PADPLUS fall in range of PAD7..PADPERIOD but they should generate WM_CHAR
+      // other PAD(X) buttons miss that range at all and thus generate WM_CHAR
+      if (!numPressed && (ucPMScanCode != PMSCAN_PADMINUS) && (ucPMScanCode != PMSCAN_PADPLUS) &&
+         (ucPMScanCode >= PMSCAN_PAD7) && (ucPMScanCode <= PMSCAN_PADPERIOD))
+        return FALSE; 
 
       if(!(fl & KC_CHAR) && msg->message < WINWM_SYSKEYDOWN) 
@@ -1081 +1087 @@
             extramsg.wParam = msg->wParam - 0x30;
           else
-            extramsg.wParam = msg->wParam;
+           if (msg->wParam == VK_DECIMAL_W)
+             extramsg.wParam = VK_DELETE_W;
+           else
+             /* PM Sends Bogus Things when pressing Shift+NUMAsterisk */
+             if (msg->wParam != VK_MULTIPLY_W)
+                extramsg.wParam = msg->wParam;
         }
         else