Changeset 3888 for trunk/src

Timestamp:

Jul 22, 2000, 2:51:59 PM (25 years ago)

Author:

sandervl

Message:

BeginPaint fix

File:

• trunk/src/user32/dc.cpp (modified) (10 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.68 2000-07-19 19:05:24 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.69 2000-07-22 12:51:59 sandervl Exp $ */
 
 /*
@@ -329 +329 @@
 //******************************************************************************
 //******************************************************************************
-HRGN selectClientArea(Win32BaseWindow *window, pDCData pHps, PRECTL prclPaint)
+void selectClientArea(Win32BaseWindow *window, pDCData pHps)
 {
    // This function checks to see if the DC needs to be adjusted to a client
@@ -345 +345 @@
    {
         //client rectangle = frame rectangle -> no change necessary
-        //only setup the clip region
-        goto setupclipregion;
+        return;
    }
    if(pHps->isClientArea) {
         //TODO: counter
         dprintf(("WARNING: selectClientArea; already selected!!"));
-        goto setupclipregion;
+        return;
    }
    pHps->isClient = TRUE;
@@ -412 +411 @@
    // Destroy the region now we have finished with it.
    GreDestroyRegion(pHps->hps, hrgnRect);
-
-setupclipregion:
-   if(prclPaint) {
-#if 0
-        hrgnClip = GpiQueryClipRegion(pHps->hps);
-        if(hrgnClip) {
-                rc = GreIntersectClipRectangle(pHps->hps, prclPaint);
-                if(rc == RGN_ERROR) {
-                        dprintf(("selectClientArea: GreIntersectClipRectangle returned RGN_ERROR!"));
-                }
-        }
-        else {
-#endif
-                hrgnClip = GreCreateRectRegion(pHps->hps, prclPaint, 1);
-                GreSelectClipRegion(pHps->hps, hrgnClip, &hrgnOldClip);
-//      }
-   }
-
-   return hrgnOldClip;
 }
 //******************************************************************************
@@ -572 +552 @@
  HPS      hPS_ownDC = NULLHANDLE, hpsPaint = 0;
  RECTL    rectl = {0, 0, 1, 1};
- HRGN     hrgnUpdate, hrgnOld, hrgnOldClip;
+ HRGN     hrgnOldClip;
  LONG     lComplexity;
  RECTL    rectlClient;
@@ -612 +592 @@
    }
 
+   //testest
+   if(hwnd == 0x6800000f) {
+        lComplexity = 1;
+   }
+
    if(WinQueryUpdateRect(hwndClient, &rectl) == FALSE) {
         memset(&rectl, 0, sizeof(rectl));
         dprintf (("USER32: WARNING: WinQueryUpdateRect failed (error or no update rectangle)!!"));
 
-//      mapWin32ToOS2Rect(wnd->getWindowHeight(), wnd->getClientRectPtr(), (PRECTLOS2)&rectlClient);
-//      WinOffsetRect(NULL, &rectlClient, -rectlClient.xLeft, -rectlClient.yBottom);
-
-        hrgnOldClip = selectClientArea(wnd, pHps, &rectl);
+        selectClientArea(wnd, pHps);
+
+        HRGN hrgnClip = GpiCreateRegion(pHps->hps, 1, &rectl);
+        GpiSetClipRegion(pHps->hps, hrgnClip, &hrgnOldClip);
+
         //save old clip region (restored for CS_OWNDC windows in EndPaint)
         wnd->SetClipRegion(hrgnOldClip);
@@ -625 +611 @@
    }
    else {
-        WinValidateRect(hwndClient, &rectl, FALSE);
+        rectlClip.yBottom = rectlClip.xLeft = 0;
+        rectlClip.yTop = rectlClip.xRight = 1;
+
+        //Query update region
+        HRGN hrgnClip = GpiCreateRegion(pHps->hps, 1, &rectlClip);
+        WinQueryUpdateRegion(hwndClient, hrgnClip);
+        WinValidateRegion(hwndClient, hrgnClip, FALSE);
 
         mapWin32ToOS2Rect(wnd->getWindowHeight(), wnd->getClientRectPtr(), (PRECTLOS2)&rectlClient);
         WinIntersectRect(NULL, &rectlClip, &rectl, &rectlClient);
         WinOffsetRect(NULL, &rectlClip, -rectlClient.xLeft, -rectlClient.yBottom);
- 
-        hrgnOldClip = selectClientArea(wnd, pHps, &rectlClip);
+
+        //change presentation space for client window
+        selectClientArea(wnd, pHps);
+
+        //clip update region with client window rectangle
+        HRGN hrgnClient = GpiCreateRegion(pHps->hps, 1, &rectlClient);
+        GpiCombineRegion(pHps->hps, hrgnClip, hrgnClip, hrgnClient, CRGN_AND);
+        GpiDestroyRegion(pHps->hps, hrgnClient);
+
+        //change origin of clip region (window -> client)
+        POINTL point = {-rectlClient.xLeft, -rectlClient.yBottom};
+        GpiOffsetRegion(pHps->hps, hrgnClip, &point);
+
+        //set clip region
+        GpiSetClipRegion(pHps->hps, hrgnClip, &hrgnOldClip);
 
         //save old clip region (restored for CS_OWNDC windows in EndPaint)
@@ -808 +813 @@
             goto error;
 
-        selectClientArea(wnd, pHps, NULL);
+        selectClientArea(wnd, pHps);
 
         //TODO: Is this always necessary??
@@ -876 +881 @@
    if(!(flags & DCX_WINDOW_W))
    {
-        selectClientArea(wnd, pHps, NULL);
+        selectClientArea(wnd, pHps);
    }
    else removeClientArea(pHps);
@@ -1173 +1178 @@
         if(redraw & RDW_ERASENOW_W && wnd->needsEraseBkgnd())
                 wnd->setEraseBkgnd(sendEraseBkgnd(wnd) == 0);
-        if(redraw & RDW_ALLCHILDREN_W) {
-                EnumChildWindows(wnd->getWindowHandle(), RedrawChildEnumProc, redraw);
-        }
+//      if(redraw & RDW_ALLCHILDREN_W) {
+//              EnumChildWindows(wnd->getWindowHandle(), RedrawChildEnumProc, redraw);
+//      }
    }
    else if((redraw & RDW_INTERNALPAINT_W) && !(redraw & RDW_INVALIDATE_W))