Changeset 7166

Timestamp:

Oct 23, 2001, 10:39:05 AM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk

Files:

• changelog (modified) (1 diff)
• src/user32/oslibmsgtranslate.cpp (modified) (2 diffs)
• src/user32/winkeyboard.cpp (modified) (4 diffs)

trunk/changelog

@@ -1 @@
-/* $Id: changelog,v 1.1776 2001-10-22 23:34:10 phaller Exp $ */
+/* $Id: changelog,v 1.1777 2001-10-23 08:39:05 phaller Exp $ */
+
+ 2001-10-22: Patrick Haller <patrick.haller@innotek.de>
+    - USER32:   o major improvement on keyboard handling
+                  Special AltGr mapping missing yet
+                o partial fix to GetKeyNameText(),
+                  two Open32 bugs remaining:
+                  (injected scancodes ignored (undoc),
+                   extended key bit ignored)
 
  2001-10-22: Patrick Haller <patrick.haller@innotek.de>

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.63 2001-10-23 06:00:45 phaller Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.64 2001-10-23 08:36:20 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -34 +34 @@
 #include "winmouse.h"
 #include <pmkbdhk.h>
+#include <pmscan.h>
 
 #define DBG_LOCALLOG    DBG_oslibmsgtranslate

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.17 2001-10-09 05:18:05 phaller Exp $ */
+/* $Id: winkeyboard.cpp,v 1.18 2001-10-23 08:36:20 phaller Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -570 +570 @@
                              };
 
-
 //******************************************************************************
 //******************************************************************************
@@ -587 +586 @@
    winkey[VK_CONTROL] = winkey[VK_LCONTROL] | winkey[VK_RCONTROL];
    winkey[VK_MENU]    = winkey[VK_LMENU] | winkey[VK_RMENU];
+}
+//******************************************************************************
+//******************************************************************************
+BYTE KeyTranslateWinVKeyToPMScan(BYTE bWinScan)
+{
+  // Note: array size of 256, so the BYTE value can't overflow
+  
+  // translate scancode to vkey
+  BYTE bWinVKey = MapVirtualKeyA(bWinScan ,3);
+  return abWinVKeyToPMScan[bWinVKey];
 }
 //******************************************************************************
@@ -942 +951 @@
               int,    nSize)
 {
-  return O32_GetKeyNameText(lParam,lpString,nSize);
+  // Note: Open32 expects PM Scancodes, NOT Winscancodes.
+  UCHAR ucPMScanCode = KeyTranslateWinVKeyToPMScan( (lParam & 0x00ff0000) >> 16);
+  
+  // switch the bits
+  lParam &= 0xFF00FFFF;
+  lParam |= (ucPMScanCode << 16);
+  
+  // @@@PH
+  // Bugs in Open32:
+  // 1 - the "extended key bit" is not taken into account
+  // 2 - special injected scancodes (0x21d for Ctrl for AltGr) skipped
+  
+  int result = O32_GetKeyNameText(lParam,lpString,nSize);
+  if (result)
+    dprintf(("keyname=[%s]\n",
+             lpString));
+  return result;
 }
 //******************************************************************************