Changeset 8602

Timestamp:

Jun 8, 2002, 1:45:20 PM (23 years ago)

Author:

sandervl

Message:

clipper bugfix

Location:

trunk/src/ddraw

Files:

• OS2SURFACE.CPP (modified) (4 diffs)
• oslibgpi.cpp (modified) (5 diffs)

trunk/src/ddraw/OS2SURFACE.CPP ¶

@@ -1 @@
-/* $Id: OS2SURFACE.CPP,v 1.40 2002-02-17 20:40:05 sandervl Exp $ */
+/* $Id: OS2SURFACE.CPP,v 1.41 2002-06-08 11:45:19 sandervl Exp $ */
 
 /*
@@ -2476 +2476 @@
                           return DD_OK;
                       }
+                      dprintf(("visible region"));
                       for(i=0;i<lpRgnData->rdh.nCount;i++) 
                       {
@@ -2481 +2482 @@
                           pRectl[i].yTop     = dest->DDSurfaceDesc.dwHeight - pRectl[i].yBottom;
                           pRectl[i].yBottom  = dest->DDSurfaceDesc.dwHeight - temp;
+                          dprintf(("(%d,%d)(%d,%d)", pRectl[i].xLeft, pRectl[i].yBottom, pRectl[i].xRight, pRectl[i].yTop));
                           //clip rectangle must be relative to lScreenPos
                           pRectl[i].xLeft   -= sBlt.lScreenPosX;
@@ -2486 +2488 @@
                           pRectl[i].yTop    -= sBlt.lScreenPosY;
                           pRectl[i].yBottom -= sBlt.lScreenPosY;
+                          dprintf(("(%d,%d)(%d,%d)", pRectl[i].xLeft, pRectl[i].yBottom, pRectl[i].xRight, pRectl[i].yTop));
                       }
                       fChanged = TRUE;

trunk/src/ddraw/oslibgpi.cpp ¶

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.3 2001-10-18 07:49:37 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.4 2002-06-08 11:45:20 sandervl Exp $ */
 
 /*
@@ -30 +30 @@
     LPRGNDATA lpRgnData = 0;
     HPS hps = 0;
-    LONG temp, i;
+    LONG temp, i, lComplexity;
     ULONG bufSizeNeeded;
     PRECTL pRectl;
+    HWND hwndClientOS2;
 
     if(screenHeight == 0) {
@@ -40 +41 @@
     }
 
-    hps = WinGetPS(Win32ToOS2FrameHandle(hwnd));
+//    hps = WinGetPS(Win32ToOS2FrameHandle(hwnd));
+    hwndClientOS2 = Win32ToOS2Handle(hwnd); 
+    hps = WinGetPS(hwndClientOS2);
     if(hps == NULL) {
         dprintf(("OSLibQueryVisibleRegion: WinGetPS %x failed", hwnd));
@@ -46 +49 @@
     }
     hrgnVis = GreCreateRectRegion(hps, &rcl, 1);
-    GreCopyClipRegion(hps, hrgnVis, 0, COPYCRGN_VISRGN);
+
+    //If there's an update region, use it. else get visible region
+    lComplexity = WinQueryUpdateRegion(hwndClientOS2, hrgnVis);
+    if(lComplexity == RGN_ERROR || lComplexity == RGN_NULL) 
+    {
+        dprintf(("No update region; take visible region"));
+        GreCopyClipRegion(hps, hrgnVis, 0, COPYCRGN_VISRGN);
+    }
 
     RGNRECT rgnRect;
@@ -68 +78 @@
     }
     for(i=0;i<rgnRect.crcReturned;i++) {
+        dprintf(("Region rect %d (%d,%d)(%d,%d)", i, pRectl[i].xLeft, pRectl[i].yBottom, pRectl[i].xRight, pRectl[i].yTop));
+        //rectangle is in window coordinate; convert to screen
+        WinMapWindowPoints(hwndClientOS2, HWND_DESKTOP, (PPOINTL)&pRectl[i], 2);
+        dprintf(("Region rect %d (%d,%d)(%d,%d)", i, pRectl[i].xLeft, pRectl[i].yBottom, pRectl[i].xRight, pRectl[i].yTop));
         temp = pRectl[i].yTop;
-        dprintf(("Region rect %d (%d,%d)(%d,%d)", i, pRectl[i].xLeft, pRectl[i].yBottom, pRectl[i].xRight, pRectl[i].yTop));
         pRectl[i].yTop    = screenHeight - pRectl[i].yBottom;
         pRectl[i].yBottom = screenHeight - temp;