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

Timestamp:

Dec 26, 1999, 6:30:20 PM (26 years ago)

Author:

cbratschi

Message:

non-client fixes, DefWndProc enhancements, several other bugs fixed

File:

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

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.1 1999-12-24 18:42:46 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.2 1999-12-26 17:30:15 cbratschi Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -283 +283 @@
         if(win32wnd->lastHitTestVal != HTCLIENT_W) {
             winMsg->message = WINWM_NCLBUTTONDOWN + (os2Msg->msg - WM_BUTTON1DOWN);
+            winMsg->wParam = win32wnd->lastHitTestVal;
             winMsg->lParam  = MAKELONG(winMsg->pt.x, winMsg->pt.y); //screen coordinates
         }
@@ -324 +325 @@
 
         //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
-        if(win32wnd->lastHitTestVal != HTCLIENT_W) {
-                setcursormsg   = WINWM_NCMOUSEMOVE;
-                winMsg->wParam = (WPARAM)win32wnd->lastHitTestVal;
-        }
-        else    winMsg->wParam = (WPARAM)keystate;
+        if(win32wnd->lastHitTestVal != HTCLIENT_W)
+        {
+          setcursormsg   = WINWM_NCMOUSEMOVE;
+          winMsg->wParam = (WPARAM)win32wnd->lastHitTestVal;
+          winMsg->lParam = MAKELONG(winMsg->pt.x,winMsg->pt.y);
+        } else
+        {
+          winMsg->wParam = (WPARAM)keystate;
+          winMsg->lParam  = MAKELONG(SHORT1FROMMP(os2Msg->mp1), MapOS2ToWin32Y(win32wnd, SHORT2FROMMP(os2Msg->mp1)));
+        }
         //OS/2 Window coordinates -> Win32 Window coordinates
         winMsg->message = setcursormsg;
-        winMsg->lParam  = MAKELONG(SHORT1FROMMP(os2Msg->mp1), MapOS2ToWin32Y(win32wnd, SHORT2FROMMP(os2Msg->mp1)));
         break;
     }
 
     case WM_CONTROL:
+      goto dummymessage;
+
     case WM_COMMAND:
         if(SHORT1FROMMP(os2Msg->mp2) == CMDSRC_MENU) {
@@ -511 +518 @@
           }
         }
-        goto dummymessage;
+        goto dummymessage; //for caret blinking
 
     case WM_SETWINDOWPARAMS:
@@ -556 +563 @@
 
     case WM_HITTEST:
-        // Only send this message if the window is enabled
-        if (WinIsWindowEnabled(os2Msg->hwnd))
-        {
-            OSLIBPOINT pt;
-            pt.x = (*(POINTS *)&os2Msg->mp1).x;
-            pt.y = (*(POINTS *)&os2Msg->mp1).y;
-            MapOS2ToWin32Point( OSLIB_HWND_DESKTOP, os2Msg->hwnd, &pt);
-            winMsg->message = WINWM_NCHITTEST;
-            winMsg->lParam  = MAKELONG((USHORT)pt.x, (USHORT)pt.y);
-            break;
-        }
-        goto dummymessage;
+    {
+        OSLIBPOINT pt;
+
+        pt.x = (*(POINTS *)&os2Msg->mp1).x;
+        pt.y = (*(POINTS *)&os2Msg->mp1).y;
+
+        MapOS2ToWin32Point(OSLIB_HWND_DESKTOP,os2Msg->hwnd,&pt);
+        winMsg->message  = WINWM_NCHITTEST;
+        winMsg->wParam  = 0;
+        winMsg->lParam  = MAKELONG((USHORT)pt.x, (USHORT)pt.y);
+        break;
+    }
 
     case WM_CONTEXTMENU: