Changeset 2208 for trunk/src/user32/oslibmsg.cpp

Timestamp:

Dec 27, 1999, 3:41:43 PM (26 years ago)

Author:

sandervl

Message:

Lots of message fixes

File:

• trunk/src/user32/oslibmsg.cpp (modified) (10 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.15 1999-12-24 18:39:10 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.16 1999-12-27 14:41:41 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -13 +13 @@
  *       (i.e. menu WM_COMMAND messages)
  *
- * TODO: Filter translation isn't correct for posted messages
+ * TODO: Filter translation isn't correct! (for posted messages or messages that don't have
+ *       a PM version.
  *
  */
@@ -43 +44 @@
 } MSGTRANSTAB, *PMSGTRANSTAB;
 
+//NOTE: Must be ordered by win32 message id!!
 MSGTRANSTAB MsgTransTab[] = {
    WM_NULL,          WINWM_NULL,
    WM_CREATE,        WINWM_CREATE,
    WM_DESTROY,       WINWM_DESTROY,
-   WM_TIMER,         WINWM_TIMER,
+   WM_MOVE,          WINWM_MOVE,            //TODO: Sent directly
+   WM_SIZE,          WINWM_SIZE,            //TODO: Sent directly
+   WM_ACTIVATE,      WINWM_ACTIVATE,
+   WM_SETFOCUS,      WINWM_SETFOCUS,
+   WM_SETFOCUS,      WINWM_KILLFOCUS,
+   WM_ENABLE,        WINWM_ENABLE,
+   WM_PAINT,         WINWM_PAINT,
    WM_CLOSE,         WINWM_CLOSE,
    WM_QUIT,          WINWM_QUIT,
-
-   WM_ENABLE,        WINWM_ENABLE,
    WM_SHOW,          WINWM_SHOWWINDOW,
-   WM_MOVE,          WINWM_MOVE,
-   WM_SIZE,          WINWM_SIZE,
-   //
+
    WM_HITTEST,       WINWM_NCHITTEST,
-   //
-   WM_ACTIVATE,      WINWM_ACTIVATE,
-   WM_SETFOCUS,      WINWM_SETFOCUS,
-   //
+
+   //TODO: Needs better translation!
+   WM_CHAR,          WINWM_KEYDOWN,
+   WM_CHAR,          WINWM_KEYUP,
+   WM_CHAR,          WINWM_CHAR,
+   WM_CHAR,          WINWM_DEADCHAR,
+   WM_CHAR,          WINWM_SYSKEYDOWN,
+   WM_CHAR,          WINWM_SYSKEYUP,
+   WM_CHAR,          WINWM_SYSCHAR,
+   WM_CHAR,          WINWM_SYSDEADCHAR,
+   WM_CHAR,          WINWM_KEYLAST,
+
    WM_COMMAND,       WINWM_COMMAND,
    WM_SYSCOMMAND,    WINWM_SYSCOMMAND,
    //
-   WM_PAINT,         WINWM_PAINT,
    WM_TIMER,         WINWM_TIMER,
-   //
-   WM_CLOSE,         WINWM_CLOSE,
-   WM_QUIT,          WINWM_QUIT,
-   //
-   WM_CONTROL,       WINWM_COMMAND,
+   WM_INITMENU,      WINWM_INITMENU,
    //
    WM_MOUSEMOVE,     WINWM_MOUSEMOVE,
@@ -82 +89 @@
    WM_BUTTON3UP,     WINWM_MBUTTONUP,
    WM_BUTTON3DBLCLK, WINWM_MBUTTONDBLCLK,
-   0x020a, 0x020a,   // WM_???,             WM_???
-   WM_CHAR,          WINWM_CHAR,
-
-   //TODO: Needs better translation!
-   WM_CHAR,          WINWM_KEYDOWN,
-   WM_CHAR,          WINWM_KEYUP,
-   WM_CHAR,          WINWM_SYSKEYDOWN,
-   WM_CHAR,          WINWM_SYSKEYUP,
-   WM_CHAR,          WINWM_KEYLAST
+
+   999999999,        999999999,
 };
 #define MAX_MSGTRANSTAB (sizeof(MsgTransTab)/sizeof(MsgTransTab[0]))
@@ -119 +119 @@
 }
 //******************************************************************************
-//TODO!!!
-//Signal that the incoming messages in pmwindow need to be translated
-//(i.e. PM WM_CHAR when translated generates WM_CHAR messages, otherwise
-// WM_KEYUP/DOWN (etc))
-//******************************************************************************
-ULONG TranslateWinMsg(ULONG msg)
+//TODO: NOT COMPLETE nor 100% CORRECT!!!
+//If both the minimum & maximum message are unknown, the result can be wrong (max > min)!
+//******************************************************************************
+ULONG TranslateWinMsg(ULONG msg, BOOL fMinFilter)
 {
  POSTMSG_PACKET *packet;
 
-  if(msg >= WINWM_USER)
-    return WIN32APP_POSTMSG;
-
-  for(int i=0;i<MAX_MSGTRANSTAB;i++)
-  {
-    if(MsgTransTab[i].msgWin32 == msg)
+    if(msg == 0)
+        return 0;
+
+    if(msg >= WINWM_USER)
+        return WIN32APP_POSTMSG;
+
+    for(int i=0;i<MAX_MSGTRANSTAB;i++)
     {
-      return MsgTransTab[i].msgOS2;
+        if(fMinFilter && MsgTransTab[i].msgWin32 >= msg) {
+            return MsgTransTab[i].msgOS2;
+        }
+        else
+        if(!fMinFilter && MsgTransTab[i].msgWin32 >= msg) {
+            if(MsgTransTab[i].msgWin32 == msg)
+                    return MsgTransTab[i].msgOS2;
+            else    return MsgTransTab[i-1].msgOS2;
+        }
     }
-  }
-
-  return 0;
+
+    return 0;
 }
 //******************************************************************************
@@ -197 +203 @@
 
   if(thdb->fTranslated && (!hwnd || hwnd == thdb->msgWCHAR.hwnd)) {
+        if(uMsgFilterMin) {
+            if(thdb->msgWCHAR.message < uMsgFilterMin)
+                goto continuegetmsg;
+        }
+        if(uMsgFilterMax) {
+            if(thdb->msgWCHAR.message > uMsgFilterMax)
+                goto continuegetmsg;
+        }
         thdb->fTranslated = FALSE;
         memcpy(pMsg, &thdb->msgWCHAR, sizeof(MSG));
@@ -203 +217 @@
         return TRUE;
   }
+
+continuegetmsg:
   if(hwnd) {
         do {
-            WinWaitMsg(thdb->hab, TranslateWinMsg(uMsgFilterMin), TranslateWinMsg(uMsgFilterMax));
+            WinWaitMsg(thdb->hab, TranslateWinMsg(uMsgFilterMin, TRUE), TranslateWinMsg(uMsgFilterMax, FALSE));
             rc = OSLibWinPeekMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax, PM_REMOVE_W, isUnicode);
         }
@@ -214 +230 @@
     do {
         eaten = FALSE;
-        rc = WinGetMsg(thdb->hab, MsgThreadPtr, TranslateWinMsg(uMsgFilterMin), TranslateWinMsg(uMsgFilterMax), 0);
+        rc = WinGetMsg(thdb->hab, MsgThreadPtr, TranslateWinMsg(uMsgFilterMin, TRUE), TranslateWinMsg(uMsgFilterMax, FALSE), 0);
         if (MsgThreadPtr->msg == WM_TIMER)
             eaten = TIMER_HandleTimer (MsgThreadPtr);
@@ -238 +254 @@
 
   if(thdb->fTranslated && (!hwnd || hwnd == thdb->msgWCHAR.hwnd)) {
-        if(fRemove == PM_REMOVE_W) {
+        if(uMsgFilterMin) {
+            if(thdb->msgWCHAR.message < uMsgFilterMin)
+                goto continuepeekmsg;
+        }
+        if(uMsgFilterMax) {
+            if(thdb->msgWCHAR.message > uMsgFilterMax)
+                goto continuepeekmsg;
+        }
+
+        if(fRemove & PM_REMOVE_W) {
             thdb->fTranslated = FALSE;
             MsgThreadPtr->msg  = 0;
@@ -246 +271 @@
         return TRUE;
   }
-
+continuepeekmsg:
   do {
         eaten = FALSE;
-        rc = WinPeekMsg(thdb->hab, &os2msg, Win32BaseWindow::OS2ToWin32Handle(hwnd), TranslateWinMsg(uMsgFilterMin),
-                        TranslateWinMsg(uMsgFilterMax), (fRemove == PM_REMOVE_W) ? PM_REMOVE : PM_NOREMOVE);
-
-        if (rc && fRemove == PM_REMOVE_W && os2msg.msg == WM_TIMER)
+        rc = WinPeekMsg(thdb->hab, &os2msg, Win32BaseWindow::OS2ToWin32Handle(hwnd), TranslateWinMsg(uMsgFilterMin, TRUE),
+                        TranslateWinMsg(uMsgFilterMax, FALSE), (fRemove & PM_REMOVE_W) ? PM_REMOVE : PM_NOREMOVE);
+
+        if (rc && (fRemove & PM_REMOVE_W) && os2msg.msg == WM_TIMER) {
             eaten = TIMER_HandleTimer(&os2msg);
+        }
   }
   while (eaten && rc);
+
+  if(rc == FALSE) {
+    return FALSE;
+  }
 
   OS2ToWinMsgTranslate((PVOID)thdb, &os2msg, pMsg, isUnicode);
   //TODO: This is not safe! There's no guarantee this message will be dispatched and it might overwrite a previous message
-  if(fRemove == PM_REMOVE_W) {
+  if(fRemove & PM_REMOVE_W) {
         memcpy(MsgThreadPtr, &os2msg, sizeof(QMSG));
   }