Changeset 9814 for trunk/src

Timestamp:

Feb 16, 2003, 7:29:27 PM (23 years ago)

Author:

sandervl

Message:

Do not translate WM_KEYUP to WM_SYSKEYUP if AltGr released and KC_LONEKEY flag is set. (only for Alt); GetKeyboardState, GetKeyState, GetAsyncKeyState: pretend left Ctrl key is pressed if AltGr down

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (6 diffs)
• winkeyboard.cpp (modified) (7 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.101 2003-02-13 10:34:48 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.102 2003-02-16 18:29:26 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -602 +602 @@
         break;
     }
+
+    case WM_CHAR_SPECIAL_ALTGRCONTROL:
+    {
+        // special char message from the keyboard hook
+        dprintf(("PM: WM_CHAR_SPECIAL_ALTGRCONTROL"));
+        
+      // NO BREAK! FALLTHRU CASE!
+    }
       
     case WM_CHAR_SPECIAL:
@@ -607 +615 @@
         // @@@PH
         // special char message from the keyboard hook
-        dprintf(("PM: WM_CHAR_SPECIAL\n"));
+        if(os2Msg->msg == WM_CHAR_SPECIAL) {
+            dprintf(("PM: WM_CHAR_SPECIAL"));
+        }
         
       // NO BREAK! FALLTHRU CASE!
@@ -689 +699 @@
           {
             // check for a lonesome ALT key ...
+            // SvL: Only Left Alt; AltGr generates a WM_KEYUP when released
             if ( (flags & KC_LONEKEY) &&
-                ((winMsg->wParam == VK_LMENU_W) || (winMsg->wParam == VK_RMENU_W)) )
+                (winMsg->wParam == VK_LMENU_W) )
             {
               winMsg->message = WINWM_SYSKEYUP;
@@ -751 +762 @@
           }
           // if right alt is down, then we need to set the alt down bit too
-          if (WinGetKeyState(HWND_DESKTOP, VK_ALTGRAF) & 0x8000) {
+          // except for the fake Ctrl WM_CHAR sent for AltGr emulation
+          if (os2Msg->msg != WM_CHAR_SPECIAL_ALTGRCONTROL && 
+              (WinGetKeyState(HWND_DESKTOP, VK_ALTGRAF) & 0x8000)) 
+          {
               winMsg->lParam |= WIN_KEY_ALTHELD;            
           }
@@ -781 +795 @@
           }
         }
+#if 0
+        //
+        // AltGr needs special handling
+        //
+        // AltGr -> WM_KEYDOWN (VK_CONTROL), WM_KEYDOWN (VK_MENU) 
+        //          WM_SYSKEYUP (VK_CONTROL)
+        //          WM_KEYUP (VK_MENU)
+        //
+        // Ctrl+AltGr -> WM_KEYDOWN (VK_CONTROL), WM_KEYUP (VK_CONTROL) 
+        //               WM_KEYDOWN (VK_MENU) 
+        //               WM_KEYUP (VK_MENU)
+        //               WM_KEYUP (VK_CONTROL) 
+        //
+        // AltGr+Ctrl -> WM_KEYDOWN (VK_CONTROL), WM_KEYDOWN (VK_MENU) 
+        //               WM_KEYDOWN (VK_CONTROL) 
+        //               WM_SYSKEYUP (VK_CONTROL) 
+        //               WM_SYSKEYUP (VK_CONTROL) 
+        //               WM_KEYUP (VK_MENU)
+        //
+        // AltGr down -> if Ctrl down, send WM_KEYUP (VK_CONTROL)
+        //               endif
+        //               Send WM_KEYDOWN (VK_CONTROL)
+        //               Send WM_KEYDOWN (VK_MENU)
+        // AltGr up ->   if !(Ctrl down before AltGr was pressed || Ctrl up)
+        //                   Send WM_SYSKEYUP (VK_CONTROL)
+        //               endif
+        //               Send WM_KEYDOWN (VK_MENU)
+        // 
+        if(winMsg->wParam == VK_MENU_W && (winMsg->lParam & WIN_KEY_EXTENDED)) 
+        {//AltGr
+            if(GetKeyState(VK_CONTROL_W) & 0x8000) 
+            {//Ctrl key pressed, send WM_KEYUP
+            
+            }
+        }
+#endif
+
         //After SetFocus(0), all keystrokes are converted in WM_SYS*
         if(fIgnoreKeystrokes) {

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.39 2003-02-16 15:31:12 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.40 2003-02-16 18:29:27 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -985 +985 @@
 {
 #if 1
+   //temporary solution until we find out why OSLibWinGetScanStateTable always
+   //fails
    int state;
    for(int i=0;i<256;i++) {
@@ -993 +995 @@
        }
    }
-   return TRUE;
-#if 1
 #else
    BYTE PMScanState[256];
@@ -1022 +1022 @@
        }
    }
+#endif
+
+   //VK_LCONTROL needs special handling due to AltGr
+   state = GetKeyState(VK_RMENU);
+   if (state & 0x8000) 
+   {//if AltGr is down, then pretend VK_LCONTROL is down too
+       lpKeyState[VK_LCONTROL] = ((state & 0x8000) >> 8) | (state & 1);
+       lpKeyState[VK_CONTROL]  = ((state & 0x8000) >> 8) | (state & 1);
+   }
+
    //now process the mouse buttons (left, middle, right)
    state = GetKeyState(VK_LBUTTON);
@@ -1041 +1051 @@
 #endif
    return TRUE;
-#endif
-#else
- BYTE   PMKeyState[256];
- BOOL   rc;
-
-  memset(PMKeyState, 0, sizeof(PMKeyState));
-  memset(lpKeyState, 0, 256);
-  rc = OSLibWinGetKeyboardStateTable((PBYTE)&PMKeyState[0] );
-////  rc = O32_GetKeyboardState(lpKeyState);
-  if(rc == TRUE)
-  {
-    KeyTranslatePMToWinBuf((BYTE *)&PMKeyState[0], lpKeyState, 256);
-    
-    // @@@PH
-    // Note: we'd have to check the key state overlay array here, too!
-    
-#ifdef DEBUG
-        for(int i=0;i<256;i++) {
-            if(PMKeyState[i] & 0x80) {
-                dprintf2(("PM  key 0x%0x = %x", i, PMKeyState[i]));
-            }
-        }
-        for(i=0;i<256;i++) {
-            if(lpKeyState[i]) {
-                dprintf2(("Win key 0x%0x = %x", i, lpKeyState[i]));
-            }
-        }
-#endif
-        return TRUE;
-  }
-  return FALSE;
-#endif
 }
 //******************************************************************************
@@ -1477 +1455 @@
       WORD result;
 
+      if (nVirtKey == VK_CONTROL || nVirtKey == VK_LCONTROL) 
+      {//if AltGr is down, then pretend VK_LCONTROL is down too
+          result = OSLibWinGetScanState(abWinVKeyToPMScan[VK_RMENU].bPMScanCode);
+          if(result & 0x8000) {
+              return result;
+          }
+          //not down, check the control keys
+      }
+
       if (nVirtKey == VK_MENU)  {
           nVirtKey  = VK_LMENU;
@@ -1528 +1515 @@
       WORD result;
 
+      if (nVirtKey == VK_CONTROL || nVirtKey == VK_LCONTROL) 
+      {//if AltGr is down, then pretend VK_LCONTROL is down too
+          result = OSLibWinGetPhysKeyState(abWinVKeyToPMScan[VK_RMENU].bPMScanCode);
+          if(result & 0x8000) {
+              return result;
+          }
+          //not down, check the control keys
+      }
       if (nVirtKey == VK_MENU)  {
           nVirtKey  = VK_LMENU;