Changeset 8474 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

PF: Keyboard fixes for right alt & right shift

Location:

trunk/src/user32

Files:

• HOOK.CPP (modified) (2 diffs)
• oslibmsgtranslate.cpp (modified) (6 diffs)
• winkeyboard.cpp (modified) (4 diffs)

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.37 2002-04-07 14:36:59 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.38 2002-05-23 07:13:00 sandervl Exp $ */
 
 /*
@@ -835 +835 @@
   // Note: ALT seems to stick sometimes
   // Note: ALTGR can't be queried
-  BOOL fAltDown = GetAsyncKeyState(VK_LMENU);
+  BOOL fAltDown = GetAsyncKeyState(VK_LMENU) | GetAsyncKeyState(VK_RMENU);
   
   // this bit indicates if ALT was held

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)

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.33 2002-05-01 08:03:05 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.34 2002-05-23 07:13:00 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -118 +118 @@
 /* 0x34 PMSCAN_PERIOD       */ , VK_PERIOD                  ,FALSE
 /* 0x35 PMSCAN_SLASH        */ , VK_SLASH                   ,FALSE
-/* 0x36 PMSCAN_SHIFTRIGHT   */ , VK_RSHIFT                  ,TRUE
+/* 0x36 PMSCAN_SHIFTRIGHT   */ , VK_RSHIFT                  ,FALSE
 /* 0x37 PMSCAN_PADASTERISK  */ , VK_MULTIPLY                ,FALSE
 /* 0x38 PMSCAN_ALTLEFT      */ , VK_LMENU                   ,FALSE
@@ -1401 +1401 @@
     case KEYOVERLAYSTATE_UP:
       return 0x0000;
-  }   
+  } 
+  if (nVirtKey == VK_MENU)  return O32_GetKeyState(VK_LMENU) | O32_GetKeyState(VK_RMENU);
   return O32_GetKeyState(nVirtKey);
 }
@@ -1423 +1424 @@
       return 0x0000;
   } 
+  if (nVirtKey == VK_MENU)  return O32_GetKeyState(VK_LMENU) | O32_GetKeyState(VK_RMENU);
   return O32_GetAsyncKeyState(nVirtKey);
 }