Changeset 2092 for trunk/src/gdi32/line.cpp

Timestamp:

Dec 16, 1999, 5:52:33 PM (26 years ago)

Author:

cbratschi

Message:

text output API changes, line speed improvements

File:

• trunk/src/gdi32/line.cpp (modified) (5 diffs)

trunk/src/gdi32/line.cpp

@@ -1 @@
-/* $Id: line.cpp,v 1.1 1999-12-03 17:31:51 cbratschi Exp $ */
+/* $Id: line.cpp,v 1.2 1999-12-16 16:52:32 cbratschi Exp $ */
 /*
  * Line API's
@@ -13 +13 @@
 #include "misc.h"
 #include "callback.h"
-
-//CB: todo: rewrite them without using Open32
+#include "oslibgpi.h"
 
 #define ROUND_FLOAT(x) ((INT)((x < 0) ? x-0.5:x+0.5))
-#define sqr(x) (pow(x,2))
-
-POINT ToWin32LineEnd(POINT startPt,INT nXEnd,INT nYEnd)
-{
-  POINT pt;
-
-  if (startPt.x != nXEnd || startPt.y != nYEnd)
-  {
-    if (nXEnd == startPt.x)
-    {
-      pt.x = nXEnd;
-      pt.y = (nYEnd > startPt.y) ? nYEnd-1:nYEnd+1;
-    } else if (nYEnd == startPt.y)
-    {
-      pt.x = (nXEnd > startPt.x) ? nXEnd-1:nXEnd+1;
-      pt.y = nYEnd;
+
+VOID toWin32LineEnd(PPOINTLOS2 startPt,INT nXEnd,INT nYEnd,PPOINTLOS2 pt)
+{
+  if (startPt->x != nXEnd || startPt->y != nYEnd)
+  {
+    if (nXEnd == startPt->x)
+    {
+      pt->x = nXEnd;
+      pt->y = (nYEnd > startPt->y) ? nYEnd-1:nYEnd+1;
+    } else if (nYEnd == startPt->y)
+    {
+      pt->x = (nXEnd > startPt->x) ? nXEnd-1:nXEnd+1;
+      pt->y = nYEnd;
     } else
     {
-      DOUBLE len = sqrt(sqr(nXEnd-startPt.x)+sqr(nYEnd-startPt.y));
-      DOUBLE lenDif = (len-1)/len;
-      INT w = nXEnd-startPt.x,h = nYEnd-startPt.y;
-
-      pt.x = startPt.x+ROUND_FLOAT(w*lenDif);
-      pt.y = startPt.y+ROUND_FLOAT(h*lenDif);
+      INT w = nXEnd-startPt->x,h = nYEnd-startPt->y;
+      DOUBLE len = hypot(w,h);
+      DOUBLE lenQuot = (len-1)/len;
+
+      pt->x = startPt->x+ROUND_FLOAT(w*lenQuot);
+      pt->y = startPt->y+ROUND_FLOAT(h*lenQuot);
     }
   } else
   {
-    pt.x = nXEnd;
-    pt.y = nYEnd;
-  }
-
-  return pt;
-}
-
-VOID DrawSingleLinePoint(HDC hdc,POINT pt)
+    pt->x = nXEnd;
+    pt->y = nYEnd;
+  }
+}
+
+BOOL drawSingleLinePoint(HDC hdc,PVOID pHps,PPOINTLOS2 pt)
 {
   LOGPEN penInfo;
 
-  if (!GetObjectA(GetCurrentObject(hdc,OBJ_PEN),sizeof(penInfo),(LPVOID)&penInfo)) return;
-  if (penInfo.lopnWidth.x <= 1 && penInfo.lopnWidth.y <= 1) SetPixel(hdc,pt.x,pt.y,penInfo.lopnColor); else
-  {
-    INT x = pt.x-penInfo.lopnWidth.x/2;
-    INT y = pt.y-penInfo.lopnWidth.y/2;
-    Ellipse(hdc,x,y,x+penInfo.lopnWidth.x,y+penInfo.lopnWidth.y);
-  }
-}
-
+  if (!GetObjectA(GetCurrentObject(hdc,OBJ_PEN),sizeof(penInfo),(LPVOID)&penInfo)) return FALSE;
+
+  if (penInfo.lopnWidth.x > 1 || penInfo.lopnWidth.y > 1)
+  {
+    if (penInfo.lopnStyle != PS_INSIDEFRAME && penInfo.lopnStyle != PS_SOLID)
+      return FALSE;
+
+    LONG color = GetBValue(penInfo.lopnColor) | (GetGValue(penInfo.lopnColor)<<8) | (GetRValue(penInfo.lopnColor)<<16);
+
+    return drawLinePointCircle(pHps,penInfo.lopnWidth.x,penInfo.lopnWidth.y,color);
+  } else
+  {
+    LONG color = GetBValue(penInfo.lopnColor) | (GetGValue(penInfo.lopnColor)<<8) | (GetRValue(penInfo.lopnColor)<<16);
+
+    return drawLinePoint(pHps,pt,color);
+  }
+}
+
+BOOL WIN32API MoveToEx( HDC hdc, int X, int Y, LPPOINT lpPoint)
+{
+  PVOID pHps = OSLibGpiQueryDCData(hdc);
+
+  dprintf(("GDI32: MoveToEx\n"));
+
+  if (pHps)
+  {
+    POINTLOS2 newPoint = {X,Y};
+
+    if (lpPoint)
+    {
+      POINTLOS2 lastPoint;
+
+      OSLibGpiQueryCurrentPosition(pHps,&lastPoint);
+      lpPoint->x = lastPoint.x;
+      lpPoint->y = lastPoint.y;
+    }
+
+    if (OSLibGpiMove(pHps,&newPoint))
+    {
+      //CB: add metafile info
+      return TRUE;
+    }
+
+    return FALSE;
+  }
+
+  SetLastError(ERROR_INVALID_HANDLE);
+  return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
 BOOL WIN32API LineTo( HDC hdc, int nXEnd, int  nYEnd)
 {
-  POINT oldPt,pt;
+  PVOID pHps = OSLibGpiQueryDCData(hdc);
+  BOOL rc = TRUE;
 
   dprintf(("GDI32: LineTo"));
 
-  //CB: Open32 draws a pixel too much!
-  GetCurrentPositionEx(hdc,&oldPt);
-  pt = ToWin32LineEnd(oldPt,nXEnd,nYEnd);
-
-  BOOL rc;
-
-  if (oldPt.x == pt.x && oldPt.y == pt.y)
-  {
-    DrawSingleLinePoint(hdc,pt);
-
-    rc = TRUE;
-  } else rc = O32_LineTo(hdc,pt.x,pt.y);
-  MoveToEx(hdc,nXEnd,nYEnd,NULL);
+  if (pHps)
+  {
+    POINTLOS2 oldPoint,newPoint;
+    BOOL bWideLine;
+
+    //CB: add metafile info
+
+    OSLibGpiQueryCurrentPosition(pHps,&oldPoint);
+    toWin32LineEnd(&oldPoint,nXEnd,nYEnd,&newPoint);
+
+    if (oldPoint.x == newPoint.x && oldPoint.y == newPoint.y)
+    {
+      rc = drawSingleLinePoint(hdc,pHps,&newPoint);
+    } else
+    {
+      if (getIsWideLine(pHps))
+      {
+        rc = O32_LineTo(hdc,newPoint.x,newPoint.y); //CB: wide line not supported
+      } else
+      {
+        if (OSLibGpiLine(pHps,&newPoint) == 0)
+          rc = FALSE;
+      }
+    }
+
+    newPoint.x = nXEnd;
+    newPoint.y = nYEnd;
+    OSLibGpiMove(pHps,&newPoint);
+  } else
+  {
+    SetLastError(ERROR_INVALID_HANDLE);
+    rc = FALSE;
+  }
 
   return rc;
@@ -90 +147 @@
 BOOL WIN32API LineDDA( int nXStart, int nYStart, int nXEnd, int nYEnd, LINEDDAPROC lpLineFunc, LPARAM lpData)
 {
- BOOL                 rc;
- LineDDAProcCallback *callback = new LineDDAProcCallback(lpLineFunc, lpData);
- POINT startPt,endPt;
+  BOOL                 rc;
+  LineDDAProcCallback *callback = new LineDDAProcCallback(lpLineFunc, lpData);
+  POINTLOS2 startPt,endPt;
 
   dprintf(("GDI32: LineDDA\n"));
 
-  //CB: don't know if Open32 reports the last pixel, but all other line functions do
   startPt.x = nXStart;
   startPt.y = nYStart;
-  endPt = ToWin32LineEnd(startPt,nXEnd,nYEnd);
+  toWin32LineEnd(&startPt,nXEnd,nYEnd,&endPt);
 
   rc = O32_LineDDA(startPt.x,startPt.y,endPt.x,endPt.y,callback->GetOS2Callback(),(LPARAM)callback);
@@ -110 +166 @@
 BOOL WIN32API Polyline( HDC hdc, const POINT *lppt, int cPoints)
 {
-    dprintf(("GDI32: Polyline"));
-
-    if (cPoints == 0) return TRUE;
-    if (cPoints < 0)
-    {
-      SetLastError(ERROR_INVALID_PARAMETER);
-
-      return FALSE;
-    }
-
-    if (cPoints == 1)
-    {
-      DrawSingleLinePoint(hdc,*lppt); //CB: check metafile recording
-
-      return TRUE;
-    }
-
-    //CB: Open32 draw a pixel too much!
-    POINT *points = (POINT*)lppt;
-    POINT lastPt = lppt[cPoints-1];
-    BOOL rc;
-
-    points[cPoints-1] = ToWin32LineEnd(lppt[cPoints-2],lastPt.x,lastPt.y);
-    rc = O32_Polyline(hdc,lppt,cPoints);
-    points[cPoints-1] = lastPt;
-
-    return rc;
+  PVOID pHps = OSLibGpiQueryDCData(hdc);
+
+  dprintf(("GDI32: Polyline"));
+
+  if (!pHps)
+  {
+    SetLastError(ERROR_INVALID_HANDLE);
+    return FALSE;
+  }
+
+  if (cPoints == 0) return TRUE;
+  if (cPoints < 0)
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+
+    return FALSE;
+  }
+
+  if (cPoints == 1)
+  {
+    drawSingleLinePoint(hdc,pHps,(PPOINTLOS2)lppt); //CB: check metafile recording
+
+    return TRUE;
+  }
+
+  POINT *points = (POINT*)lppt;
+  POINT lastPt = lppt[cPoints-1];
+  BOOL rc;
+
+  toWin32LineEnd((PPOINTLOS2)&lppt[cPoints-2],lastPt.x,lastPt.y,(PPOINTLOS2)&points[cPoints-1]);
+  rc = O32_Polyline(hdc,lppt,cPoints);
+  points[cPoints-1] = lastPt;
+
+  return rc;
 }
 //******************************************************************************
@@ -142 +205 @@
 BOOL WIN32API PolylineTo( HDC hdc, const POINT * lppt, DWORD cCount)
 {
-    dprintf(("GDI32: PolylineTo"));
-
-    if (cCount == 0) return TRUE;
-
-    if (cCount == 1)
-    {
-      DrawSingleLinePoint(hdc,*lppt);
-
-      return TRUE; //CB: check metafile recording
-    }
-
-    //CB: Open32 draw a pixel too much!
-    POINT *points = (POINT*)lppt;
-    POINT lastPt = lppt[cCount-1];
-    BOOL rc;
-
-    points[cCount-1] = ToWin32LineEnd(lppt[cCount-2],lastPt.x,lastPt.y);
-    rc = O32_PolylineTo(hdc,lppt,cCount);
-    points[cCount-1] = lastPt;
-    MoveToEx(hdc,lastPt.x,lastPt.y,NULL);
-
-    return rc;
-}
-//******************************************************************************
-//******************************************************************************
-
+  PVOID pHps = OSLibGpiQueryDCData(hdc);
+
+  dprintf(("GDI32: PolylineTo"));
+
+  if (!pHps)
+  {
+    SetLastError(ERROR_INVALID_HANDLE);
+    return FALSE;
+  }
+
+  if (cCount == 0) return TRUE;
+
+  //CB: add metafile info
+
+  if (cCount == 1)
+  {
+    drawSingleLinePoint(hdc,pHps,(PPOINTLOS2)lppt);
+
+    return TRUE;
+  }
+
+  POINT *points = (POINT*)lppt;
+  POINT lastPt = lppt[cCount-1];
+  BOOL rc;
+
+  toWin32LineEnd((PPOINTLOS2)&lppt[cCount-2],lastPt.x,lastPt.y,(PPOINTLOS2)&points[cCount-1]);
+  rc = O32_PolylineTo(hdc,lppt,cCount);
+  points[cCount-1] = lastPt;
+  OSLibGpiMove(pHps,(PPOINTLOS2)&lastPt);
+
+  return rc;
+}
+//******************************************************************************
+//******************************************************************************
+