Changeset 2425 for trunk/src

Timestamp:

Jan 12, 2000, 11:07:28 PM (26 years ago)

Author:

cbratschi

Message:

fixed WM_CALCVALIDRECTS

Location:

trunk/src/user32/new

Files:

• pmframe.cpp (modified) (5 diffs)
• pmwindow.cpp (modified) (3 diffs)

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.13 2000-01-12 17:37:29 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.14 2000-01-12 22:07:28 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -212 +212 @@
         if(!win32wnd->CanReceiveSizeMsgs())
            break;
-
+//CB: todo: adjust maximized window rect (how does WINE it?)
         WinQueryWindowPos(hwnd, &swpOld);
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
@@ -252 +252 @@
     case WM_WINDOWPOSCHANGED:
     {
-      PSWP      pswp   = (PSWP)mp1;
+      PSWP      pswp   = (PSWP)mp1,pswpOld = pswp+1;
       SWP       swpOld = *(pswp + 1);
       WINDOWPOS wp;
@@ -284 +284 @@
         OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hwnd);
 
-        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-                win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
-
-                win32wnd->MsgFormatFrame();
-                //CB: todo: use result for WM_CALCVALIDRECTS
-                mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,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;
-                //TODO: Get rid of SWP_SHOW; needed for winhlp32 button bar for now
-                swpClient.fl = (pswp->fl & ~SWP_ZORDER) | SWP_MOVE | SWP_SHOW;
-                WinSetMultWindowPos(thdb->hab, &swpClient, 1);
-        }
-
-        if(win32wnd->CanReceiveSizeMsgs())
-          win32wnd->MsgPosChanged((LPARAM)&wp);
-
-        //update child positions: rectWindow is in window coordinates
-        if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-                FrameUpdateChildPositions(win32wnd->getOS2WindowHandle());
+        if(pswp->fl & (SWP_MOVE | SWP_SIZE))
+        {
+          win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
+
+          win32wnd->MsgFormatFrame();
+          //CB: todo: use result for WM_CALCVALIDRECTS
+          mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,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;
+          //TODO: Get rid of SWP_SHOW; needed for winhlp32 button bar for now
+          swpClient.fl = (pswp->fl & ~SWP_ZORDER) | SWP_MOVE | SWP_SHOW;
+          WinSetMultWindowPos(thdb->hab, &swpClient, 1);
+
+          //update child positions: rectWindow is in window coordinates
+          if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
+                  FrameUpdateChildPositions(win32wnd->getOS2WindowHandle());
+          }
+
+          if(win32wnd->CanReceiveSizeMsgs())
+            win32wnd->MsgPosChanged((LPARAM)&wp);
+
+          if ((pswp->fl & SWP_SIZE) && ((pswp->cx != pswpOld->cx) || (pswp->cy != pswpOld->cy)))
+          {
+            //redraw the frame (to prevent unnecessary client updates)
+            BOOL redrawAll = FALSE;
+
+            if (win32wnd->getWindowClass())
+            {
+              DWORD dwStyle = win32wnd->getWindowClass()->getClassLongA(GCL_STYLE_W);
+
+              if ((dwStyle & CS_HREDRAW_W) && (pswp->cx != pswpOld->cx))
+                redrawAll = TRUE;
+              else if ((dwStyle & CS_VREDRAW_W) && (pswp->cy != pswpOld->cy))
+                redrawAll = TRUE;
+            } else redrawAll = TRUE;
+
+            if (redrawAll)
+            {
+              WinInvalidateRect(hwnd,NULL,TRUE);
+            } else
+            {
+              HPS hps = WinGetPS(hwnd);
+              RECTL frame,client,arcl[4];
+
+              WinQueryWindowRect(hwnd,&frame);
+               //top
+              arcl[0].xLeft = 0;
+              arcl[0].xRight = frame.xRight;
+              arcl[0].yBottom = rect.yTop;
+              arcl[0].yTop = frame.yTop;
+               //right
+              arcl[1].xLeft = rect.xRight;
+              arcl[1].xRight = frame.xRight;
+              arcl[1].yBottom = 0;
+              arcl[1].yTop = frame.yTop;
+               //left
+              arcl[2].xLeft = 0;
+              arcl[2].xRight = rect.xLeft;
+              arcl[2].yBottom = 0;
+              arcl[2].yTop = frame.yTop;
+               //bottom
+              arcl[3].xLeft = 0;
+              arcl[3].xRight = frame.xRight;
+              arcl[3].yBottom = 0;
+              arcl[3].yTop = rect.yBottom;
+
+              HRGN hrgn = GpiCreateRegion(hps,3,(PRECTL)&arcl);
+
+              WinInvalidateRegion(hwnd,hrgn,FALSE);
+              GpiDestroyRegion(hps,hrgn);
+              WinReleasePS(hps);
+            }
+          }
+        } else
+        {
+          //update child positions: rectWindow is in window coordinates
+          if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
+                  FrameUpdateChildPositions(win32wnd->getOS2WindowHandle());
+          }
+
+          if(win32wnd->CanReceiveSizeMsgs())
+            win32wnd->MsgPosChanged((LPARAM)&wp);
         }
 
@@ -317 +380 @@
     case WM_CALCVALIDRECTS:
     {
+      //don't redraw here or PM redraw the whole frame (done in WM_WINDOWPOSCHANGED)
       RestoreOS2TIB();
-      return (MRESULT)CVR_REDRAW; //always redraw frame
+      return (MRESULT)(CVR_ALIGNLEFT | CVR_ALIGNTOP);
     }
 

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.38 2000-01-12 19:43:58 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.39 2000-01-12 22:07:28 cbratschi Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -295 +295 @@
     }
 
-#if 0
     case WM_CALCVALIDRECTS:
-    {
-      PRECTL oldRect = (PRECTL)mp1,newRect = oldRect+1;
-      UINT res = CVR_ALIGNLEFT | CVR_ALIGNTOP;
-
-//CB: todo: use WM_NCCALCSIZE result
-      if (win32wnd->getWindowClass())
-      {
-        DWORD dwStyle = win32wnd->getWindowClass()->getClassLongA(GCL_STYLE_W);
-
-        if ((dwStyle & CS_HREDRAW_W) && (newRect->xRight-newRect->xLeft != oldRect->xRight-oldRect->xLeft))
-          res |= CVR_REDRAW;
-        else if ((dwStyle & CS_VREDRAW_W) && (newRect->yTop-newRect->yBottom != oldRect->yTop-oldRect->yBottom))
-          res |= CVR_REDRAW;
-      } else res |= CVR_REDRAW;
-
       RestoreOS2TIB();
-      WinDefWindowProc(hwnd,msg,mp1,mp2);
-      RestoreOS2TIB();
-      return (MRESULT)res;
-    }
-#endif
+      return (MRESULT)(CVR_ALIGNLEFT | CVR_ALIGNTOP);
 
     case WM_SETFOCUS:
@@ -440 +420 @@
     {
         dprintf(("OS2: WM_ERASEBACKGROUND %x", win32wnd->getWindowHandle()));
-        break;
+        RestoreOS2TIB();
+        return (MRESULT)FALSE;
     }