Changeset 740 for trunk/src/user32/new/win32wnd.cpp

Timestamp:

Aug 29, 1999, 10:05:08 PM (26 years ago)

Author:

sandervl

Message:

Mouse message handling changes

File:

• trunk/src/user32/new/win32wnd.cpp (modified) (7 diffs)

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.34 1999-08-28 19:32:47 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.35 1999-08-29 20:05:07 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -880 +880 @@
 {
     if(hwnd == 0) {
-        //other app lost focus
-        SendInternalMessageA(WM_ACTIVATEAPP, TRUE, 0); //TODO: Need thread id from hwnd app
-    }
-    return SendInternalMessageA(WM_SETFOCUS, hwnd, 0);
+            //other app lost focus
+            SendInternalMessageA(WM_ACTIVATEAPP, TRUE, 0); //TODO: Need thread id from hwnd app
+    }
+    return  SendInternalMessageA(WM_SETFOCUS, hwnd, 0);
 }
 //******************************************************************************
@@ -890 +890 @@
 {
     if(hwnd == 0) {
-        //other app lost focus
-        SendInternalMessageA(WM_ACTIVATEAPP, FALSE, 0); //TODO: Need thread id from hwnd app
-    }
-    return SendInternalMessageA(WM_KILLFOCUS, hwnd, 0);
+            //other app lost focus
+            SendInternalMessageA(WM_ACTIVATEAPP, FALSE, 0); //TODO: Need thread id from hwnd app
+    }
+    return  SendInternalMessageA(WM_KILLFOCUS, hwnd, 0);
 }
 //******************************************************************************
@@ -949 +949 @@
         }
     }
-    SendInternalMessageA(win32ncmsg, lastHitTestVal, MAKELONG(ncx, ncy)); //TODO:
-    return SendInternalMessageA(win32msg, 0, MAKELONG(clx, cly));
+    SendInternalMessageA(WM_SETCURSOR, Win32Hwnd, MAKELONG(lastHitTestVal, win32ncmsg));
+
+    //WM_NC*BUTTON* is posted when the cursor is in a non-client area of the window
+    if(lastHitTestVal != HTCLIENT) {
+            SendInternalMessageA(win32ncmsg, lastHitTestVal, MAKELONG(ncx, ncy)); //TODO:
+    }
+    return  SendInternalMessageA(win32msg, 0, MAKELONG(clx, cly));
 }
 //******************************************************************************
@@ -957 +962 @@
 {
  ULONG winstate = 0;
+ ULONG setcursormsg = WM_MOUSEMOVE;
 
     if(keystate & WMMOVE_LBUTTON)
@@ -969 +975 @@
         winstate |= MK_CONTROL;
 
-    return SendInternalMessageA(WM_MOUSEMOVE, keystate, MAKELONG(x, y));
+    if(lastHitTestVal != HTCLIENT) {
+        setcursormsg = WM_NCMOUSEMOVE;
+    }
+    //TODO: hiword should be 0 if window enters menu mode (SDK docs)
+    SendInternalMessageA(WM_SETCURSOR, Win32Hwnd, MAKELONG(lastHitTestVal, setcursormsg));
+
+    //WM_NCMOUSEMOVE is posted when the cursor moves into a non-client area of the window
+    if(lastHitTestVal != HTCLIENT) {
+            SendInternalMessageA(WM_NCMOUSEMOVE, lastHitTestVal, MAKELONG(x, y));
+    }
+    return  SendInternalMessageA(WM_MOUSEMOVE, keystate, MAKELONG(x, y));
 }
 //******************************************************************************
@@ -1147 +1163 @@
         return 0;           //TODO: Send WM_SYSCOMMAND if required
 
-    case WM_NCHITTEST: //TODO:
-        return 0;
+    case WM_NCHITTEST: //TODO: Calculate position of
+        return HTCLIENT;
 
     default: