Changeset 5404 for trunk/src/user32/window.cpp

Timestamp:

Mar 30, 2001, 1:14:36 PM (24 years ago)

Author:

sandervl

Message:

WM_NCHITTEST changes; no longer rely on PM

File:

• trunk/src/user32/window.cpp (modified) (6 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.89 2001-02-21 21:30:44 sandervl Exp $ */
+/* $Id: window.cpp,v 1.90 2001-03-30 11:14:36 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
  *
- * Copyright 1999 Sander van Leeuwen
+ * Copyright 1999-2001 Sander van Leeuwen (sandervl@xs4all.nl)
  * Copyright 1999 Daniela Engert (dani@ngrt.de)
  * Copyright 2000 Christoph Bratschi (cbratschi@datacomm.ch)
@@ -18 +18 @@
  * TODO: ShowOwnedPopups needs to be tested
  *       GetLastActivePopup needs to be rewritten
- *       ArrangeIconicWindows probably also
+ *       ArrangeIconicWindows probably too
  *
  */
@@ -700 +700 @@
     dprintf(("SetFocus %x (%x) -> %x (%x)\n", lastFocus_W, lastFocus, hwnd, hwnd_O));
 
-    //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing; 
+    //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
     //must delay this function call
     if(teb->o.odin.fWM_SETFOCUS) {
@@ -724 +724 @@
         return 0;
     }
-    //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing; 
+    //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
     //If focus was changed during WM_SETFOCUS, the focus window handle is
     //stored in teb->o.odin.hwndFocus (set back to 0 when delayed SetFocus
@@ -1493 +1493 @@
 HWND WIN32API WindowFromPoint( POINT point)
 {
-#if 0
-    INT     hittest = HTERROR;
-    HWND    retvalue = 0;
-    HWND    hwnd = GetDesktopWindow();
-    DWORD   dwStyle;
-    RECT    rectWindow, rectClient;
-    Win32BaseWindow *window;
-
-    dprintf(("WindowFromPoint (%d,%d)", point.x, point.y));
-
-    while(hwnd)
-    {
-        window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-
-        /* 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.       */
-        dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
-
-        if ((dwStyle & WS_VISIBLE) && (!(dwStyle & WS_DISABLED) ||
-           ((dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)))
-        {
-            GetWindowRect(hwnd, &rectWindow);
-            if(PtInRect(&rectWindow, point) == TRUE)
-            {
-                /* If window is minimized or disabled, return at once */
-                if(dwStyle & WS_MINIMIZE)
-                {
-                    break;
-                }
-                if(dwStyle & WS_DISABLED)
-                {
-                    break;
-                }
-                retvalue = hwnd;
-
-                GetClientRect(hwnd, &rectClient);
-                InflateRect(&rectClient, rectWindow.left, rectWindow.top);
-
-                /* If point is not in client area, ignore the children */
-                if(PtInRect(&rectClient, point) == FALSE) {
-                    break;
-                }
-                if(window->getFirstChild()) {
-                     hwnd = ((Win32BaseWindow *)window->getFirstChild())->getWindowHandle();
-                }
-                else break;
-            }
-            else
-            {
-                if(window->getNextChild()) {
-                     hwnd = ((Win32BaseWindow *)window->getNextChild())->getWindowHandle();
-                }
-                else hwnd = 0;
-            }
-        }
-        else
-        {
-            if(window->getNextChild()) {
-                 hwnd = ((Win32BaseWindow *)window->getNextChild())->getWindowHandle();
-            }
-            else hwnd = 0;
-        }
-    }
-
-    dprintf(("WindowFromPoint (%d,%d) -> %x", point.x, point.y, hwnd));
-    return retvalue;
-#else
     HWND  hwndOS2, hwnd;
     POINT wPoint;
+    DWORD hittest, dwStyle, dwExStyle;
 
     wPoint.x = point.x;
@@ -1570 +1503 @@
     if(hwndOS2)
     {
-      hwnd = OS2ToWin32Handle(hwndOS2);
-      if(hwnd) {
-              dprintf(("WindowFromPoint (%d,%d) %x->%x\n", point.x, point.y, hwndOS2, hwnd));
-              return hwnd;
-      }
+        hwnd = OS2ToWin32Handle(hwndOS2);
+        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;
+                    }
+                }
+                //TODO: Not correct for overlapping sibling windows!
+                hwnd = GetParent(hwnd);
+        }
     }
     dprintf(("WindowFromPoint (%d,%d) %x->1\n", point.x, point.y, hwndOS2));
     return windowDesktop->getWindowHandle();
-#endif
 }
 //******************************************************************************