Changeset 7205 for trunk/src

Timestamp:

Oct 25, 2001, 5:35:53 PM (24 years ago)

Author:

phaller

Message:

fixed ESC processing

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (2 diffs)
• oslibmsgtranslate.cpp (modified) (6 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.45 2001-10-09 05:18:02 phaller Exp $ */
+/* $Id: oslibmsg.cpp,v 1.46 2001-10-25 15:35:53 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -368 +368 @@
       return FALSE;
   }
-
+  
+  // @@@PH
+  // warning - OS2ToWinMsgTranslate might insert additional messages
+  // into the queue
   if(OS2ToWinMsgTranslate((PVOID)teb, &os2msg, pMsg, isUnicode, (fRemove & PM_REMOVE_W) ? MSG_REMOVE : MSG_NOREMOVE) == FALSE) 
   {

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.67 2001-10-25 13:16:57 phaller Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.68 2001-10-25 15:35:53 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -35 +35 @@
 #include <pmkbdhk.h>
 #include <pmscan.h>
+#include <winscan.h>
 
 #define DBG_LOCALLOG    DBG_oslibmsgtranslate
@@ -164 +165 @@
 static MSG  doubleClickMsg = {0};
 
+
+//******************************************************************************
+//******************************************************************************
+BOOL setThreadQueueExtraCharMessage(TEB* teb, MSG* pExtraMsg)
+{
+  // check if the single slot is occupied already
+  if (teb->o.odin.fTranslated == TRUE)
+    // 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));
+  return TRUE;
+}
+
 //******************************************************************************
 //******************************************************************************
@@ -652 +668 @@
         dprintf(("PM: WM_CHAR_SPECIAL\n"));
         
-        // AltGr is a very, very strange key!
-        UCHAR ucPMScanCode = CHAR4FROMMP(os2Msg->mp1);
-        switch (ucPMScanCode)
-        {
-          case PMSCAN_ESC:
-            // Note: ESC generates a WM_CHAR under Windows, not under PM
-            // so we've got to post it to ourself here!
-            // WM_CHAR(0x0000001bh, 00010001h)
-            // @@@PH
-            break;
-          
-          case PMSCAN_PRINT:
-            // Note: PRINT generates a WM_KEYUP under Windows
-            // also only call the standard kbd hook for the WM_KEYUP msg,
-            // the low-level hook is called twice
-            // WM_CHAR(0x0000002ch, c1370001h)
-            // @@@PH
-            break;
-          
-          case PMSCAN_ALTRIGHT:
-          {
-            ULONG flags = SHORT1FROMMP(os2Msg->mp1);
-            
-            // we need very special treatment here for the
-            // poor, crippled AltGr key
-            
-            if (flags & KC_KEYUP)
-            {
-              // key up
-              // 1 - generate a virtual LCONTROL-keypress
-              // 2 - send LMENU-keypress (NT emulates ALtGr w/ Ctrl-Alt!)
-            }
-            else
-            {
-              // key down:
-              // 1 - generate a virtual LCONTROL-keypress
-              // 2 - send LMENU-keypress (NT emulates ALtGr w/ Ctrl-AltGr!)
-            }
-          }
-        } /* switch */
-    } /* case */
-        // NO BREAK! FALLTHRU CASE!
+      // NO BREAK! FALLTHRU CASE!
+    }
       
     case WM_CHAR:
@@ -824 +800 @@
             winMsg->lParam |= 1 << 29;
           }
+        }
+      
+        // ------------------------------------------------
+        // check if additional messages have to be recorded
+        // ------------------------------------------------
+        {
+          MSG extramsg;
+          extramsg.hwnd = winMsg->hwnd;
+          extramsg.time = winMsg->time;
+          extramsg.pt   = winMsg->pt;
+          
+          switch (scanCode)
+          {
+            case PMSCAN_ESC:
+            {
+              // Note: ESC generates a WM_CHAR for WINWM_KEYDOWN
+              // under Windows, not under PM
+              // so we've got to post it to ourself here!
+              // WM_CHAR(0x0000001bh, 00010001h)
+              if (winMsg->message == WINWM_KEYDOWN)
+              {
+                extramsg.message = WINWM_CHAR;
+                extramsg.wParam  = VK_ESCAPE_W;
+                extramsg.lParam  = winMsg->lParam;
+                setThreadQueueExtraCharMessage(teb, &extramsg);
+              }
+            }
+            break;
+            
+#if 0
+            case PMSCAN_PRINT:
+              // Note: PRINT generates a WM_KEYUP under Windows
+              // also only call the standard kbd hook for the WM_KEYUP msg,
+              // the low-level hook is called twice
+              // mb->putWinMsg(hwndWin32, WM_CHAR, VK_PRINT_W, ... )
+              // WM_CHAR(0x0000002ch, c1370001h)
+              extramsg.message = WINWM_KEYUP;
+              extramsg.wParam  = VK_PRINT_W;
+              extramsg.lParam  = winMsg->lParam;
+              setThreadQueueExtraCharMessage(teb, &extramsg);
+              break;
+#endif
+            
+            case PMSCAN_ALTRIGHT:
+            {
+              // we need very special treatment here for the
+              // poor, crippled AltGr key
+              if (keyWasPressed)
+              {
+                // 1 - generate a virtual LCONTROL-keypress
+                // 2 - send LMENU-keypress (NT emulates ALtGr w/ Ctrl-AltGr!)
+                // 0xfe000000: mask out extended-key, scancode, repeatcount
+                extramsg.message = WINWM_KEYDOWN;
+                extramsg.wParam  = VK_RMENU_W;
+                extramsg.lParam  = (winMsg->lParam & 0xfe000000)
+                                   | repeatCount
+                                   | (WINSCAN_ALTRIGHT << 24);
+                winMsg->message  = WINWM_KEYDOWN;
+                winMsg->wParam   = VK_LCONTROL_W;
+                winMsg->lParam   = (winMsg->lParam & 0xfe000000)
+                                   | repeatCount
+                                   | (WINSCAN_CTRLLEFT << 24);
+              }
+              else
+              {
+                // key up
+                // 1 - generate a virtual LCONTROL-keypress
+                // 2 - send LMENU-keypress (NT emulates ALtGr w/ Ctrl-Alt!)
+                extramsg.message = WINWM_KEYDOWN;
+                extramsg.wParam  = VK_RMENU_W;
+                extramsg.lParam  = (winMsg->lParam & 0xfe000000)
+                                   | repeatCount
+                                   | (WINSCAN_ALTRIGHT << 24);
+                winMsg->message  = WINWM_SYSKEYUP;
+                winMsg->wParam   = VK_LCONTROL_W;
+                winMsg->lParam   = (winMsg->lParam & 0xfe000000)
+                                   | repeatCount
+                                   | (WINSCAN_CTRLLEFT << 24);
+              }
+              
+              setThreadQueueExtraCharMessage(teb, &extramsg);
+            }
+          } /* switch */
         }
       
@@ -1026 +1085 @@
             if(fl & KC_KEYUP)
                 extramsg.lParam |= (1<<31);
-
-            teb->o.odin.fTranslated = TRUE;
-            memcpy(&teb->o.odin.msgWCHAR, &extramsg, sizeof(MSG));
+      
+            // insert message into the queue
+            setThreadQueueExtraCharMessage(teb, &extramsg);
             return TRUE;
     }