Changeset 4452 for trunk/src/user32/dc.cpp

Timestamp:

Oct 8, 2000, 4:03:49 PM (25 years ago)

Author:

sandervl

Message:

GetMinMaxInfo fix (border) + CS_OWNDC fix (origin)

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.71 2000-10-05 18:37:25 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.72 2000-10-08 14:03:48 sandervl Exp $ */
 
 /*
@@ -72 +72 @@
 LONG clientHeight(Win32BaseWindow *wnd, HWND hwnd, pDCData pHps);
 
+#ifdef DEBUG
+#define dprintfRegion(a,b,c) if(DbgEnabledLvl2[DBG_LOCALLOG] == 1) dprintfRegion1(a,b,c)
+
+void dprintfRegion1(HPS hps, HWND hWnd, HRGN hrgnClip)
+{
+ RGNRECT rgnRect = {0, 16, 0, RECTDIR_LFRT_TOPBOT};
+ RECTL   rectRegion[16];
+ APIRET  rc;
+
+   dprintf(("dprintfRegion %x %x", hWnd, hps));
+   rc = GpiQueryRegionRects(hps, hrgnClip, NULL, &rgnRect, &rectRegion[0]);
+   for(int i=0;i<rgnRect.crcReturned;i++) {
+        dprintf(("(%d,%d)(%d,%d)", rectRegion[i].xLeft, rectRegion[i].yBottom, rectRegion[i].xRight, rectRegion[i].yTop));
+   }
+}
+#else
+#define dprintfRegion(a,b,c)
+#endif
+
 //******************************************************************************
 //******************************************************************************
@@ -302 +321 @@
 //******************************************************************************
 //******************************************************************************
-VOID removeClientArea(pDCData pHps)
+VOID removeClientArea(Win32BaseWindow *window, pDCData pHps)
 {
  POINTL point;
@@ -315 +334 @@
    if(pHps->isClientArea)
    {
-        dprintf2(("removeClientArea: (%d,%d) -> (%d,%d)", point.x, point.y, pHps->ptlOrigin.x, pHps->ptlOrigin.y));
+        dprintf2(("removeClientArea %x: (%d,%d) -> (%d,%d)", window->getWindowHandle(), point.x, point.y, pHps->ptlOrigin.x, pHps->ptlOrigin.y));
         pHps->isClientArea = FALSE;
         GreSetupDC(pHps->hps,
@@ -324 +343 @@
                    SETUPDC_ORIGIN | SETUPDC_VISRGN | SETUPDC_RECALCCLIP);
    }
-   else dprintf(("removeClientArea: (%d,%d)", point.x, point.y));
+   else dprintf(("removeClientArea: %x (%d,%d)", window->getWindowHandle(), point.x, point.y));
 
 }
@@ -347 +366 @@
         return;
    }
-   if(pHps->isClientArea) {
-        //TODO: counter
-        dprintf(("WARNING: selectClientArea; already selected!!"));
-        return;
-   }
    pHps->isClient = TRUE;
 
@@ -360 +374 @@
    //convert to screen coordinates
    GreGetDCOrigin(pHps->hps, (PPOINTL)&rcltemp);
-   rcl.xLeft   += rcltemp.xLeft;
-   rcl.xRight  += rcltemp.xLeft;
-   rcl.yTop    += rcltemp.yBottom;
-   rcl.yBottom += rcltemp.yBottom;
-        
+
+   if(pHps->isClientArea) 
+   {
+        //TODO: counter
+        dprintf(("WARNING: selectClientArea %x; already selected! origin (%d,%d) original origin (%d,%d)", window->getWindowHandle(), rcltemp.xLeft, rcltemp.yBottom, pHps->ptlOrigin.x, pHps->ptlOrigin.y));
+        RECT rectWindow;
+        RECTL rectWindowOS2;
+        GetWindowRect(window->getWindowHandle(), &rectWindow);
+        mapWin32ToOS2Rect(OSLibGetScreenHeight(), &rectWindow, (PRECTLOS2)&rectWindowOS2);
+        if(rectWindowOS2.xLeft + rcl.xLeft != rcltemp.xLeft ||
+           rectWindowOS2.yBottom + rcl.yBottom != rcltemp.yBottom) 
+        {
+                dprintf(("WARNING: origin changed (%d,%d) instead of (%d,%d)!", rcltemp.xLeft, rcltemp.yBottom, rectWindowOS2.xLeft + rcl.xLeft, rectWindowOS2.yBottom + rcl.yBottom));
+                rcl.xLeft   += rectWindowOS2.xLeft;
+                rcl.xRight  += rectWindowOS2.xLeft;
+                rcl.yTop    += rectWindowOS2.yBottom;
+                rcl.yBottom += rectWindowOS2.yBottom;
+        }
+        else    return;
+   }
+   else {
+        rcl.xLeft   += rcltemp.xLeft;
+        rcl.xRight  += rcltemp.xLeft;
+        rcl.yTop    += rcltemp.yBottom;
+        rcl.yBottom += rcltemp.yBottom;
+   }
    pHps->ptlOrigin.x = rcltemp.xLeft;
    pHps->ptlOrigin.y = rcltemp.yBottom;
  
-   dprintf2(("selectClientArea: (%d,%d) -> (%d,%d)", rcltemp.xLeft, rcltemp.yBottom, rcl.xLeft, rcl.yBottom));
+   dprintf2(("selectClientArea %x: (%d,%d) -> (%d,%d)", window->getWindowHandle(), rcltemp.xLeft, rcltemp.yBottom, rcl.xLeft, rcl.yBottom));
 
    if(pHps->hrgnVis == 0)
@@ -390 +425 @@
               SETUPDC_ORIGIN | SETUPDC_VISRGN | SETUPDC_RECALCCLIP);
 
-/*
-        GpiQueryRegionBox(pHps->hps, hrgnClip, &rcltemp);
-        GpiQueryRegionBox(pHps->hps, hrgnOldClip, &rcltemp);
-
-        GpiQueryRegionBox(pHps->hps, hrgnRect, &rcltemp);
-
-        GreGetDCOrigin(pHps->hps, (PPOINTL)&rcltemp);
-
-        GreCopyClipRegion(pHps->hps, hrgnRect, 0, COPYCRGN_VISRGN);
-        GpiQueryRegionBox(pHps->hps, hrgnRect, &rcltemp);
-      
-        GreCopyClipRegion(pHps->hps, hrgnRect, 0, COPYCRGN_ALLINTERSECT);
-        GpiQueryRegionBox(pHps->hps, hrgnRect, &rcltemp);
-      
-        GreCopyClipRegion(pHps->hps, hrgnRect, 0, COPYCRGN_CLIPRGN);
-        GpiQueryRegionBox(pHps->hps, hrgnRect, &rcltemp);
-*/
    pHps->isClientArea = TRUE;
 
@@ -531 +549 @@
 {
    pDCData pHps = (pDCData)GpiQueryDCData ((HPS)hps);
+  
+   dprintf2(("releaseOwnDC %x", hps));
 
    if (pHps) {
@@ -544 +564 @@
    }
 }
-//******************************************************************************
-//******************************************************************************
-#ifdef DEBUG
-#define dprintfRegion(a,b,c) if(DbgEnabledLvl2[DBG_LOCALLOG] == 1) dprintfRegion1(a,b,c)
-
-void dprintfRegion1(HPS hps, HWND hWnd, HRGN hrgnClip)
-{
- RGNRECT rgnRect = {0, 16, 0, RECTDIR_LFRT_TOPBOT};
- RECTL   rectRegion[16];
- APIRET  rc;
-
-   dprintf(("dprintfRegion %x %x", hWnd, hps));
-   rc = GpiQueryRegionRects(hps, hrgnClip, NULL, &rgnRect, &rectRegion[0]);
-   for(int i=0;i<rgnRect.crcReturned;i++) {
-        dprintf(("(%d,%d)(%d,%d)", rectRegion[i].xLeft, rectRegion[i].yBottom, rectRegion[i].xRight, rectRegion[i].yTop));
-   }
-}
-#else
-#define dprintfRegion(a,b,c)
-#endif
 //******************************************************************************
 //******************************************************************************
@@ -751 +751 @@
                 pDCData  pHps = (pDCData)GpiQueryDCData((HPS)hdc);
                 if(pHps && pHps->psType == MICRO_CACHED) {
-                        removeClientArea(pHps);
+                        removeClientArea(wnd, pHps);
                         if(pHps->hrgnVis) {
                                 GreDestroyRegion(pHps->hps, pHps->hrgnVis);
@@ -762 +762 @@
                 }
         }
+        else {
+                dprintf2(("ReleaseDC: CS_OWNDC, not released"));
+        }
    }
 
@@ -898 +901 @@
         selectClientArea(wnd, pHps);
    }
-   else removeClientArea(pHps);
+   else removeClientArea(wnd, pHps);
 
    setMapMode(wnd, pHps, MM_TEXT_W);