Changeset 4596 for trunk/src

Timestamp:

Nov 15, 2000, 2:56:46 PM (25 years ago)

Author:

sandervl

Message:

(Ext)SelectClipRgn fixes

Location:

trunk/src/gdi32

Files:

• makefile (modified) (2 diffs)
• objhandle.cpp (modified) (4 diffs)
• oslibgpi.cpp (modified) (3 diffs)
• oslibgpi.h (modified) (3 diffs)
• region.cpp (modified) (5 diffs)

trunk/src/gdi32/makefile

@@ -1 @@
-# $Id: makefile,v 1.29 2000-11-05 18:48:22 sandervl Exp $
+# $Id: makefile,v 1.30 2000-11-15 13:56:45 sandervl Exp $
 
 #
@@ -24 +24 @@
 #CXXFLAGS = $(CXXFLAGS) -DSTDCALL_ENUMPROCS -DINVERT
 
-CFLAGS   = $(CFLAGS) -DINVERT
-CXXFLAGS = $(CXXFLAGS) -DINVERT
+CFLAGS   = $(CFLAGS) -DINVERT -DUSING_OPEN32
+CXXFLAGS = $(CXXFLAGS) -DINVERT -DUSING_OPEN32
 
 # Object files. All objects should be prefixed with $(OBJDIR)!

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.5 2000-10-26 17:20:29 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.6 2000-11-15 13:56:45 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -19 +19 @@
 #include <vmutex.h>
 #include <objhandle.h>
+#include <dcdata.h>
+#include <winuser32.h>
+#include "oslibgpi.h"
 #include "dibsect.h"
 #include "region.h"
@@ -217 +220 @@
 
     if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
-    //Return complexity here; not previously selected clip region
+        //Return complexity here; not previously selected clip region
         return (HGDIOBJ)SelectClipRgn(hdc, hObj);
     }
@@ -246 +249 @@
       }
     }
+#ifdef USING_OPEN32
+    if(O32_GetObjectType(hObj) == OBJ_BITMAP) 
+    {
+        //SvL: Open32 messes up the height of the hdc (for windows)
+        pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
+        if(pHps && pHps->hwnd) {
+              dprintf2(("change back origin"));
+              selectClientArea(pHps);
+              setPageXForm(pHps);
+        }
+    }
+#endif
+    dprintf2(("GDI32: SelectObject %x %x returned %x", hdc, hObj, rc));
+
     return(rc);
 }

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.7 2000-09-03 09:30:35 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.8 2000-11-15 13:56:45 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
 #include <winconst.h>
 #include "oslibgpi.h"
-#include "dcdata.h"
+#include <dcdata.h>
+#include <misc.h>
 
 #define DBG_LOCALLOG    DBG_oslibgpi
@@ -404 +405 @@
 
 
+int OSLibGpiQueryFontMaxHeight(HDC hdc) 
+{
+  FONTMETRICS metrics;
+  BOOL rc;
+
+  rc = GpiQueryFontMetrics(hdc, sizeof(metrics), &metrics);
+  if(rc) {
+        return metrics.lMaxAscender;
+  }
+  else {
+        dprintf(("GpiQueryFontMetrics returned FALSE!!"));
+        return 0;
+  }
+}
+
+#ifdef DEBUG
+void dprintfOrigin(HDC hdc)
+{
+   POINTL point;
+
+    pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
+    if(!pHps)
+    {
+        return;
+    }
+
+    GreGetDCOrigin(pHps->hps, &point);
+    dprintf2(("HDC origin (%d,%d) org (%d,%d)", point.x, point.y, pHps->ptlOrigin.x, pHps->ptlOrigin.y));
+}
+#endif

trunk/src/gdi32/oslibgpi.h

@@ -1 @@
-/* $Id: oslibgpi.h,v 1.7 2000-08-14 15:51:20 cbratschi Exp $ */
+/* $Id: oslibgpi.h,v 1.8 2000-11-15 13:56:45 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
 #ifndef __OSLIBGPI_H__
 #define __OSLIBGPI_H__
+
+
+#ifdef DEBUG
+void dprintfOrigin(HDC hdc);
+#else
+#define dprintfOrigin(a)
+#endif
 
 #define APIENTRYOS2 _System
@@ -188 +195 @@
 LONG OSLibWinDrawTabbedText(PVOID pHps,LONG cchText,LONG lTabs,LPCSTR lpchText,PVOID prcl,LONG clrFore,LONG clrBack,ULONG flCmd);
 
+int OSLibGpiQueryFontMaxHeight(HDC hdc);
 
 BOOL OSLibGpiMove(PVOID pHps,PPOINTLOS2 pptlPoint);

trunk/src/gdi32/region.cpp

@@ -1 @@
-/* $Id: region.cpp,v 1.16 2000-11-05 18:48:22 sandervl Exp $ */
+/* $Id: region.cpp,v 1.17 2000-11-15 13:56:46 sandervl Exp $ */
 
 /*
@@ -374 +374 @@
     }
 
+    dprintf(("SelectClipRgn: %x %x", hdc, hrgn));
+
     if(hrgn)
     {
@@ -404 +406 @@
         if (lComplexity != RGN_ERROR )
         {
-            dprintf(("SelectClipRgn: %x %x", hdc, hrgn));
             if(hrgnOldClip)
                 GpiDestroyRegion(pHps->hps, hrgnOldClip);
@@ -410 +411 @@
             //todo: metafile recording
             SetLastError(ERROR_SUCCESS_W);
+
+            //SvL: Must check if origin changed here. Sometimes happens when
+            //     window looses focus. (don't know why....)
+            if(pHps->isClient) 
+                selectClientArea(pHps);
             return lComplexity;
         }
@@ -518 +524 @@
         lComplexity = GpiSetClipRegion(pHps->hps, hrgnCurrent, &hrgnOld);
         SetLastError(ERROR_SUCCESS_W);
+
+        //SvL: Must check if origin changed here. Sometimes happens when
+        //     window looses focus. (don't know why....)
+        if(pHps->isClient) 
+            selectClientArea(pHps);
+
         if (lComplexity != RGN_ERROR)
             return lComplexity;