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

Timestamp:

Jan 9, 2000, 3:38:30 PM (26 years ago)

Author:

sandervl

Message:

Several updates/bug fixes

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.10 2000-01-08 16:53:38 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.11 2000-01-09 14:37:09 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -7 +7 @@
  * Copyright 1999      Daniela Engert (dani@ngrt.de)
  * Copyright 1999      Rene Pronk (R.Pronk@twi.tudelft.nl)
+ *
+ * NOTE: WM_NCHITTEST messages are sent whenever the mouse cursor moves or a mouse button is clicked/released
+ *       (directly when receiving those messages)
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -119 +122 @@
             fIsFrameControl = (win32wnd != 0);
         }
-        //NOTE: We only translate WM_PAINT/WM_HITTEST & mouse messages; the rest must not be seen by win32 apps
+        //NOTE: We only translate WM_PAINT, WM_ACTIVATE & mouse messages; the rest must not be seen by win32 apps
   }
   //PostThreadMessage posts WIN32APP_POSTMSG msg without window handle
@@ -226 +229 @@
         //     this message
         if(lpRect->right == thdb->wp.x+thdb->wp.cx && lpRect->bottom == thdb->wp.y+thdb->wp.cy) {
-                winMsg->message    = WINWM_WINDOWPOSCHANGED;
-                winMsg->lParam = (LPARAM)&thdb->wp;
+                winMsg->message = WINWM_WINDOWPOSCHANGED;
+                winMsg->lParam  = (LPARAM)&thdb->wp;
         }
         else {
@@ -252 +255 @@
         }
 
-        winMsg->message = WINWM_ACTIVATE;
-        winMsg->wParam  = MAKELONG((SHORT1FROMMP(os2Msg->mp1)) ? WA_ACTIVE_W : WA_INACTIVE_W, fMinimized);
-        winMsg->lParam  = (LPARAM)hwndActivate;
+        if(fIsFrameControl) {
+            fTranslateFrameControlMsg = TRUE; //we want a win32 app to see this msg for a frame control
+            winMsg->message = WINWM_NCACTIVATE;
+            winMsg->wParam  = SHORT1FROMMP(os2Msg->mp1);
+        }
+        else
+        {
+            winMsg->message = WINWM_ACTIVATE;
+            winMsg->wParam  = MAKELONG((SHORT1FROMMP(os2Msg->mp1)) ? WA_ACTIVE_W : WA_INACTIVE_W, fMinimized);
+            winMsg->lParam  = (LPARAM)hwndActivate;
+        }
         break;
     }
@@ -292 +303 @@
     case WM_BUTTON3UP:
     case WM_BUTTON3DBLCLK:
+    {
+     ULONG hittest;
+
         if(fIsFrameControl) {
             fTranslateFrameControlMsg = TRUE; //we want a win32 app to see this msg for a frame control
         }
 
+        hittest = win32wnd->MsgHitTest(winMsg->pt.x, winMsg->pt.y);
+
         //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
-        if(win32wnd->lastHitTestVal != HTCLIENT_W) {
+        if(hittest != HTCLIENT_W) {
             winMsg->message = WINWM_NCLBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
-            winMsg->wParam  = win32wnd->lastHitTestVal;
+            winMsg->wParam  = hittest;
             winMsg->lParam  = MAKELONG(winMsg->pt.x, winMsg->pt.y); //screen coordinates
         }
@@ -311 +327 @@
             winMsg->lParam  = MAKELONG(ClientPoint.x, ClientPoint.y); //client coordinates
         }
-
-        break;
+        break;
+    }
 
     case WM_BUTTON2MOTIONSTART:
@@ -327 +343 @@
     case WM_MOUSEMOVE:
     {
-        ULONG keystate = 0, setcursormsg = WINWM_MOUSEMOVE;
+        ULONG keystate = 0, setcursormsg = WINWM_MOUSEMOVE, hittest;
 
         if(fIsFrameControl) {
@@ -344 +360 @@
             keystate |= MK_CONTROL_W;
 
+        hittest = win32wnd->MsgHitTest(winMsg->pt.x, winMsg->pt.y);
+
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
-        if(win32wnd->lastHitTestVal != HTCLIENT_W)
+        if(hittest != HTCLIENT_W)
         {
           setcursormsg   = WINWM_NCMOUSEMOVE;
-          winMsg->wParam = (WPARAM)win32wnd->lastHitTestVal;
+          winMsg->wParam = (WPARAM)hittest;
           winMsg->lParam = MAKELONG(winMsg->pt.x,winMsg->pt.y);
         }
@@ -546 +564 @@
 
         if(wndParams->fsStatus & WPM_TEXT) {
-            win32wnd->MsgSetText(wndParams->pszText, wndParams->cchText);
+            winMsg->message = WINWM_SETTEXT;
+            winMsg->lParam  = (LPARAM)wndParams->pszText;
             break;
         }
@@ -585 +604 @@
         }
         else    winMsg->message = WINWM_PAINT;
-        break;
-    }
-
-    case WM_HITTEST:
-    {
-        OSLIBPOINT pt;
-
-        fTranslateFrameControlMsg = TRUE; //we want a win32 app to see this msg for a frame control
-
-        pt.x = (*(POINTS *)&os2Msg->mp1).x;
-        pt.y = (*(POINTS *)&os2Msg->mp1).y;
-
-        mapOS2ToWin32Point(os2Msg->hwnd,OSLIB_HWND_DESKTOP,&pt);
-        winMsg->message  = WINWM_NCHITTEST;
-        winMsg->wParam  = 0;
-        winMsg->lParam  = MAKELONG((USHORT)pt.x, (USHORT)pt.y);
         break;
     }