Changeset 5409 for trunk/src

Timestamp:

Mar 31, 2001, 1:59:47 AM (24 years ago)

Author:

sandervl

Message:

WindowFromPoint completed + mouse message translation fix

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (3 diffs)
• window.cpp (modified) (4 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.43 2001-03-30 11:14:35 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.44 2001-03-30 23:59:46 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -397 +397 @@
                 goto dummymessage;
             }
+            winMsg->hwnd = hwnd;
         }
 #endif
@@ -473 +474 @@
                 goto dummymessage;
             }
+            winMsg->hwnd = hwnd;
         }
 #endif

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.91 2001-03-30 22:08:20 sandervl Exp $ */
+/* $Id: window.cpp,v 1.92 2001-03-30 23:59:47 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1484 +1484 @@
 }
 //******************************************************************************
+//******************************************************************************
+static BOOL IsPointInWindow(HWND hwnd, POINT point)
+{
+    RECT  rectWindow;
+    DWORD hittest, dwStyle, dwExStyle;
+
+    dwStyle   = GetWindowLongA(hwnd, GWL_STYLE);
+    dwExStyle = GetWindowLongA(hwnd, GWL_EXSTYLE);
+
+    GetWindowRect(hwnd, &rectWindow);
+
+    /* If point is in window, and window is visible, and it  */
+    /* is enabled (or it's a top-level window), then explore */
+    /* its children. Otherwise, go to the next window.       */
+
+    if( (dwStyle & WS_VISIBLE) &&
+        ((dwExStyle & (WS_EX_LAYERED | WS_EX_TRANSPARENT)) != (WS_EX_LAYERED | WS_EX_TRANSPARENT)) &&
+        (!(dwStyle & WS_DISABLED) || ((dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)) &&
+        ((point.x >= rectWindow.left) && (point.x <  rectWindow.right) &&
+         (point.y >= rectWindow.top) && (point.y <  rectWindow.bottom))
+#if 1
+        )
+#else
+        &&
+        (wndPtr->hrgnWnd ?  PtInRegion(wndPtr->hrgnWnd, 1))
+#endif
+    {
+        hittest = SendMessageA(hwnd, WM_NCHITTEST, 0, MAKELONG(point.x, point.y));
+        if(hittest != HTTRANSPARENT) {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+//******************************************************************************
 //TODO: Does this return handles of hidden or disabled windows?
 //******************************************************************************
@@ -1490 +1525 @@
     HWND  hwndOS2, hwnd;
     POINT wPoint;
-    DWORD hittest, dwStyle, dwExStyle;
 
     wPoint.x = point.x;
@@ -1501 +1535 @@
         while(hwnd)
         {
-                dwStyle   = GetWindowLongA(hwnd, GWL_STYLE);
-                dwExStyle = GetWindowLongA(hwnd, GWL_EXSTYLE);
-
-                /* If point is in window, and window is visible, and it  */
-                /* is enabled (or it's a top-level window), then explore */
-                /* its children. Otherwise, go to the next window.       */
-
-                if( (dwStyle & WS_VISIBLE) &&
-                    ((dwExStyle & (WS_EX_LAYERED | WS_EX_TRANSPARENT)) != (WS_EX_LAYERED | WS_EX_TRANSPARENT)) &&
-                    (!(dwStyle & WS_DISABLED) || ((dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD))
-#if 1
-                    )
-#else
-                    &&
-                    (wndPtr->hrgnWnd ?  PtInRegion(wndPtr->hrgnWnd, 1))
-#endif
-                {
-                    hittest = SendMessageA(hwnd, WM_NCHITTEST, 0, MAKELONG(point.x, point.y));
-                    if(hittest != HTTRANSPARENT) {
-                        dprintf(("WindowFromPoint (%d,%d) %x->%x\n", point.x, point.y, hwndOS2, hwnd));
-                        return hwnd;
+                if(IsPointInWindow(hwnd, point)) {
+                    dprintf(("WindowFromPoint (%d,%d) %x->%x\n", point.x, point.y, hwndOS2, hwnd));
+                    return hwnd;
+                }
+                //try siblings
+                HWND hwndSibling;
+                HWND hwndParent = GetParent(hwnd);
+
+                if(hwndParent) {
+                    hwndSibling = GetWindow(hwndParent, GW_CHILD);
+                    while(hwndSibling) {
+                        if(hwndSibling != hwnd) {
+                            if(IsPointInWindow(hwndSibling, point)) {
+                                dprintf(("WindowFromPoint (%d,%d) %x->%x\n", point.x, point.y, hwndOS2, hwndSibling));
+                                return hwndSibling;
+                            }
+                        }
+                        hwndSibling = GetWindow(hwndSibling, GW_HWNDNEXT);
                     }
                 }
-                //TODO: Not correct for overlapping sibling windows!
-                hwnd = GetParent(hwnd);
+                hwnd = hwndParent;
         }
     }