callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixorama

Browse Source 
Bugfixorama
This commit is contained in:
Elliot Lee
2000-08-09 17:26:29 +00:00
parent d72659968c
commit 98bacfb792
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/linux-fb/miwideline.c
View File

@ -47,7 +47,9 @@ from The Open Group.
ICEILTEMPDECL ICEILTEMPDECL
#endif #endif
static void miLineArc(); static void
miLineArc (GdkDrawable *pDraw, GdkGC *pGC, GdkColor *pixel, SpanDataPtr spanData,
LineFacePtr leftFace, LineFacePtr rightFace, double xorg, double yorg, gboolean isInt);
/* /*
* spans-based polygon filler * spans-based polygon filler
@ -1531,12 +1533,12 @@ miWideLine (pDrawable, pGC, mode, npt, pPts)
&leftFace, &rightFace); &leftFace, &rightFace);
if (GDK_GC_FBDATA(pGC)->values.cap_style == GDK_CAP_ROUND) if (GDK_GC_FBDATA(pGC)->values.cap_style == GDK_CAP_ROUND)
{ {
miLineArc (pDrawable, pGC, pixel, spanData, miLineArc (pDrawable, pGC, &pixel, spanData,
&leftFace, (LineFacePtr) NULL, &leftFace, (LineFacePtr) NULL,
(double)0.0, (double)0.0, (double)0.0, (double)0.0,
TRUE); TRUE);
rightFace.dx = -1; /* sleezy hack to make it work */ rightFace.dx = -1; /* sleezy hack to make it work */
miLineArc (pDrawable, pGC, pixel, spanData, miLineArc (pDrawable, pGC, &pixel, spanData,
(LineFacePtr) NULL, &rightFace, (LineFacePtr) NULL, &rightFace,
(double)0.0, (double)0.0, (double)0.0, (double)0.0,
TRUE); TRUE);
@ -1762,7 +1764,7 @@ miWideDashSegment (pDrawable, pGC, spanData, pDashOffset, pDashIndex,
lcapFace.ya = vertices[V_TOP].y; lcapFace.ya = vertices[V_TOP].y;
lcapFace.k = -slopes[V_LEFT].k; lcapFace.k = -slopes[V_LEFT].k;
} }
miLineArc (pDrawable, pGC, pixel, spanData, miLineArc (pDrawable, pGC, &pixel, spanData,
&lcapFace, (LineFacePtr) NULL, &lcapFace, (LineFacePtr) NULL,
lcenterx, lcentery, FALSE); lcenterx, lcentery, FALSE);
} }
@ -1778,7 +1780,7 @@ miWideDashSegment (pDrawable, pGC, spanData, pDashOffset, pDashIndex,
rcapFace.ya = -vertices[V_RIGHT].y; rcapFace.ya = -vertices[V_RIGHT].y;
rcapFace.k = -slopes[V_RIGHT].k; rcapFace.k = -slopes[V_RIGHT].k;
} }
miLineArc (pDrawable, pGC, pixel, spanData, miLineArc (pDrawable, pGC, &pixel, spanData,
(LineFacePtr) NULL, &rcapFace, (LineFacePtr) NULL, &rcapFace,
rcenterx, rcentery, FALSE); rcenterx, rcentery, FALSE);
break; break;
@ -1871,7 +1873,7 @@ miWideDashSegment (pDrawable, pGC, spanData, pDashOffset, pDashIndex,
lcapFace.ya = vertices[V_TOP].y; lcapFace.ya = vertices[V_TOP].y;
lcapFace.k = -slopes[V_LEFT].k; lcapFace.k = -slopes[V_LEFT].k;
} }
miLineArc (pDrawable, pGC, pixel, spanData, miLineArc (pDrawable, pGC, &pixel, spanData,
&lcapFace, (LineFacePtr) NULL, &lcapFace, (LineFacePtr) NULL,
rcenterx, rcentery, FALSE); rcenterx, rcentery, FALSE);
} }
@ -2012,7 +2014,7 @@ miWideDash (pDrawable, pGC, mode, npt, pPts)
firstIsFg = startIsFg; firstIsFg = startIsFg;
} }
else if (GDK_GC_FBDATA(pGC)->values.cap_style == GDK_CAP_ROUND) else if (GDK_GC_FBDATA(pGC)->values.cap_style == GDK_CAP_ROUND)
miLineArc (pDrawable, pGC, pixel, spanData, miLineArc (pDrawable, pGC, &pixel, spanData,
&leftFace, (LineFacePtr) NULL, &leftFace, (LineFacePtr) NULL,
(double)0.0, (double)0.0, TRUE); (double)0.0, (double)0.0, TRUE);
} }
@ -2072,14 +2074,14 @@ miWideDash (pDrawable, pGC, mode, npt, pPts)
pixel = (dashIndex & 1) ? GDK_GC_FBDATA(pGC)->values.background : GDK_GC_FBDATA(pGC)->values.foreground; pixel = (dashIndex & 1) ? GDK_GC_FBDATA(pGC)->values.background : GDK_GC_FBDATA(pGC)->values.foreground;
switch (GDK_GC_FBDATA(pGC)->values.cap_style) { switch (GDK_GC_FBDATA(pGC)->values.cap_style) {
case GDK_CAP_ROUND: case GDK_CAP_ROUND:
miLineArc (pDrawable, pGC, pixel, spanData, miLineArc (pDrawable, pGC, &pixel, spanData,
(LineFacePtr) NULL, (LineFacePtr) NULL, (LineFacePtr) NULL, (LineFacePtr) NULL,
(double)x2, (double)y2, (double)x2, (double)y2,
FALSE); FALSE);
break; break;
case GDK_CAP_PROJECTING: case GDK_CAP_PROJECTING:
x1 = GDK_GC_FBDATA(pGC)->values.line_width; x1 = GDK_GC_FBDATA(pGC)->values.line_width;
miFillRectPolyHelper (pDrawable, pGC, pixel, spanData, miFillRectPolyHelper (pDrawable, pGC, &pixel, spanData,
x2 - (x1 >> 1), y2 - (x1 >> 1), x1, x1); x2 - (x1 >> 1), y2 - (x1 >> 1), x1, x1);
break; break;
default: default: