Changeset 7370 for trunk/src

Timestamp:

Nov 16, 2001, 6:47:05 PM (24 years ago)

Author:

phaller

Message:

ugly AltGr hack

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (5 diffs)
• oslibmsgtranslate.cpp (modified) (5 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.49 2001-10-26 17:48:21 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.50 2001-11-16 17:47:05 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -35 +35 @@
 #include "oslibwin.h"
 #include <win\hook.h>
+#include <winscan.h>
+#include <winkeyboard.h>
 
 #define DBG_LOCALLOG    DBG_oslibmsg
@@ -206 +208 @@
 //******************************************************************************
 //******************************************************************************
+
+static void i_MostUglyAltGrHack(LPMSG pMsg)
+{
+  switch (pMsg->message)
+  {
+    case WINWM_KEYUP:
+    case WINWM_SYSKEYUP:
+      USHORT wWinScan = (pMsg->lParam & 0x00ff0000) >> 16;
+      if (wWinScan == WINSCAN_ALTRIGHT)
+      {
+        KeySetOverlayKeyState(VK_RMENU_W, KEYOVERLAYSTATE_DONTCARE);
+        KeySetOverlayKeyState(VK_MENU_W, KEYOVERLAYSTATE_DONTCARE);
+      }
+      break;
+  }
+}
+
+
 BOOL OSLibWinGetMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
                     BOOL isUnicode)
@@ -262 +282 @@
         }
     
+        i_MostUglyAltGrHack(pMsg);
+    
         return (pMsg->message != WINWM_QUIT);
   }
@@ -322 +344 @@
   }
   
+  i_MostUglyAltGrHack(pMsg);
+  
   return rc;
 }

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.76 2001-11-09 02:09:27 phaller Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.77 2001-11-16 17:47:04 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -668 +668 @@
             // The overlay causes GetKeyState/GetAsyncKeyState to return
             // the correct states
-            KeySetOverlayKeyState(VK_LMENU_W, KEYOVERLAYSTATE_DONTCARE);
             KeySetOverlayKeyState(VK_LCONTROL_W, KEYOVERLAYSTATE_DONTCARE);
             KeySetOverlayKeyState(VK_CONTROL_W, KEYOVERLAYSTATE_DONTCARE);
-            KeySetOverlayKeyState(VK_RMENU_W, KEYOVERLAYSTATE_DONTCARE);
           }
           else
@@ -683 +681 @@
             // The overlay causes GetKeyState/GetAsyncKeyState to return
             // the correct states
-            KeySetOverlayKeyState(VK_LMENU_W, KEYOVERLAYSTATE_DOWN);
             KeySetOverlayKeyState(VK_LCONTROL_W, KEYOVERLAYSTATE_DOWN);
             KeySetOverlayKeyState(VK_CONTROL_W, KEYOVERLAYSTATE_DOWN);
             KeySetOverlayKeyState(VK_RMENU_W, KEYOVERLAYSTATE_DOWN);
+            KeySetOverlayKeyState(VK_MENU_W, KEYOVERLAYSTATE_DOWN);
+            
+            // Note: when CTRL comes up, windows keeps ALTGR still down!
+            // KeySetOverlayKeyState(VK_RMENU_W, KEYOVERLAYSTATE_DOWN);
           }
           
@@ -933 +934 @@
     // AltGr is not released with WINWM_SYSKEYUP, but WINWM_KEYUP
     if (fl & KC_KEYUP)
+    {
       extramsg.message = WINWM_KEYUP;
+    }
+      
     
     extramsg.wParam = VK_RMENU_W;
@@ -946 +950 @@
     // insert message into the queue
     setThreadQueueExtraCharMessage(teb, &extramsg);
+
     return TRUE;
   }