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

Timestamp:

Feb 8, 2002, 10:58:42 AM (24 years ago)

Author:

sandervl

Message:

PF: fix for Shift-Enter + Alt-Enter

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.79 2001-12-12 16:40:43 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.80 2002-02-08 09:58:42 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -53 +53 @@
     // there's still an already translated message to be processed
     return FALSE;
-  
   teb->o.odin.fTranslated = TRUE;
   memcpy(&teb->o.odin.msgWCHAR, pExtraMsg, sizeof(MSG));
@@ -656 +655 @@
             {
               winMsg->message = WINWM_SYSKEYUP;
-              
               // held ALT-key when current key is released
               // generates additional flag 0x2000000
@@ -667 +665 @@
               winMsg->message = WINWM_KEYUP;
             }
-            
             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
+
+            //Shift-Enter and possibly others need to have special handling
+             if (flags & KC_SHIFT)
+             {
+                if(fMsgRemoved && !(teb->o.odin.fTranslated))
+                {                    
+                  dprintf(("PM: KC_SHIFT: %x",winMsg->wParam));
+                  if (winMsg->wParam == VK_RETURN_W)
+                  {
+                    MSG extramsg;
+                    memcpy(&extramsg, winMsg, sizeof(MSG));
+    
+                    extramsg.message = WINWM_CHAR;
+                    extramsg.lParam |= 1 << 31;                              // bit 31, transition state, always 1 for WM_KEYUP 
+
+                    // insert message into the queue
+                    setThreadQueueExtraCharMessage(teb, &extramsg);
+
+                    winMsg->message = WINWM_KEYDOWN;
+                    winMsg->lParam &= 0x3FFFFFFF;
+                  }
+               } // else ???
+            } // KC_SHIFT
           }
           else 
@@ -686 +706 @@
           if (flags & KC_KEYUP)
           {
-            // send WM_SYSKEYUP message
-            winMsg->message = WINWM_SYSKEYUP;
-            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
+            // as in NT4 we will send currently fake WM_SYSKEYDOWN with
+            // ALT key held
+            // ?? fMsgRemoved care - it seems we can only push one message?             
+            if(fMsgRemoved && !(teb->o.odin.fTranslated))
+            {                    
+
+              MSG extramsg;
+              memcpy(&extramsg, winMsg, sizeof(MSG));
+    
+              extramsg.message = WINWM_SYSKEYUP;
+              extramsg.lParam |= WIN_KEY_PREVSTATE;            
+              extramsg.lParam |= WIN_KEY_ALTHELD;            
+              extramsg.lParam |= 1 << 31;                              // bit 31, transition state, always 1 for WM_KEYUP 
+
+              // insert message into the queue
+              setThreadQueueExtraCharMessage(teb, &extramsg);
+              winMsg->message = WINWM_SYSKEYDOWN;
+              winMsg->lParam |= WIN_KEY_ALTHELD;;
+            }   
           }
           else