Changeset 8474 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

May 23, 2002, 9:13:00 AM (23 years ago)

Author:

sandervl

Message:

PF: Keyboard fixes for right alt & right shift

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.86 2002-05-07 16:15:30 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.87 2002-05-23 07:13:00 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -628 +628 @@
             winMsg->lParam = winMsg->lParam | WIN_KEY_EXTENDED;
 
+        //@PF PM does not add KC_ALT to right alt but win32 does it
+        if (WinGetKeyState(HWND_DESKTOP, VK_ALTGRAF) & 0x8000) flags |= KC_ALT;
 #if 0
 //TODO
@@ -637 +639 @@
 
 #ifdef ALTGR_HACK
-     
+    
         if (usPMScanCode == PMSCAN_ALTRIGHT)
         {
@@ -694 +696 @@
             // check for a lonesome ALT key ...
             if ( (flags & KC_LONEKEY) &&
-                (winMsg->wParam == VK_LMENU_W) )
+                ((winMsg->wParam == VK_LMENU_W) || (winMsg->wParam == VK_RMENU_W)) )
             {
               winMsg->message = WINWM_SYSKEYUP;
@@ -762 +764 @@
               winMsg->message = WINWM_SYSKEYUP;
               winMsg->lParam |= WIN_KEY_PREVSTATE;            
-              winMsg->lParam |= WIN_KEY_ALTHELD;            
+              // No ALTHELD for Alt itself ;)
+              winMsg->lParam |= WIN_KEY_ALTHELD;            
               winMsg->lParam |= 1 << 31;                              // bit 31, transition state, always 1 for WM_KEYUP 
           }
@@ -1017 +1020 @@
 
       extramsg.lParam = msg->lParam & 0x00FFFFFF;
-      if(fl & KC_ALT)
+      if ((fl & KC_ALT) || (msg->lParam & WIN_KEY_ALTHELD))
         extramsg.lParam |= WIN_KEY_ALTHELD;
       if(fl & KC_PREVDOWN)