Changeset 2418 for trunk/src/user32

Timestamp:

Jan 12, 2000, 4:14:16 PM (26 years ago)

Author:

sandervl

Message:

client positioning + scrollbar fixes

Location:

trunk/src/user32/new

Files:

• oslibmsgtranslate.cpp (modified) (3 diffs)
• pmframe.cpp (modified) (2 diffs)
• pmframe.h (modified) (2 diffs)
• scroll.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/new/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.11 2000-01-12 12:40:44 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.12 2000-01-12 15:14:15 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -235 +235 @@
         return TRUE;
       }
-
     }
     //do normal translation for all other messages
@@ -295 +294 @@
 
     case WM_WINDOWPOSCHANGED:
-        goto dummymessage;
+    {
+      PSWP      pswp  = (PSWP)os2Msg->mp1;
+      SWP       swpOld = *(pswp + 1);
+      HWND      hParent = NULLHANDLE;
+      LONG      yDelta = pswp->cy - swpOld.cy;
+      LONG      xDelta = pswp->cx - swpOld.cx;
+
+        dprintf(("OS2: WM_WINDOWPOSCHANGED %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+
+        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) goto dummymessage;
+
+        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
+            if (win32wnd->isChild()) {
+                if(win32wnd->getParent()) {
+                        hParent = win32wnd->getParent()->getOS2WindowHandle();
+                }
+                else    goto dummymessage; //parent has just been destroyed
+            }
+        }
+        OSLibMapSWPtoWINDOWPOS(pswp, &thdb->wp, &swpOld, hParent, win32wnd->getOS2FrameWindowHandle());
+
+        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;
+        }
+    }
 
     case WM_ACTIVATE:

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.11 2000-01-12 12:40:45 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.12 2000-01-12 15:14:16 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -391 +391 @@
   return WinDefWindowProc(hwnd,msg,mp1,mp2);
 }
-
+//******************************************************************************
+//******************************************************************************
 PVOID FrameSubclassFrameWindow(Win32BaseWindow *win32wnd)
 {
   return WinSubclassWindow(win32wnd->getOS2FrameWindowHandle(),PFNWP(Win32FrameProc));
 }
-
-VOID FrameUpdateFrame(Win32BaseWindow *win32wnd,DWORD flags)
+//******************************************************************************
+//******************************************************************************
+VOID FrameUpdateClient(Win32BaseWindow *win32wnd)
 {
-  WinSendMsg(win32wnd->getOS2FrameWindowHandle(),WM_UPDATEFRAME,(MPARAM)flags,(MPARAM)0);
+  RECTL rect;
+  SWP swpClient = {0};
+
+        win32wnd->MsgFormatFrame();
+        //CB: todo: use result for WM_CALCVALIDRECTS
+        mapWin32ToOS2Rect(WinQueryWindow(win32wnd->getOS2FrameWindowHandle(),QW_PARENT),win32wnd->getOS2FrameWindowHandle(),win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
+
+        swpClient.hwnd = win32wnd->getOS2WindowHandle();
+        swpClient.hwndInsertBehind = 0;
+        swpClient.x  = rect.xLeft;
+        swpClient.y  = rect.yBottom;
+        swpClient.cx = rect.xRight-rect.xLeft;
+        swpClient.cy = rect.yTop-rect.yBottom;
+        swpClient.fl = SWP_MOVE | SWP_SIZE;
+        WinSetMultWindowPos(GetThreadHAB(), &swpClient, 1);
 }
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/new/pmframe.h

@@ -1 @@
-/* $Id: pmframe.h,v 1.3 2000-01-09 14:14:23 cbratschi Exp $ */
+/* $Id: pmframe.h,v 1.4 2000-01-12 15:14:16 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -10 +10 @@
 
 PVOID FrameSubclassFrameWindow(Win32BaseWindow *win32wnd);
-VOID  FrameUpdateFrame(Win32BaseWindow *win32wnd,DWORD flags);
+VOID  FrameUpdateClient(Win32BaseWindow *win32wnd);
 
 #define HTERROR_W             (-2)

trunk/src/user32/new/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.8 2000-01-09 14:14:23 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.9 2000-01-12 15:14:16 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -1471 +1471 @@
 {
     Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    BOOL fShowH = (nBar == SB_HORZ) ? 0:fShow,fShowV = (nBar == SB_VERT) ? 0:fShow;
+//    BOOL fShowH = (nBar == SB_HORZ) ? 0:fShow,fShowV = (nBar == SB_VERT) ? 0:fShow;
+    BOOL fShowH = (nBar == SB_HORZ) ? fShow : 0;
+    BOOL fShowV = (nBar == SB_VERT) ? fShow : 0;
 
     dprintf(("ShowScrollBar %04x %d %d\n", hwnd, nBar, fShow));

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.35 2000-01-12 12:40:47 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.36 2000-01-12 15:14:16 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2028 +2028 @@
     }
 
+    if(IsWindowDestroyed()) {
+        //changing the position of a window that's being destroyed can cause crashes in PMMERGE
+        dprintf(("SetWindowPos; window already destroyed"));
+        return TRUE;
+    }
     WINDOWPOS wpos;
     SWP swp, swpOld;
@@ -2053 +2058 @@
 
     OSLibMapWINDOWPOStoSWP(&wpos, &swp, &swpOld, hParent, OS2HwndFrame);
-    if (swp.fl == 0)
-      return TRUE;
+    if (swp.fl == 0) {
+        if (fuFlags & SWP_FRAMECHANGED)
+        {
+            FrameUpdateClient(this);
+        }
+        return TRUE;
+    }
 
 //   if ((swp.fl & SWPOS_ZORDER) && (swp.hwndInsertBehind > HWNDOS_BOTTOM))
@@ -2098 +2108 @@
     }
 
-    if (fuFlags == SWP_FRAMECHANGED)
-    {
-      //CB: optimize: if frame size has changed not necessary!
-      FrameUpdateFrame(this,0);
+    if(fuFlags & SWP_FRAMECHANGED && (fuFlags & (SWP_NOMOVE | SWP_NOSIZE) == (SWP_NOMOVE | SWP_NOSIZE)))
+    {
+        FrameUpdateClient(this);
     }