Changeset 7221 for trunk/src

Timestamp:

Oct 26, 2001, 5:54:04 PM (24 years ago)

Author:

phaller

Message:

:

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (5 diffs)
• winkeyboard.cpp (modified) (2 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.72 2001-10-26 12:46:16 phaller Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.73 2001-10-26 15:53:22 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -552 +552 @@
     case WM_CHAR:
     {
-        ULONG repeatCount=0, virtualKey=0, keyFlags=0, scanCode=0;
-        ULONG flags = SHORT1FROMMP(os2Msg->mp1);
-        BOOL keyWasPressed, isExtended = FALSE;
-        char c;
-
-        teb->o.odin.fTranslated = FALSE;
-        repeatCount = CHAR3FROMMP(os2Msg->mp1);
-        scanCode = CHAR4FROMMP(os2Msg->mp1);
-        keyWasPressed = ((SHORT1FROMMP (os2Msg->mp1) & KC_PREVDOWN) == KC_PREVDOWN);
+      ULONG  repeatCount=0;
+      ULONG  virtualKey=0;
+      ULONG  keyFlags=0;
+      USHORT scanCode=0;
+      ULONG  flags = SHORT1FROMMP(os2Msg->mp1);
+      BOOL   keyWasPressed, isExtended = FALSE;
+      char   c;
+      USHORT usPMScanCode = CHAR4FROMMP(os2Msg->mp1);
+
+      teb->o.odin.fTranslated = FALSE;
+      repeatCount = CHAR3FROMMP(os2Msg->mp1);
+      scanCode = CHAR4FROMMP(os2Msg->mp1);
+      keyWasPressed = ((SHORT1FROMMP (os2Msg->mp1) & KC_PREVDOWN) == KC_PREVDOWN);
 
         dprintf(("PM: WM_CHAR: %x %x rep=%d scancode=%x", SHORT1FROMMP(os2Msg->mp2), SHORT2FROMMP(os2Msg->mp2), repeatCount, scanCode));
@@ -608 +612 @@
         if (scanCode >= 0x70)
           scanCode -= 0x10;
+        // winMsg->wParam  = pmscan2winkey[scanCode][0];
+        // wWinScan  = pmscan2winkey[scanCode][1];
       
-      // winMsg->wParam  = pmscan2winkey[scanCode][0];
-      // wWinScan  = pmscan2winkey[scanCode][1];
       {
         BOOL  fWinExtended;
@@ -617 +621 @@
 
         // Note: Numlock-state currently ignored, see below
-        KeyTranslatePMScanToWinVKey(scanCode,
+        KeyTranslatePMScanToWinVKey(usPMScanCode,
                                     FALSE, 
                                     &bWinVKey,
@@ -642 +646 @@
         #define WIN_KEY_PREVSTATE  0x40000000
 
-        if (scanCode == PMSCAN_ALTRIGHT)
+        if (usPMScanCode == PMSCAN_ALTRIGHT)
         {
           // Turn message into CTRL-event

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.24 2001-10-26 12:46:17 phaller Exp $ */
+/* $Id: winkeyboard.cpp,v 1.25 2001-10-26 15:54:04 phaller Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -333 +333 @@
 /* 0x0B                   */ , 0x00                   , NULL
 /* 0x0C VK_CLEAR          */ , PMSCAN_PAD5            , "Num 5"
-/* 0x0D VK_RETURN         */ , PMSCAN_ENTER           , "Enter"
+/* 0x0D VK_RETURN         */ , PMSCAN_ENTER           , "Enter" // @@@PH BUG: identical to "Num Enter" !
 /* 0x0E                   */ , 0x00                   , NULL
 /* 0x0F                   */ , 0x00                   , NULL