Changeset 2433 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 13, 2000, 9:11:39 PM (26 years ago)

Author:

sandervl

Message:

Client rectangle changes, GetDCEx bugfix (CS_OWNDC), scroll rectangle calculation fixes

File:

• trunk/src/user32/new/win32wbase.cpp (modified) (12 diffs)

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.38 2000-01-13 13:54:53 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.39 2000-01-13 20:11:37 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -13 +13 @@
  *
  * TODO: Not thread/process safe
+ *
+ * NOTE: Client rectangle always relative to frame window; window rectangle in screen coordinates
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -639 +641 @@
   // Subclass frame
   pOldFrameProc = FrameSubclassFrameWindow(this);
-  //if (isChild()) FrameSetBorderSize(this,TRUE);
 
   //preset rects
@@ -647 +648 @@
   rectWindow.bottom = cs->y+cs->cy;
   rectClient = rectWindow; //dummy client rect
+  OffsetRect(&rectClient, -rectClient.left, -rectClient.top);
+
   if (getParent()) mapWin32Rect(getParent()->getOS2WindowHandle(),OSLIB_HWND_DESKTOP,&rectWindow);
   /* Send the WM_CREATE message
@@ -660 +663 @@
   if (SendInternalMessageA(WM_NCCREATE,0,(LPARAM)cs))
   {
+        RECT tmpRect;
+
         //update rect
         rectWindow.left = cs->x;
@@ -665 +670 @@
         rectWindow.top = cs->y;
         rectWindow.bottom = cs->y+cs->cy;
+        tmpRect = rectWindow;
         if (getParent()) mapWin32Rect(getParent()->getOS2WindowHandle(),OSLIB_HWND_DESKTOP,&rectWindow);
         OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
+
         rectClient = rectWindow;
-        if (getParent()) mapWin32Rect(OSLIB_HWND_DESKTOP,getParent()->getOS2WindowHandle(),&rectClient);
+        OffsetRect(&rectClient, -rectClient.left, -rectClient.top);
+
         //set the window size and update the client
-        SetWindowPos(hwndLinkAfter,rectClient.left,rectClient.top,rectClient.right-rectClient.left,rectClient.bottom-rectClient.top,SWP_NOACTIVATE | SWP_NOREDRAW | SWP_FRAMECHANGED);
+        SetWindowPos(hwndLinkAfter, tmpRect.left, tmpRect.top, tmpRect.right-tmpRect.left, tmpRect.bottom-tmpRect.top,SWP_NOACTIVATE | SWP_NOREDRAW | SWP_FRAMECHANGED);
         fNoSizeMsg = FALSE;
         if (cs->style & WS_VISIBLE) dwStyle |= WS_VISIBLE; //program could change position in WM_CREATE
@@ -679 +687 @@
                                 MAKELONG(rectClient.right-rectClient.left,
                                          rectClient.bottom-rectClient.top));
-                SendInternalMessageA(WM_MOVE, 0, MAKELONG( rectClient.left, rectClient.top ) );
+                DWORD lParam;
+
+                if(getParent()) {//in parent coordinates
+                    POINT point;
+
+                    point.x = rectClient.left;
+                    point.y = rectClient.top;
+                    MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), &point, 1);
+
+                    lParam = MAKELONG(point.x, point.y);
+                }
+                else {//in screen coordinates
+                    lParam = MAKELONG(rectWindow.left+rectClient.left, rectWindow.top+rectClient.top);
+                }
+                SendInternalMessageA(WM_MOVE, 0, lParam);
             }
 
@@ -1036 +1058 @@
     RECT client = rectClient;
 
-    mapWin32Rect(getParent() ? getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,OS2HwndFrame,&client);
+////    mapWin32Rect(getParent() ? getParent()->getOS2WindowHandle():OSLIB_HWND_DESKTOP,OS2HwndFrame,&client);
     if ((rect.left >= client.left) && (rect.left < client.right) &&
         (rect.right >= client.left) && (rect.right < client.right) &&
@@ -1405 +1427 @@
     case WM_WINDOWPOSCHANGED:
     {
-
-/* undocumented SWP flags - from SDK 3.1 */
-#define SWP_NOCLIENTSIZE        0x0800
-#define SWP_NOCLIENTMOVE        0x1000
-
         PWINDOWPOS wpos = (PWINDOWPOS)lParam;
         WPARAM     wp   = SIZE_RESTORED;
 
         if (!(wpos->flags & SWP_NOMOVE) && !(wpos->flags & SWP_NOCLIENTMOVE))
-            SendInternalMessageA(WM_MOVE, 0, MAKELONG(rectClient.left, rectClient.top));
-
+        {
+            DWORD lParam;
+
+            if(getParent()) {//in parent coordinates
+                POINT point;
+
+                point.x = rectClient.left;
+                point.y = rectClient.top;
+                MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), &point, 1);
+
+                lParam = MAKELONG(point.x, point.y);
+            }
+            else {//in screen coordinates
+                lParam = MAKELONG(rectWindow.left+rectClient.left, rectWindow.top+rectClient.top);
+            }
+            SendInternalMessageA(WM_MOVE, 0, lParam);
+        }
         if (!(wpos->flags & SWP_NOSIZE) && !(wpos->flags & SWP_NOCLIENTSIZE))
         {
@@ -1422 +1454 @@
 
             SendInternalMessageA(WM_SIZE, wp, MAKELONG(rectClient.right  - rectClient.left,
-                                               rectClient.bottom - rectClient.top));
+                                                       rectClient.bottom - rectClient.top));
         }
         return 0;
@@ -1939 +1971 @@
 
     dprintf(("ShowWindow %x %x", getWindowHandle(), nCmdShow));
-#if 1
+
     if (flags & WIN_NEED_SIZE)
     {
@@ -1955 +1987 @@
                      MAKELONG(rectClient.right-rectClient.left,
                               rectClient.bottom-rectClient.top));
-        SendInternalMessageA(WM_MOVE, 0, MAKELONG( rectClient.left, rectClient.top ) );
-    }
-#else
-    if(fFirstShow) {
-        if(isFrameWindow() && IS_OVERLAPPED(getStyle()) && !isChild()) {
-                SendInternalMessageA(WM_SIZE, SIZE_RESTORED,
-                                MAKELONG(rectClient.right-rectClient.left,
-                                         rectClient.bottom-rectClient.top));
-                SendInternalMessageA(WM_MOVE, 0, MAKELONG( rectClient.left, rectClient.top ) );
-
-        }
-        fFirstShow = FALSE;
-    }
-#endif
+        DWORD lParam;
+
+        if(getParent()) {//in parent coordinates
+            POINT point;
+
+            point.x = rectClient.left;
+            point.y = rectClient.top;
+            MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), &point, 1);
+
+            lParam = MAKELONG(point.x, point.y);
+        }
+        else {//in screen coordinates
+            lParam = MAKELONG(rectWindow.left+rectClient.left, rectWindow.top+rectClient.top);
+        }
+        SendInternalMessageA(WM_MOVE, 0, lParam);
+    }
     switch(nCmdShow)
     {