diff options
Diffstat (limited to 'mi/mipolyrect.c')
| -rw-r--r-- | mi/mipolyrect.c | 198 |
1 files changed, 93 insertions, 105 deletions
diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index 9b0edc176..a0e88d2f2 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. - Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -61,7 +60,7 @@ miPolyRectangle(DrawablePtr pDraw, GCPtr pGC, int nrects, xRectangle *pRects) int i; xRectangle *pR = pRects; DDXPointRec rect[5]; - int bound_tmp; + int bound_tmp; #define MINBOUND(dst,eqn) bound_tmp = eqn; \ if (bound_tmp < -32768) \ @@ -79,109 +78,98 @@ miPolyRectangle(DrawablePtr pDraw, GCPtr pGC, int nrects, xRectangle *pRects) dst = bound_tmp; if (pGC->lineStyle == LineSolid && pGC->joinStyle == JoinMiter && - pGC->lineWidth != 0) - { - xRectangle *tmp, *t; - int ntmp; - int offset1, offset2, offset3; - int x, y, width, height; - - ntmp = (nrects << 2); - offset2 = pGC->lineWidth; - offset1 = offset2 >> 1; - offset3 = offset2 - offset1; - tmp = malloc(ntmp * sizeof (xRectangle)); - if (!tmp) - return; - t = tmp; - for (i = 0; i < nrects; i++) - { - x = pR->x; - y = pR->y; - width = pR->width; - height = pR->height; - pR++; - if (width == 0 && height == 0) - { - rect[0].x = x; - rect[0].y = y; - rect[1].x = x; - rect[1].y = y; - (*pGC->ops->Polylines)(pDraw, pGC, CoordModeOrigin, 2, rect); - } - else if (height < offset2 || width < offset1) - { - if (height == 0) - { - t->x = x; - t->width = width; - } - else - { - MINBOUND (t->x, x - offset1) - MAXUBOUND (t->width, width + offset2) - } - if (width == 0) - { - t->y = y; - t->height = height; - } - else - { - MINBOUND (t->y, y - offset1) - MAXUBOUND (t->height, height + offset2) - } - t++; - } - else - { - MINBOUND(t->x, x - offset1) - MINBOUND(t->y, y - offset1) - MAXUBOUND(t->width, width + offset2) - t->height = offset2; - t++; - MINBOUND(t->x, x - offset1) - MAXBOUND(t->y, y + offset3); - t->width = offset2; - t->height = height - offset2; - t++; - MAXBOUND(t->x, x + width - offset1); - MAXBOUND(t->y, y + offset3) - t->width = offset2; - t->height = height - offset2; - t++; - MINBOUND(t->x, x - offset1) - MAXBOUND(t->y, y + height - offset1) - MAXUBOUND(t->width, width + offset2) - t->height = offset2; - t++; - } - } - (*pGC->ops->PolyFillRect) (pDraw, pGC, t - tmp, tmp); - free((pointer) tmp); + pGC->lineWidth != 0) { + xRectangle *tmp, *t; + int ntmp; + int offset1, offset2, offset3; + int x, y, width, height; + + ntmp = (nrects << 2); + offset2 = pGC->lineWidth; + offset1 = offset2 >> 1; + offset3 = offset2 - offset1; + tmp = malloc(ntmp * sizeof(xRectangle)); + if (!tmp) + return; + t = tmp; + for (i = 0; i < nrects; i++) { + x = pR->x; + y = pR->y; + width = pR->width; + height = pR->height; + pR++; + if (width == 0 && height == 0) { + rect[0].x = x; + rect[0].y = y; + rect[1].x = x; + rect[1].y = y; + (*pGC->ops->Polylines) (pDraw, pGC, CoordModeOrigin, 2, rect); + } + else if (height < offset2 || width < offset1) { + if (height == 0) { + t->x = x; + t->width = width; + } + else { + MINBOUND(t->x, x - offset1) + MAXUBOUND(t->width, width + offset2) + } + if (width == 0) { + t->y = y; + t->height = height; + } + else { + MINBOUND(t->y, y - offset1) + MAXUBOUND(t->height, height + offset2) + } + t++; + } + else { + MINBOUND(t->x, x - offset1) + MINBOUND(t->y, y - offset1) + MAXUBOUND(t->width, width + offset2) + t->height = offset2; + t++; + MINBOUND(t->x, x - offset1) + MAXBOUND(t->y, y + offset3); + t->width = offset2; + t->height = height - offset2; + t++; + MAXBOUND(t->x, x + width - offset1); + MAXBOUND(t->y, y + offset3) + t->width = offset2; + t->height = height - offset2; + t++; + MINBOUND(t->x, x - offset1) + MAXBOUND(t->y, y + height - offset1) + MAXUBOUND(t->width, width + offset2) + t->height = offset2; + t++; + } + } + (*pGC->ops->PolyFillRect) (pDraw, pGC, t - tmp, tmp); + free((pointer) tmp); } - else - { - - for (i=0; i<nrects; i++) - { - rect[0].x = pR->x; - rect[0].y = pR->y; - - MAXBOUND(rect[1].x, pR->x + (int) pR->width) - rect[1].y = rect[0].y; - - rect[2].x = rect[1].x; - MAXBOUND(rect[2].y, pR->y + (int) pR->height); - - rect[3].x = rect[0].x; - rect[3].y = rect[2].y; - - rect[4].x = rect[0].x; - rect[4].y = rect[0].y; - - (*pGC->ops->Polylines)(pDraw, pGC, CoordModeOrigin, 5, rect); - pR++; - } + else { + + for (i = 0; i < nrects; i++) { + rect[0].x = pR->x; + rect[0].y = pR->y; + + MAXBOUND(rect[1].x, pR->x + (int) pR->width) + rect[1].y = rect[0].y; + + rect[2].x = rect[1].x; + MAXBOUND(rect[2].y, pR->y + (int) pR->height); + + rect[3].x = rect[0].x; + rect[3].y = rect[2].y; + + rect[4].x = rect[0].x; + rect[4].y = rect[0].y; + + (*pGC->ops->Polylines) (pDraw, pGC, CoordModeOrigin, 5, rect); + pR++; + } } } |