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

Timestamp:

Dec 11, 2001, 6:34:53 PM (24 years ago)

Author:

sandervl

Message:

hook, scancode + altgr fixes

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.77 2001-11-16 17:47:04 phaller Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.78 2001-12-11 17:34:53 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -614 +614 @@
         // winMsg->wParam  = pmscan2winkey[scanCode][0];
         // wWinScan  = pmscan2winkey[scanCode][1];
-      
+     
       {
         BOOL  fWinExtended;
@@ -632 +632 @@
         // Set the extended bit when appropriate
         if (fWinExtended)
-            winMsg->lParam = winMsg->lParam | (1<<24);
+            winMsg->lParam = winMsg->lParam | WIN_KEY_EXTENDED;
       }
 
@@ -640 +640 @@
             winMsg->wParam = virtualKey + 0x30;
       
-      
-        #define WIN_KEY_EXTENDED   0x01000000
-        #define WIN_KEY_DONTCARE   0x02000000
-        #define WIN_KEY_ALTHELD    0x20000000
-        #define WIN_KEY_PREVSTATE  0x40000000
-
+
+#ifdef ALTGR_HACK
+     
         if (usPMScanCode == PMSCAN_ALTRIGHT)
         {
@@ -661 +658 @@
           {
             winMsg->message = WINWM_SYSKEYUP;
-            winMsg->lParam |= 1 << 29;                              // bit 29, alt was pressed
-            winMsg->lParam |= 1 << 30;                              // bit 30, previous state, always 1 for a WM_KEYUP message
+            winMsg->lParam |= WIN_KEY_ALTHELD;                      // bit 29, alt was pressed
+            winMsg->lParam |= WIN_KEY_PREVSTATE;                    // bit 30, previous state, always 1 for a WM_KEYUP message
             winMsg->lParam |= 1 << 31;                              // bit 31, transition state, always 1 for WM_KEYUP
             
@@ -675 +672 @@
             winMsg->lParam |= WIN_KEY_ALTHELD;
             if (keyWasPressed)
-              winMsg->lParam |= 1 << 30;                          // bit 30, previous state, 1 means key was pressed
+              winMsg->lParam |= WIN_KEY_PREVSTATE;     // bit 30, previous state, 1 means key was pressed
             winMsg->message = WINWM_KEYDOWN;
             
@@ -689 +686 @@
             // KeySetOverlayKeyState(VK_RMENU_W, KEYOVERLAYSTATE_DOWN);
           }
-          
-          break;
-        }
-      
+        }     
+#endif
       
         if (!(flags & KC_ALT))
@@ -719 +714 @@
             }
             
-            winMsg->lParam |= 1 << 30;                              // bit 30, previous state, always 1 for a WM_KEYUP message
+            winMsg->lParam |= WIN_KEY_PREVSTATE;                    // bit 30, previous state, always 1 for a WM_KEYUP message
             winMsg->lParam |= 1 << 31;                              // bit 31, transition state, always 1 for WM_KEYUP
           }
@@ -727 +722 @@
             winMsg->message = WINWM_KEYDOWN;
             if (keyWasPressed)
-              winMsg->lParam |= 1 << 30;                          // bit 30, previous state, 1 means key was pressed
+              winMsg->lParam |= WIN_KEY_PREVSTATE;                  // bit 30, previous state, 1 means key was pressed
           }
         }
@@ -739 +734 @@
             // send WM_SYSKEYUP message
             winMsg->message = WINWM_SYSKEYUP;
-            winMsg->lParam |= 1 << 30;                              // bit 30, previous state, always 1 for a WM_KEYUP message
+            winMsg->lParam |= WIN_KEY_PREVSTATE;                    // bit 30, previous state, always 1 for a WM_KEYUP message
             winMsg->lParam |= 1 << 31;                              // bit 31, transition state, always 1 for WM_KEYUP
           }
@@ -747 +742 @@
             winMsg->message = WINWM_SYSKEYDOWN;
             if (keyWasPressed)
-              winMsg->lParam |= 1 << 30;                          // bit 30, previous state, 1 means key was pressed
+              winMsg->lParam |= WIN_KEY_PREVSTATE;                  // bit 30, previous state, 1 means key was pressed
 
             // pressed ALT-key generates additional flag 0x2000000
             // if the current window has keyboard focus
-            winMsg->lParam |= 1 << 29;
+            winMsg->lParam |= WIN_KEY_ALTHELD;
           }
         }
@@ -761 +756 @@
             }
         }
+
+#ifdef ALTGR_HACK
+        // it's a PMSCAN_ALTRIGHT WM_CHAR message?
+        // and not previously translated?
+        if(fMsgRemoved && usPMScanCode == PMSCAN_ALTRIGHT && !(teb->o.odin.fTranslated))
+        {
+            dprintf(("Queue ALTRIGHT message"));
+            // special ALTRIGHT treatment:
+            // we try to insert another WM_KEYDOWN or WM_KEYUP instead of
+            // the usual WM_CHAR which is expected here.
+            // -> experimental
+            // it's really an OS/2-style WM_CHAR message?
+            MSG extramsg;
+            memcpy(&extramsg, winMsg, sizeof(MSG));
+    
+            // AltGr is not released with WINWM_SYSKEYUP, but WINWM_KEYUP
+            if(flags & KC_KEYUP)
+            {
+                extramsg.message = WINWM_KEYUP;
+            }
+            extramsg.wParam = VK_RMENU_W;
+    
+            // mask out message bits and scan code
+            extramsg.lParam &= (0xDC00FFFF);
+            extramsg.lParam |= (WINSCAN_ALTRIGHT & 0x1FF) << 16;
+////            extramsg.lParam |= WIN_KEY_EXTENDED;
+            if (!(flags & KC_KEYUP))
+                extramsg.lParam |= WIN_KEY_ALTHELD;
+  
+            // insert message into the queue
+            setThreadQueueExtraCharMessage(teb, &extramsg);
+        }
+#endif
         break;
     }
@@ -915 +943 @@
   UCHAR ucPMScanCode = CHAR4FROMMP(teb->o.odin.os2msg.mp1);
   ULONG fl = SHORT1FROMMP(teb->o.odin.os2msg.mp1);
-  
-  
-  // special ALTRIGHT treatment:
-  // we try to insert another WM_KEYDOWN or WM_KEYUP instead of
-  // the usual WM_CHAR which is expected here.
-  // -> experimental
-  if (ucPMScanCode == PMSCAN_ALTRIGHT)
-  {
-    // it's really an OS/2-style WM_CHAR message?
-    // and not previously translated?
-    if ( ( (teb->o.odin.os2msg.msg != WM_CHAR) &&
-           (teb->o.odin.os2msg.msg != WM_CHAR_SPECIAL) ) ||
-         (teb->o.odin.fTranslated) )
-      return FALSE;
-    
-    memcpy(&extramsg, msg, sizeof(MSG));
-    
-    // AltGr is not released with WINWM_SYSKEYUP, but WINWM_KEYUP
-    if (fl & KC_KEYUP)
-    {
-      extramsg.message = WINWM_KEYUP;
-    }
-      
-    
-    extramsg.wParam = VK_RMENU_W;
-    
-    // mask out message bits and scan code
-    extramsg.lParam &= (0xDC00FFFF);
-    extramsg.lParam |= (WINSCAN_ALTRIGHT & 0x1FF) << 16;
-    extramsg.lParam |= WIN_KEY_EXTENDED;
-    if (!(fl & KC_KEYUP))
-      extramsg.lParam |= WIN_KEY_ALTHELD;
-    
-    // insert message into the queue
-    setThreadQueueExtraCharMessage(teb, &extramsg);
-
-    return TRUE;
-  }
+ 
   
     //NOTE: These actually need to be posted so that the next message retrieved by GetMessage contains
@@ -1006 +997 @@
       extramsg.lParam = msg->lParam & 0x00FFFFFF;
       if(fl & KC_ALT)
-        extramsg.lParam |= (1<<29);
+        extramsg.lParam |= WIN_KEY_ALTHELD;
       if(fl & KC_PREVDOWN)
-        extramsg.lParam |= (1<<30);
+        extramsg.lParam |= WIN_KEY_PREVSTATE;
       if(fl & KC_KEYUP)
         extramsg.lParam |= (1<<31);