Changeset 2435 for trunk/src

Timestamp:

Jan 14, 2000, 2:16:59 PM (26 years ago)

Author:

sandervl

Message:

Several window position bugfixes

Location:

trunk/src/user32/new

Files:

• oslibmsgtranslate.cpp (modified) (3 diffs)
• pmframe.cpp (modified) (4 diffs)
• pmwindow.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbasenonclient.cpp (modified) (4 diffs)
• win32wbasepos.cpp (modified) (3 diffs)
• win32wmdichild.cpp (modified) (2 diffs)

trunk/src/user32/new/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.13 2000-01-13 13:54:52 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.14 2000-01-14 13:16:57 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -236 +236 @@
         return TRUE;
       }
+      case WM_WINDOWPOSCHANGED:
+      {
+        //todo: proper translation
+        return FALSE;
+      }
     }
     //do normal translation for all other messages
@@ -318 +323 @@
         if (!win32wnd->CanReceiveSizeMsgs())    goto dummymessage;
 
-        dprintf(("Set client rectangle to (%d,%d)(%d,%d)", swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy));
-        win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
-
-        thdb->wp.hwnd = win32wnd->getWindowHandle();
-        if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
-        {
-           Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
-           if(wndAfter)
-                thdb->wp.hwndInsertAfter = wndAfter->getWindowHandle();
-        }
-
-        PRECT lpRect = win32wnd->getWindowRect();
-        //SvL: Only send it when the client has changed & the frame hasn't
-        //     If the frame size/position has changed, pmframe.cpp will send
-        //     this message
-        if(lpRect->right == thdb->wp.x+thdb->wp.cx && lpRect->bottom == thdb->wp.y+thdb->wp.cy) {
-                winMsg->message = WINWM_WINDOWPOSCHANGED;
-                winMsg->lParam  = (LPARAM)&thdb->wp;
-        }
-        else {
-////            win32wnd->setWindowRect(thdb->wp.x, thdb->wp.y, thdb->wp.x+thdb->wp.cx, thdb->wp.y+thdb->wp.cy);
-            goto dummymessage;
-        }
+        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
+                dprintf(("Set client rectangle to (%d,%d)(%d,%d)", swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy));
+                win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
+
+                thdb->wp.hwnd = win32wnd->getWindowHandle();
+                if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
+                {
+                        Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
+                        if(wndAfter)
+                        thdb->wp.hwndInsertAfter = wndAfter->getWindowHandle();
+                }
+
+                PRECT lpRect = win32wnd->getWindowRect();
+                //SvL: Only send it when the client has changed & the frame hasn't
+                //     If the frame size/position has changed, pmframe.cpp will send
+                //     this message
+                if(lpRect->right == thdb->wp.x+thdb->wp.cx && lpRect->bottom == thdb->wp.y+thdb->wp.cy) {
+                        winMsg->message = WINWM_WINDOWPOSCHANGED;
+                        winMsg->lParam  = (LPARAM)&thdb->wp;
+                        break;
+                }
+        }
+        goto dummymessage;
     }
 

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.16 2000-01-13 20:11:37 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.17 2000-01-14 13:16:57 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -287 +287 @@
 
           //CB: todo: use result for WM_CALCVALIDRECTS
-//          mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
           mapWin32ToOS2Rect(win32wnd->getOS2FrameWindowHandle(), win32wnd->getClientRectPtr(), (PRECTLOS2)&rect);
 
@@ -378 +377 @@
     }
 
+    case WM_ERASEBACKGROUND:
+        break;
+
     case WM_CALCVALIDRECTS:
     {
@@ -447 +449 @@
 VOID FrameUpdateClient(Win32BaseWindow *win32wnd)
 {
+  RECT rectOld, rectNew;
   RECTL rect;
   SWP swpClient = {0};
 
+        rectOld = *win32wnd->getClientRectPtr();
         win32wnd->MsgFormatFrame(NULL);
+        rectNew = *win32wnd->getClientRectPtr();
+        if(WinEqualRect(0, (PRECTL)&rectOld, (PRECTL)&rectNew) == 1) {
+                WinInvalidateRect(win32wnd->getOS2FrameWindowHandle(), NULL, FALSE);
+                return;
+        } 
         //CB: todo: use result for WM_CALCVALIDRECTS
-//        mapWin32ToOS2Rect(WinQueryWindow(win32wnd->getOS2FrameWindowHandle(),QW_PARENT),win32wnd->getOS2FrameWindowHandle(),win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
         mapWin32ToOS2Rect(win32wnd->getOS2FrameWindowHandle(), win32wnd->getClientRectPtr(), (PRECTLOS2)&rect);
 

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.40 2000-01-13 13:54:52 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.41 2000-01-14 13:16:57 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -253 +253 @@
     case WM_WINDOWPOSCHANGED:
     {
-        win32wnd->MsgPosChanged((LPARAM)&thdb->wp);
+        if(pWinMsg->message != 0)
+                win32wnd->MsgPosChanged((LPARAM)&thdb->wp);
         goto RunDefWndProc;
     }

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.39 2000-01-13 20:11:37 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.40 2000-01-14 13:16:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1082 +1082 @@
   RECT oldWindowRect = rectWindow, client = rectClient, newWindowRect;
   WINDOWPOS wndPos;
+  ULONG rc;
 
   if(lpWndPos) {
     //set new window rectangle
     setWindowRect(lpWndPos->x, lpWndPos->y, lpWndPos->x + lpWndPos->cx, lpWndPos->y + lpWndPos->cy);
-    newWindowRect = rectWindow;
+    newWindowRect= rectWindow;
   }
   else {
-    wndPos.hwnd  = Win32Hwnd;
+    wndPos.hwnd  = getWindowHandle();
     wndPos.hwndInsertAfter = 0;
     newWindowRect= rectWindow;
@@ -1098 +1099 @@
     wndPos.cy    = newWindowRect.bottom - newWindowRect.top;
     wndPos.flags = SWP_FRAMECHANGED;
-    lpWndPos = &wndPos;
-  }
-
-  return SendNCCalcSize(TRUE, &oldWindowRect, &newWindowRect, &client, &wndPos, &rectClient);
+    lpWndPos     = &wndPos;
+  }
+
+  rc = SendNCCalcSize(TRUE, &newWindowRect,  &oldWindowRect, &client, lpWndPos, &rectClient);
+
+  dprintf(("MsgFormatFrame: old client rect (%d,%d)(%d,%d), new client (%d,%d)(%d,%d)", client.left, client.top, client.right, client.bottom, rectClient.left, rectClient.top, rectClient.right, rectClient.bottom));
+  return rc;
 }
 //******************************************************************************

trunk/src/user32/new/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.5 2000-01-13 20:11:39 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.6 2000-01-14 13:16:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -234 +234 @@
   {
     case HTCAPTION:
-      SetActiveWindow();
+      if (GetActiveWindow() != Win32Hwnd)
+        SetActiveWindow();
+
       if (GetActiveWindow() == Win32Hwnd)
         SendInternalMessageA(WM_SYSCOMMAND,SC_MOVE+HTCAPTION,lParam);
@@ -353 +355 @@
 LONG Win32BaseWindow::HandleNCCalcSize(BOOL calcValidRects,RECT *winRect)
 {
-  RECT tmpRect = { 0, 0, 0, 0 },*clientRect;
-  LONG result = WVR_ALIGNTOP | WVR_ALIGNLEFT;
+  RECT tmpRect = { 0, 0, 0, 0 };
+  LONG result = 0;
   UINT style;
 
@@ -364 +366 @@
     if (style & CS_HREDRAW) result |= WVR_HREDRAW;
 
-    clientRect = &((NCCALCSIZE_PARAMS*)winRect)->rgrc[2];
-    *clientRect = rectWindow;
-#if 1
-    OffsetRect(clientRect, -clientRect->left, -clientRect->top);
-#else
-    if(getParent()) {//in parent coordinates
-        OffsetRect(clientRect, -clientRect->left, -clientRect->top);
-        MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), (POINT *)clientRect, 2);
-    }
-    //else in screen coordinates (already in screen coordinates)
-#endif
-
     if(!(dwStyle & WS_MINIMIZE))
     {
         AdjustRectOuter(&tmpRect,FALSE);
 
-        clientRect->left   -= tmpRect.left;
-        clientRect->top    -= tmpRect.top;
-        clientRect->right  -= tmpRect.right;
-        clientRect->bottom -= tmpRect.bottom;
+        winRect->left   -= tmpRect.left;
+        winRect->top    -= tmpRect.top;
+        winRect->right  -= tmpRect.right;
+        winRect->bottom -= tmpRect.bottom;
 
         if (HAS_MENU())
         {
-            clientRect->top +=
+            winRect->top +=
                 MENU_GetMenuBarHeight(Win32Hwnd,
-                                       winRect->right - winRect->left,
-                                       -tmpRect.left, -tmpRect.top ) + 1;
+                                      winRect->right - winRect->left,
+                                      -tmpRect.left, -tmpRect.top ) + 1;
         }
 
         SetRect (&tmpRect, 0, 0, 0, 0);
         AdjustRectInner(&tmpRect);
-        clientRect->left   -= tmpRect.left;
-        clientRect->top    -= tmpRect.top;
-        clientRect->right  -= tmpRect.right;
-        clientRect->bottom -= tmpRect.bottom;
+        winRect->left   -= tmpRect.left;
+        winRect->top    -= tmpRect.top;
+        winRect->right  -= tmpRect.right;
+        winRect->bottom -= tmpRect.bottom;
     }
 

trunk/src/user32/new/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.6 2000-01-13 20:11:39 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.7 2000-01-14 13:16:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -134 +134 @@
         winposCopy = *winpos;
         params.rgrc[1] = *oldWindowRect;
-#if 0
         if(getParent()) {//in parent coordinates
             MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), (POINT *)oldClientRect, 2);
@@ -141 +140 @@
             OffsetRect(oldClientRect, rectWindow.left, rectWindow.top);
         }
-#endif
         params.rgrc[2] = *oldClientRect;
         params.lppos = &winposCopy;
    }
    result = SendInternalMessageA(WM_NCCALCSIZE, calcValidRect, (LPARAM)&params );
-   if (calcValidRect)
+
+   /* If the application send back garbage, ignore it */
+   if (params.rgrc[0].left <= params.rgrc[0].right && params.rgrc[0].top <= params.rgrc[0].bottom)
    {
-      /* If the application send back garbage, ignore it */
-      if (params.rgrc[2].left <= params.rgrc[2].right && params.rgrc[2].top <= params.rgrc[2].bottom)
-      {
-        *newClientRect = params.rgrc[2];
-#if 0
-        if(getParent()) {//in parent coordinates
-            MapWindowPoints(getParent()->getWindowHandle(), getWindowHandle(), (POINT *)newClientRect, 2);
-        }
-        else {//in screen coordinates (just add window rectangle origin (already in screen coordinates))
-            OffsetRect(newClientRect, -rectWindow.left, -rectWindow.top);
-        }
-#endif
-      }
-      else
-        SetRectEmpty(newClientRect);
+        *newClientRect = params.rgrc[0];
+        //client rectangle now in screen coordinates; convert to 'frame' coordinates
+        OffsetRect(newClientRect, -rectWindow.left, -rectWindow.top);
    }
 

trunk/src/user32/new/win32wmdichild.cpp

@@ -1 @@
-/* $Id: win32wmdichild.cpp,v 1.8 2000-01-13 13:54:55 sandervl Exp $ */
+/* $Id: win32wmdichild.cpp,v 1.9 2000-01-14 13:16:59 sandervl Exp $ */
 /*
  * Win32 MDI Child Window Class for OS/2
@@ -534 +534 @@
     RECT rect;
 
-    getClientRect(&rect);
+    client->getClientRect(&rect);
     if(client->getParent() == NULL) {
         dprintf(("Win32MDIChildWindow::childGetMinMaxInfo:: client parent == NULL!!"));