Changeset 10561 for trunk/src

Timestamp:

Mar 25, 2004, 3:52:32 PM (21 years ago)

Author:

sandervl

Message:

LineTo: special case in toWin32LineEnd when inside a path definition

Location:

trunk/src/gdi32

Files:

• line.cpp (modified) (8 diffs)
• region.h (modified) (2 diffs)

trunk/src/gdi32/line.cpp

@@ -1 @@
-/* $Id: line.cpp,v 1.14 2004-01-11 11:42:18 sandervl Exp $ */
+/* $Id: line.cpp,v 1.15 2004-03-25 14:52:32 sandervl Exp $ */
 /*
  * Line API's
@@ -15 +15 @@
 #include "oslibgpi.h"
 #include <dcdata.h>
+#include "region.h"
 
 #define DBG_LOCALLOG    DBG_line
@@ -23 +24 @@
 //******************************************************************************
 //******************************************************************************
-VOID toWin32LineEnd(PPOINTLOS2 startPt,INT nXEnd,INT nYEnd,PPOINTLOS2 pt)
-{
+VOID toWin32LineEnd(pDCData pHps, PPOINTLOS2 startPt,INT nXEnd,INT nYEnd,PPOINTLOS2 pt)
+{
+// SvL: This breaks path creation when used as a clip region in a printer DC
+//      (offset by one for x coordinates make the rectangle not so rectangular anymore)
+//      Removing it alltogether causes nice drawing errors on the screen, so
+//      we'll simply ignore it when we're inside a path definition.
+  if(pHps->inPath) 
+  {
+      LONG vertRes = hdcHeight(pHps->hwnd, pHps);
+      LONG horzRes = hdcWidth(pHps->hwnd, pHps);
+
+      // LineTo will return an error if the coordinates are outside the DC
+      pt->x = (nXEnd >= vertRes) ? vertRes-1 : nXEnd;
+      pt->y = (nYEnd >= horzRes) ? horzRes-1 : nYEnd;
+  }
+  else 
   if ((startPt->x != nXEnd) || (startPt->y != nYEnd))
   {
@@ -113 +128 @@
 #endif
 
-    if (OSLibGpiMove(pHps,&newPoint))
+    if(OSLibGpiMove(pHps,&newPoint))
     {
       //CB: add metafile info
@@ -148 +163 @@
 
     OSLibGpiQueryCurrentPosition(pHps,&oldPoint);
-    toWin32LineEnd(&oldPoint,nXEnd,nYEnd,&newPoint);
+    toWin32LineEnd(pHps, &oldPoint,nXEnd,nYEnd,&newPoint);
 
     if ((oldPoint.x == newPoint.x) && (oldPoint.y == newPoint.y))
@@ -167 +182 @@
     newPoint.x = nXEnd;
     newPoint.y = nYEnd;
-    OSLibGpiMove(pHps,&newPoint);
-  } else
+    // Do not change the current position when we're defining a path.
+    // toWin32LineEnd can change the coordinates which would break up the path.
+    if (!pHps->inPath)
+        OSLibGpiMove(pHps,&newPoint);
+  } 
+  else
   {
     SetLastError(ERROR_INVALID_HANDLE);
@@ -226 +245 @@
   BOOL rc;
 
-  toWin32LineEnd((PPOINTLOS2)&lppt[cPoints-2],lastPt.x,lastPt.y,(PPOINTLOS2)&points[cPoints-1]);
+  toWin32LineEnd(pHps, (PPOINTLOS2)&lppt[cPoints-2],lastPt.x,lastPt.y,(PPOINTLOS2)&points[cPoints-1]);
   rc = O32_Polyline(hdc,lppt,cPoints);
   points[cPoints-1] = lastPt;
@@ -258 +277 @@
   BOOL rc;
 
-  toWin32LineEnd((PPOINTLOS2)&lppt[cCount-2],lastPt.x,lastPt.y,(PPOINTLOS2)&points[cCount-1]);
+  toWin32LineEnd(pHps, (PPOINTLOS2)&lppt[cCount-2],lastPt.x,lastPt.y,(PPOINTLOS2)&points[cCount-1]);
   rc = O32_PolylineTo(hdc,lppt,cCount);
   points[cCount-1] = lastPt;

trunk/src/gdi32/region.h

@@ -1 @@
-//$Id: region.h,v 1.4 2004-01-11 11:42:22 sandervl Exp $
+//$Id: region.h,v 1.5 2004-03-25 14:52:32 sandervl Exp $
 #ifndef __REGION_H__
 #define __REGION_H__
@@ -13 +13 @@
 BOOL GdiDestroyRgn(pDCData pHps, HRGN hrgnClip);
 
+
+LONG hdcHeight(HWND hwnd, pDCData pHps);
+LONG hdcWidth(HWND hwnd, pDCData pHps);
+
 #endif //__REGION_H__