typedef struct _Rect
{
- int x, y; /* top-left point inside rect */
- int width, height; /* width and height of rect */
+ int x, y; /* top-left point inside rect */
+ int width, height; /* width and height of rect */
} Rect, *PRect;
int FASTCALL IntFillRect(DC *dc, INT XLeft, INT YLeft, INT Width, INT Height, PBRUSH pbrush, BOOL Pen);
INTERNAL_CALL
app_new_point(int x, int y)
{
- POINT p;
- p.x = x;
- p.y = y;
- return p;
+ POINT p;
+ p.x = x;
+ p.y = y;
+ return p;
}
#define pt(x,y) app_new_point((x),(y))
INTERNAL_CALL
rect(int x, int y, int width, int height)
{
- Rect r;
- r.x = x;
- r.y = y;
- r.width = width;
- r.height = height;
- return r;
+ Rect r;
+ r.x = x;
+ r.y = y;
+ r.width = width;
+ r.height = height;
+ return r;
}
INTERNAL_CALL
app_draw_ellipse(DC *g, Rect r, PBRUSH pbrush)
{
- /* Outer ellipse: e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */
-
- int a = r.width / 2;
- int b = r.height / 2;
- int x = 0;
- int y = b;
- long a2 = a*a;
- long b2 = b*b;
- long xcrit = (3 * a2 / 4) + 1;
- long ycrit = (3 * b2 / 4) + 1;
- long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */
- long dxt = b2*(3+x+x);
- long dyt = a2*(3-y-y);
- int d2xt = b2+b2;
- int d2yt = a2+a2;
-
- int w = pbrush->ptPenWidth.x;
-
- /* Inner ellipse: E(X,Y) = B*B*X*X + A*A*Y*Y - A*A*B*B */
-
- int A = a-w > 0 ? a-w : 0;
- int B = b-w > 0 ? b-w : 0;
- int X = 0;
- int Y = B;
- long A2 = A*A;
- long B2 = B*B;
- long XCRIT = (3 * A2 / 4) + 1;
- long YCRIT = (3 * B2 / 4) + 1;
- long T = B2 + A2 - 2*A2*B; /* T = E(X+1,Y-1) */
- long DXT = B2*(3+X+X);
- long DYT = A2*(3-Y-Y);
- int D2XT = B2+B2;
- int D2YT = A2+A2;
-
- int movedown, moveout;
- int innerX = 0, prevx, prevy, W;
- Rect r1, r2;
- int result = 1;
+ /* Outer ellipse: e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */
+
+ int a = r.width / 2;
+ int b = r.height / 2;
+ int x = 0;
+ int y = b;
+ long a2 = a*a;
+ long b2 = b*b;
+ long xcrit = (3 * a2 / 4) + 1;
+ long ycrit = (3 * b2 / 4) + 1;
+ long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */
+ long dxt = b2*(3+x+x);
+ long dyt = a2*(3-y-y);
+ int d2xt = b2+b2;
+ int d2yt = a2+a2;
+
+ int w = pbrush->ptPenWidth.x;
+
+ /* Inner ellipse: E(X,Y) = B*B*X*X + A*A*Y*Y - A*A*B*B */
+
+ int A = a-w > 0 ? a-w : 0;
+ int B = b-w > 0 ? b-w : 0;
+ int X = 0;
+ int Y = B;
+ long A2 = A*A;
+ long B2 = B*B;
+ long XCRIT = (3 * A2 / 4) + 1;
+ long YCRIT = (3 * B2 / 4) + 1;
+ long T = B2 + A2 - 2*A2*B; /* T = E(X+1,Y-1) */
+ long DXT = B2*(3+X+X);
+ long DYT = A2*(3-Y-Y);
+ int D2XT = B2+B2;
+ int D2YT = A2+A2;
+
+ int movedown, moveout;
+ int innerX = 0, prevx, prevy, W;
+ Rect r1, r2;
+ int result = 1;
// START_DEBUG();
- if ((r.width <= 2) || (r.height <= 2))
- return app_fill_rect(g, r, pbrush, TRUE);
-
- r1.x = r.x + a;
- r1.y = r.y;
- r1.width = r.width & 1; /* i.e. if width is odd */
- r1.height = 1;
-
- r2 = r1;
- r2.y = r.y + r.height - 1;
-
- prevx = r1.x;
- prevy = r1.y;
-
- while (y > 0)
- {
- while (Y == y)
- {
- innerX = X;
-
- if (T + A2*Y < XCRIT) /* E(X+1,Y-1/2) <= 0 */
- {
- /* move outwards to encounter edge */
- X += 1;
- T += DXT;
- DXT += D2XT;
- }
- else if (T - B2*X >= YCRIT) /* e(x+1/2,y-1) > 0 */
- {
- /* drop down one line */
- Y -= 1;
- T += DYT;
- DYT += D2YT;
- }
- else {
- /* drop diagonally down and out */
- X += 1;
- Y -= 1;
- T += DXT + DYT;
- DXT += D2XT;
- DYT += D2YT;
- }
- }
-
- movedown = moveout = 0;
-
- W = x - innerX;
- if (r1.x + W < prevx)
- W = prevx - r1.x;
- if (W < w)
- W = w;
-
- if (t + a2*y < xcrit) /* e(x+1,y-1/2) <= 0 */
- {
- /* move outwards to encounter edge */
- x += 1;
- t += dxt;
- dxt += d2xt;
-
- moveout = 1;
- }
- else if (t - b2*x >= ycrit) /* e(x+1/2,y-1) > 0 */
- {
- /* drop down one line */
- y -= 1;
- t += dyt;
- dyt += d2yt;
-
- movedown = 1;
- }
- else {
- /* drop diagonally down and out */
- x += 1;
- y -= 1;
- t += dxt + dyt;
- dxt += d2xt;
- dyt += d2yt;
-
- movedown = 1;
- moveout = 1;
- }
-
- if (movedown) {
- if (r1.width == 0) {
- r1.x -= 1; r1.width += 2;
- r2.x -= 1; r2.width += 2;
- moveout = 0;
- }
-
- if (r1.x < r.x)
- r1.x = r2.x = r.x;
- if (r1.width > r.width)
- r1.width = r2.width = r.width;
- if (r1.y == r2.y-1) {
- r1.x = r2.x = r.x;
- r1.width = r2.width = r.width;
- }
-
- if ((r1.y < r.y+w) || (r1.x+W >= r1.x+r1.width-W))
- {
- result &= app_fill_rect(g, r1, pbrush, TRUE);
- result &= app_fill_rect(g, r2, pbrush, TRUE);
-
- prevx = r1.x;
- prevy = r1.y;
- }
- else if (r1.y+r1.height < r2.y)
- {
- /* draw distinct rectangles */
- result &= app_fill_rect(g, rect(r1.x,r1.y,
- W,1), pbrush, TRUE);
- result &= app_fill_rect(g, rect(
- r1.x+r1.width-W,r1.y,W,1), pbrush, TRUE);
- result &= app_fill_rect(g, rect(r2.x,
- r2.y,W,1), pbrush, TRUE);
- result &= app_fill_rect(g, rect(
- r2.x+r2.width-W,r2.y,W,1), pbrush, TRUE);
-
- prevx = r1.x;
- prevy = r1.y;
- }
-
- /* move down */
- r1.y += 1;
- r2.y -= 1;
- }
-
- if (moveout) {
- /* move outwards */
- r1.x -= 1; r1.width += 2;
- r2.x -= 1; r2.width += 2;
- }
- }
- if ((x <= a) && (prevy < r2.y)) {
- /* draw final line */
- r1.height = r1.y+r1.height-r2.y;
- r1.y = r2.y;
-
- W = w;
- if (r.x + W != prevx)
- W = prevx - r.x;
- if (W < w)
- W = w;
-
- if (W+W >= r.width) {
- result &= app_fill_rect(g, rect(r.x, r1.y,
- r.width, r1.height), pbrush, TRUE);
- return result;
- }
-
- result &= app_fill_rect(g, rect(r.x, r1.y, W, r1.height), pbrush, TRUE);
- result &= app_fill_rect(g, rect(r.x+r.width-W, r1.y,
- W, r1.height), pbrush, TRUE);
- }
- return result;
+ if ((r.width <= 2) || (r.height <= 2))
+ return app_fill_rect(g, r, pbrush, TRUE);
+
+ r1.x = r.x + a;
+ r1.y = r.y;
+ r1.width = r.width & 1; /* i.e. if width is odd */
+ r1.height = 1;
+
+ r2 = r1;
+ r2.y = r.y + r.height - 1;
+
+ prevx = r1.x;
+ prevy = r1.y;
+
+ while (y > 0)
+ {
+ while (Y == y)
+ {
+ innerX = X;
+
+ if (T + A2*Y < XCRIT) /* E(X+1,Y-1/2) <= 0 */
+ {
+ /* move outwards to encounter edge */
+ X += 1;
+ T += DXT;
+ DXT += D2XT;
+ }
+ else if (T - B2*X >= YCRIT) /* e(x+1/2,y-1) > 0 */
+ {
+ /* drop down one line */
+ Y -= 1;
+ T += DYT;
+ DYT += D2YT;
+ }
+ else
+ {
+ /* drop diagonally down and out */
+ X += 1;
+ Y -= 1;
+ T += DXT + DYT;
+ DXT += D2XT;
+ DYT += D2YT;
+ }
+ }
+
+ movedown = moveout = 0;
+
+ W = x - innerX;
+ if (r1.x + W < prevx)
+ W = prevx - r1.x;
+ if (W < w)
+ W = w;
+
+ if (t + a2*y < xcrit) /* e(x+1,y-1/2) <= 0 */
+ {
+ /* move outwards to encounter edge */
+ x += 1;
+ t += dxt;
+ dxt += d2xt;
+
+ moveout = 1;
+ }
+ else if (t - b2*x >= ycrit) /* e(x+1/2,y-1) > 0 */
+ {
+ /* drop down one line */
+ y -= 1;
+ t += dyt;
+ dyt += d2yt;
+
+ movedown = 1;
+ }
+ else
+ {
+ /* drop diagonally down and out */
+ x += 1;
+ y -= 1;
+ t += dxt + dyt;
+ dxt += d2xt;
+ dyt += d2yt;
+
+ movedown = 1;
+ moveout = 1;
+ }
+
+ if (movedown)
+ {
+ if (r1.width == 0)
+ {
+ r1.x -= 1;
+ r1.width += 2;
+ r2.x -= 1;
+ r2.width += 2;
+ moveout = 0;
+ }
+
+ if (r1.x < r.x)
+ r1.x = r2.x = r.x;
+ if (r1.width > r.width)
+ r1.width = r2.width = r.width;
+ if (r1.y == r2.y-1)
+ {
+ r1.x = r2.x = r.x;
+ r1.width = r2.width = r.width;
+ }
+
+ if ((r1.y < r.y+w) || (r1.x+W >= r1.x+r1.width-W))
+ {
+ result &= app_fill_rect(g, r1, pbrush, TRUE);
+ result &= app_fill_rect(g, r2, pbrush, TRUE);
+
+ prevx = r1.x;
+ prevy = r1.y;
+ }
+ else if (r1.y+r1.height < r2.y)
+ {
+ /* draw distinct rectangles */
+ result &= app_fill_rect(g, rect(r1.x,r1.y,
+ W,1), pbrush, TRUE);
+ result &= app_fill_rect(g, rect(
+ r1.x+r1.width-W,r1.y,W,1), pbrush, TRUE);
+ result &= app_fill_rect(g, rect(r2.x,
+ r2.y,W,1), pbrush, TRUE);
+ result &= app_fill_rect(g, rect(
+ r2.x+r2.width-W,r2.y,W,1), pbrush, TRUE);
+
+ prevx = r1.x;
+ prevy = r1.y;
+ }
+
+ /* move down */
+ r1.y += 1;
+ r2.y -= 1;
+ }
+
+ if (moveout)
+ {
+ /* move outwards */
+ r1.x -= 1;
+ r1.width += 2;
+ r2.x -= 1;
+ r2.width += 2;
+ }
+ }
+ if ((x <= a) && (prevy < r2.y))
+ {
+ /* draw final line */
+ r1.height = r1.y+r1.height-r2.y;
+ r1.y = r2.y;
+
+ W = w;
+ if (r.x + W != prevx)
+ W = prevx - r.x;
+ if (W < w)
+ W = w;
+
+ if (W+W >= r.width)
+ {
+ result &= app_fill_rect(g, rect(r.x, r1.y,
+ r.width, r1.height), pbrush, TRUE);
+ return result;
+ }
+
+ result &= app_fill_rect(g, rect(r.x, r1.y, W, r1.height), pbrush, TRUE);
+ result &= app_fill_rect(g, rect(r.x+r.width-W, r1.y,
+ W, r1.height), pbrush, TRUE);
+ }
+ return result;
}
/*
int
FASTCALL
app_fill_arc_rect(DC *g,
- Rect r, // top, left, width, height
- POINT p0, // Center
- POINT p1, // Start
- POINT p2, // End
- int start_angle,
- int end_angle,
- PBRUSH pbrush,
- BOOL Pen)
+ Rect r, // top, left, width, height
+ POINT p0, // Center
+ POINT p1, // Start
+ POINT p2, // End
+ int start_angle,
+ int end_angle,
+ PBRUSH pbrush,
+ BOOL Pen)
{
- int x1, x2;
- int start_above, end_above;
- long rise1, run1, rise2, run2;
+ int x1, x2;
+ int start_above, end_above;
+ long rise1, run1, rise2, run2;
+
+ rise1 = p1.y - p0.y;
+ run1 = p1.x - p0.x;
+ rise2 = p2.y - p0.y;
+ run2 = p2.x - p0.x;
+
+ if (r.y <= p0.y) //
+ {
+ /* in top half of arc ellipse */
+
+ if (p1.y <= r.y)
+ {
+ /* start_line is in the top half and is */
+ /* intersected by the current Y scan line */
+ if (rise1 == 0)
+ x1 = p1.x;
+ else
+ x1 = p0.x + (r.y-p0.y)*run1/rise1;
+ start_above = 1;
+ }
+ else if ((start_angle >= 0) && (start_angle <= 180))
+ {
+ /* start_line is above middle */
+ x1 = p1.x;
+ start_above = 1;
+ }
+ else
+ {
+ /* start_line is below middle */
+ x1 = r.x + r.width;
+ start_above = 0;
+ }
+ if (x1 < r.x)
+ x1 = r.x;
+ if (x1 > r.x+r.width)
+ x1 = r.x+r.width;
+
+ if (p2.y <= r.y)
+ {
+ /* end_line is in the top half and is */
+ /* intersected by the current Y scan line */
+ if (rise2 == 0)
+ x2 = p2.x;
+ else
+ x2 = p0.x + (r.y-p0.y)*run2/rise2;
+ end_above = 1;
+ }
+ else if ((end_angle >= 0) && (end_angle <= 180))
+ {
+ /* end_line is above middle */
+ x2 = p2.x;
+ end_above = 1;
+ }
+ else
+ {
+ /* end_line is below middle */
+ x2 = r.x;
+ end_above = 0;
+ }
+
+ if (x2 < r.x) x2 = r.x;
- rise1 = p1.y - p0.y;
- run1 = p1.x - p0.x;
- rise2 = p2.y - p0.y;
- run2 = p2.x - p0.x;
+ if (x2 > r.x+r.width) x2 = r.x+r.width;
- if (r.y <= p0.y) //
+ if (start_above && end_above)
+ {
+ if (start_angle > end_angle)
+ {
+ /* fill outsides of wedge */
+ if (! app_fill_rect(g, rect(r.x, r.y,
+ x1-r.x, r.height), pbrush, Pen))
+ return 0;
+ return app_fill_rect(g, rect(x2, r.y,
+ r.x+r.width-x2, r.height), pbrush, Pen);
+ }
+ else
+ {
+ /* fill inside of wedge */
+ r.width = x1-x2;
+ r.x = x2;
+ return app_fill_rect(g, r, pbrush, Pen);
+ }
+ }
+ else if (start_above)
+ {
+ /* fill to the left of the start_line */
+ r.width = x1-r.x;
+ return app_fill_rect(g, r, pbrush, Pen);
+ }
+ else if (end_above)
+ {
+ /* fill right of end_line */
+ r.width = r.x+r.width-x2;
+ r.x = x2;
+ return app_fill_rect(g, r, pbrush, Pen);
+ }
+ else
+ {
+ if (start_angle > end_angle)
+ return app_fill_rect(g,r, pbrush, Pen);
+ else
+ return 1;
+ }
+ }
+ else
+ {
+ /* in lower half of arc ellipse */
+
+ if (p1.y >= r.y)
+ {
+ /* start_line is in the lower half and is */
+ /* intersected by the current Y scan line */
+ if (rise1 == 0)
+ x1 = p1.x;
+ else
+ x1 = p0.x + (r.y-p0.y)*run1/rise1;
+ start_above = 0;
+ }
+ else if ((start_angle >= 180) && (start_angle <= 360))
+ {
+ /* start_line is below middle */
+ x1 = p1.x;
+ start_above = 0;
+ }
+ else
+ {
+ /* start_line is above middle */
+ x1 = r.x;
+ start_above = 1;
+ }
+ if (x1 < r.x)
+ x1 = r.x;
+ if (x1 > r.x+r.width)
+ x1 = r.x+r.width;
+
+ if (p2.y >= r.y)
+ {
+ /* end_line is in the lower half and is */
+ /* intersected by the current Y scan line */
+ if (rise2 == 0)
+ x2 = p2.x;
+ else
+ x2 = p0.x + (r.y-p0.y)*run2/rise2;
+ end_above = 0;
+ }
+ else if ((end_angle >= 180) && (end_angle <= 360))
+ {
+ /* end_line is below middle */
+ x2 = p2.x;
+ end_above = 0;
+ }
+ else
{
- /* in top half of arc ellipse */
-
- if (p1.y <= r.y)
- {
- /* start_line is in the top half and is */
- /* intersected by the current Y scan line */
- if (rise1 == 0)
- x1 = p1.x;
- else
- x1 = p0.x + (r.y-p0.y)*run1/rise1;
- start_above = 1;
- }
- else if ((start_angle >= 0) && (start_angle <= 180))
- {
- /* start_line is above middle */
- x1 = p1.x;
- start_above = 1;
- }
- else
- {
- /* start_line is below middle */
- x1 = r.x + r.width;
- start_above = 0;
- }
- if (x1 < r.x)
- x1 = r.x;
- if (x1 > r.x+r.width)
- x1 = r.x+r.width;
-
- if (p2.y <= r.y)
- {
- /* end_line is in the top half and is */
- /* intersected by the current Y scan line */
- if (rise2 == 0)
- x2 = p2.x;
- else
- x2 = p0.x + (r.y-p0.y)*run2/rise2;
- end_above = 1;
- }
- else if ((end_angle >= 0) && (end_angle <= 180))
- {
- /* end_line is above middle */
- x2 = p2.x;
- end_above = 1;
- }
- else
- {
- /* end_line is below middle */
- x2 = r.x;
- end_above = 0;
- }
-
- if (x2 < r.x) x2 = r.x;
-
- if (x2 > r.x+r.width) x2 = r.x+r.width;
-
- if (start_above && end_above)
- {
- if (start_angle > end_angle)
- {
- /* fill outsides of wedge */
- if (! app_fill_rect(g, rect(r.x, r.y,
- x1-r.x, r.height), pbrush, Pen))
- return 0;
- return app_fill_rect(g, rect(x2, r.y,
- r.x+r.width-x2, r.height), pbrush, Pen);
- }
- else
- {
- /* fill inside of wedge */
- r.width = x1-x2;
- r.x = x2;
- return app_fill_rect(g, r, pbrush, Pen);
- }
- }
- else if (start_above)
- {
- /* fill to the left of the start_line */
- r.width = x1-r.x;
- return app_fill_rect(g, r, pbrush, Pen);
- }
- else if (end_above)
- {
- /* fill right of end_line */
- r.width = r.x+r.width-x2;
- r.x = x2;
- return app_fill_rect(g, r, pbrush, Pen);
- }
- else
- {
- if (start_angle > end_angle)
- return app_fill_rect(g,r, pbrush, Pen);
- else
- return 1;
- }
- }
- else
- {
- /* in lower half of arc ellipse */
-
- if (p1.y >= r.y)
- {
- /* start_line is in the lower half and is */
- /* intersected by the current Y scan line */
- if (rise1 == 0)
- x1 = p1.x;
- else
- x1 = p0.x + (r.y-p0.y)*run1/rise1;
- start_above = 0;
- }
- else if ((start_angle >= 180) && (start_angle <= 360))
- {
- /* start_line is below middle */
- x1 = p1.x;
- start_above = 0;
- }
- else
- {
- /* start_line is above middle */
- x1 = r.x;
- start_above = 1;
- }
- if (x1 < r.x)
- x1 = r.x;
- if (x1 > r.x+r.width)
- x1 = r.x+r.width;
-
- if (p2.y >= r.y)
- {
- /* end_line is in the lower half and is */
- /* intersected by the current Y scan line */
- if (rise2 == 0)
- x2 = p2.x;
- else
- x2 = p0.x + (r.y-p0.y)*run2/rise2;
- end_above = 0;
- }
- else if ((end_angle >= 180) && (end_angle <= 360))
- {
- /* end_line is below middle */
- x2 = p2.x;
- end_above = 0;
- }
- else
- {
- /* end_line is above middle */
- x2 = r.x + r.width;
- end_above = 1;
- }
- if (x2 < r.x)
- x2 = r.x;
- if (x2 > r.x+r.width)
- x2 = r.x+r.width;
-
- if (start_above && end_above)
- {
- if (start_angle > end_angle)
- return app_fill_rect(g,r, pbrush, Pen);
- else
- return 1;
- }
- else if (start_above)
- {
- /* fill to the left of end_line */
- r.width = x2-r.x;
- return app_fill_rect(g,r, pbrush, Pen);
- }
- else if (end_above)
- {
- /* fill right of start_line */
- r.width = r.x+r.width-x1;
- r.x = x1;
- return app_fill_rect(g,r, pbrush, Pen);
- }
- else
- {
- if (start_angle > end_angle)
- {
- /* fill outsides of wedge */
- if (! app_fill_rect(g, rect(r.x, r.y,
- x2-r.x, r.height), pbrush, Pen))
- return 0;
- return app_fill_rect(g, rect(x1, r.y,
- r.x+r.width-x1, r.height), pbrush, Pen);
- }
- else
- {
- /* fill inside of wedge */
- r.width = x2-x1;
- r.x = x1;
- return app_fill_rect(g, r, pbrush, Pen);
- }
- }
- }
+ /* end_line is above middle */
+ x2 = r.x + r.width;
+ end_above = 1;
+ }
+ if (x2 < r.x)
+ x2 = r.x;
+ if (x2 > r.x+r.width)
+ x2 = r.x+r.width;
+
+ if (start_above && end_above)
+ {
+ if (start_angle > end_angle)
+ return app_fill_rect(g,r, pbrush, Pen);
+ else
+ return 1;
+ }
+ else if (start_above)
+ {
+ /* fill to the left of end_line */
+ r.width = x2-r.x;
+ return app_fill_rect(g,r, pbrush, Pen);
+ }
+ else if (end_above)
+ {
+ /* fill right of start_line */
+ r.width = r.x+r.width-x1;
+ r.x = x1;
+ return app_fill_rect(g,r, pbrush, Pen);
+ }
+ else
+ {
+ if (start_angle > end_angle)
+ {
+ /* fill outsides of wedge */
+ if (! app_fill_rect(g, rect(r.x, r.y,
+ x2-r.x, r.height), pbrush, Pen))
+ return 0;
+ return app_fill_rect(g, rect(x1, r.y,
+ r.x+r.width-x1, r.height), pbrush, Pen);
+ }
+ else
+ {
+ /* fill inside of wedge */
+ r.width = x2-x1;
+ r.x = x1;
+ return app_fill_rect(g, r, pbrush, Pen);
+ }
+ }
+ }
}
/*
FASTCALL
app_fill_ellipse(DC *g, Rect r, PBRUSH pbrush)
{
- /* e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */
-
- int a = r.width / 2;
- int b = r.height / 2;
- int x = 0;
- int y = b;
- long a2 = a*a;
- long b2 = b*b;
- long xcrit = (3 * a2 / 4) + 1;
- long ycrit = (3 * b2 / 4) + 1;
- long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */
- long dxt = b2*(3+x+x);
- long dyt = a2*(3-y-y);
- int d2xt = b2+b2;
- int d2yt = a2+a2;
- Rect r1, r2;
- int result = 1;
+ /* e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */
+
+ int a = r.width / 2;
+ int b = r.height / 2;
+ int x = 0;
+ int y = b;
+ long a2 = a*a;
+ long b2 = b*b;
+ long xcrit = (3 * a2 / 4) + 1;
+ long ycrit = (3 * b2 / 4) + 1;
+ long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */
+ long dxt = b2*(3+x+x);
+ long dyt = a2*(3-y-y);
+ int d2xt = b2+b2;
+ int d2yt = a2+a2;
+ Rect r1, r2;
+ int result = 1;
// START_DEBUG();
- if ((r.width <= 2) || (r.height <= 2))
- return app_fill_rect(g, r, pbrush, FALSE);
-
- r1.x = r.x + a;
- r1.y = r.y;
- r1.width = r.width & 1; /* i.e. if width is odd */
- r1.height = 1;
-
- r2 = r1;
- r2.y = r.y + r.height - 1;
-
- while (y > 0)
- {
- if (t + a2*y < xcrit) { /* e(x+1,y-1/2) <= 0 */
- /* move outwards to encounter edge */
- x += 1;
- t += dxt;
- dxt += d2xt;
-
- /* move outwards */
- r1.x -= 1; r1.width += 2;
- r2.x -= 1; r2.width += 2;
- }
- else if (t - b2*x >= ycrit) { /* e(x+1/2,y-1) > 0 */
- /* drop down one line */
- y -= 1;
- t += dyt;
- dyt += d2yt;
-
- /* enlarge rectangles */
- r1.height += 1;
- r2.height += 1; r2.y -= 1;
- }
- else {
- /* drop diagonally down and out */
- x += 1;
- y -= 1;
- t += dxt + dyt;
- dxt += d2xt;
- dyt += d2yt;
-
- if ((r1.width > 0) && (r1.height > 0))
- {
- /* draw rectangles first */
-
- if (r1.y+r1.height < r2.y) {
- /* distinct rectangles */
- result &= app_fill_rect(g, r1, pbrush, FALSE);
- result &= app_fill_rect(g, r2, pbrush, FALSE);
- }
-
- /* move down */
- r1.y += r1.height; r1.height = 1;
- r2.y -= 1; r2.height = 1;
- }
- else {
- /* skipped pixels on initial diagonal */
-
- /* enlarge, rather than moving down */
- r1.height += 1;
- r2.height += 1; r2.y -= 1;
- }
-
- /* move outwards */
- r1.x -= 1; r1.width += 2;
- r2.x -= 1; r2.width += 2;
- }
- }
- if (r1.y < r2.y) {
- /* overlap */
- r1.x = r.x;
- r1.width = r.width;
- r1.height = r2.y+r2.height-r1.y;
- result &= app_fill_rect(g, r1, pbrush, FALSE);
- }
- else if (x <= a) {
- /* crossover, draw final line */
- r1.x = r.x;
- r1.width = r.width;
- r1.height = r1.y+r1.height-r2.y;
- r1.y = r2.y;
- result &= app_fill_rect(g, r1, pbrush, FALSE);
- }
- return result;
+ if ((r.width <= 2) || (r.height <= 2))
+ return app_fill_rect(g, r, pbrush, FALSE);
+
+ r1.x = r.x + a;
+ r1.y = r.y;
+ r1.width = r.width & 1; /* i.e. if width is odd */
+ r1.height = 1;
+
+ r2 = r1;
+ r2.y = r.y + r.height - 1;
+
+ while (y > 0)
+ {
+ if (t + a2*y < xcrit) /* e(x+1,y-1/2) <= 0 */
+ {
+ /* move outwards to encounter edge */
+ x += 1;
+ t += dxt;
+ dxt += d2xt;
+
+ /* move outwards */
+ r1.x -= 1;
+ r1.width += 2;
+ r2.x -= 1;
+ r2.width += 2;
+ }
+ else if (t - b2*x >= ycrit) /* e(x+1/2,y-1) > 0 */
+ {
+ /* drop down one line */
+ y -= 1;
+ t += dyt;
+ dyt += d2yt;
+
+ /* enlarge rectangles */
+ r1.height += 1;
+ r2.height += 1;
+ r2.y -= 1;
+ }
+ else
+ {
+ /* drop diagonally down and out */
+ x += 1;
+ y -= 1;
+ t += dxt + dyt;
+ dxt += d2xt;
+ dyt += d2yt;
+
+ if ((r1.width > 0) && (r1.height > 0))
+ {
+ /* draw rectangles first */
+
+ if (r1.y+r1.height < r2.y)
+ {
+ /* distinct rectangles */
+ result &= app_fill_rect(g, r1, pbrush, FALSE);
+ result &= app_fill_rect(g, r2, pbrush, FALSE);
+ }
+
+ /* move down */
+ r1.y += r1.height;
+ r1.height = 1;
+ r2.y -= 1;
+ r2.height = 1;
+ }
+ else
+ {
+ /* skipped pixels on initial diagonal */
+
+ /* enlarge, rather than moving down */
+ r1.height += 1;
+ r2.height += 1;
+ r2.y -= 1;
+ }
+
+ /* move outwards */
+ r1.x -= 1;
+ r1.width += 2;
+ r2.x -= 1;
+ r2.width += 2;
+ }
+ }
+ if (r1.y < r2.y)
+ {
+ /* overlap */
+ r1.x = r.x;
+ r1.width = r.width;
+ r1.height = r2.y+r2.height-r1.y;
+ result &= app_fill_rect(g, r1, pbrush, FALSE);
+ }
+ else if (x <= a)
+ {
+ /* crossover, draw final line */
+ r1.x = r.x;
+ r1.width = r.width;
+ r1.height = r1.y+r1.height-r2.y;
+ r1.y = r2.y;
+ result &= app_fill_rect(g, r1, pbrush, FALSE);
+ }
+ return result;
}
static
FASTCALL
app_boundary_point(Rect r, int angle)
{
- int cx, cy;
- double tangent;
-
- cx = r.width;
- cx /= 2;
- cx += r.x;
-
- cy = r.height;
- cy /= 2;
- cy += r.y;
-
- if (angle == 0)
- return pt(r.x+r.width, cy);
- else if (angle == 45)
- return pt(r.x+r.width, r.y);
- else if (angle == 90)
- return pt(cx, r.y);
- else if (angle == 135)
- return pt(r.x, r.y);
- else if (angle == 180)
- return pt(r.x, cy);
- else if (angle == 225)
- return pt(r.x, r.y+r.height);
- else if (angle == 270)
- return pt(cx, r.y+r.height);
- else if (angle == 315)
- return pt(r.x+r.width, r.y+r.height);
-
- tangent = tan(DEGREES_TO_RADIANS(angle));
-
- if ((angle > 45) && (angle < 135))
- return pt((int)(cx+r.height/tangent/2), r.y);
- else if ((angle > 225) && (angle < 315))
- return pt((int)(cx-r.height/tangent/2), r.y+r.height);
- else if ((angle > 135) && (angle < 225))
- return pt(r.x, (int)(cy+r.width*tangent/2));
- else
- return pt(r.x+r.width, (int)(cy-r.width*tangent/2));
+ int cx, cy;
+ double tangent;
+
+ cx = r.width;
+ cx /= 2;
+ cx += r.x;
+
+ cy = r.height;
+ cy /= 2;
+ cy += r.y;
+
+ if (angle == 0)
+ return pt(r.x+r.width, cy);
+ else if (angle == 45)
+ return pt(r.x+r.width, r.y);
+ else if (angle == 90)
+ return pt(cx, r.y);
+ else if (angle == 135)
+ return pt(r.x, r.y);
+ else if (angle == 180)
+ return pt(r.x, cy);
+ else if (angle == 225)
+ return pt(r.x, r.y+r.height);
+ else if (angle == 270)
+ return pt(cx, r.y+r.height);
+ else if (angle == 315)
+ return pt(r.x+r.width, r.y+r.height);
+
+ tangent = tan(DEGREES_TO_RADIANS(angle));
+
+ if ((angle > 45) && (angle < 135))
+ return pt((int)(cx+r.height/tangent/2), r.y);
+ else if ((angle > 225) && (angle < 315))
+ return pt((int)(cx-r.height/tangent/2), r.y+r.height);
+ else if ((angle > 135) && (angle < 225))
+ return pt(r.x, (int)(cy+r.width*tangent/2));
+ else
+ return pt(r.x+r.width, (int)(cy-r.width*tangent/2));
}
int
FASTCALL
app_fill_arc(DC *g, Rect r, int start_angle, int end_angle, PBRUSH pbrush, BOOL Chord)
{
- /* e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */
-
- int a = r.width / 2;
- int b = r.height / 2;
- int x = 0;
- int y = b;
- long a2 = a*a;
- long b2 = b*b;
- long xcrit = (3 * a2 / 4) + 1;
- long ycrit = (3 * b2 / 4) + 1;
- long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */
- long dxt = b2*(3+x+x);
- long dyt = a2*(3-y-y);
- int d2xt = b2+b2;
- int d2yt = a2+a2;
- Rect r1, r2;
- int movedown, moveout;
- int result = 1;
-
- /* line descriptions */
- POINT p0, p1, p2;
+ /* e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */
+
+ int a = r.width / 2;
+ int b = r.height / 2;
+ int x = 0;
+ int y = b;
+ long a2 = a*a;
+ long b2 = b*b;
+ long xcrit = (3 * a2 / 4) + 1;
+ long ycrit = (3 * b2 / 4) + 1;
+ long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */
+ long dxt = b2*(3+x+x);
+ long dyt = a2*(3-y-y);
+ int d2xt = b2+b2;
+ int d2yt = a2+a2;
+ Rect r1, r2;
+ int movedown, moveout;
+ int result = 1;
+
+ /* line descriptions */
+ POINT p0, p1, p2;
// START_DEBUG();
- /* if angles differ by 360 degrees or more, close the shape */
- if ((start_angle + 360 <= end_angle) ||
- (start_angle - 360 >= end_angle))
- {
- return app_fill_ellipse(g, r, pbrush);
- }
-
- /* make start_angle >= 0 and <= 360 */
- while (start_angle < 0)
- start_angle += 360;
- start_angle %= 360;
-
- /* make end_angle >= 0 and <= 360 */
- while (end_angle < 0)
- end_angle += 360;
- end_angle %= 360;
-
- /* draw nothing if the angles are equal */
- if (start_angle == end_angle)
- return 1;
-
- /* find arc wedge line end points */
- p1 = app_boundary_point(r, start_angle);
- p2 = app_boundary_point(r, end_angle);
- if (Chord)
- p0 = pt((p1.x+p2.x)/2,(p1.y+p2.y)/2);
- else
- p0 = pt(r.x + r.width/2, r.y + r.height/2);
-
- /* initialise rectangles to be drawn */
- r1.x = r.x + a;
- r1.y = r.y;
- r1.width = r.width & 1; /* i.e. if width is odd */
- r1.height = 1;
-
- r2 = r1;
- r2.y = r.y + r.height - 1;
-
- while (y > 0)
- {
- moveout = movedown = 0;
-
- if (t + a2*y < xcrit) { /* e(x+1,y-1/2) <= 0 */
- /* move outwards to encounter edge */
- x += 1;
- t += dxt;
- dxt += d2xt;
-
- moveout = 1;
- }
- else if (t - b2*x >= ycrit) { /* e(x+1/2,y-1) > 0 */
- /* drop down one line */
- y -= 1;
- t += dyt;
- dyt += d2yt;
-
- movedown = 1;
- }
- else {
- /* drop diagonally down and out */
- x += 1;
- y -= 1;
- t += dxt + dyt;
- dxt += d2xt;
- dyt += d2yt;
-
- moveout = 1;
- movedown = 1;
- }
-
- if (movedown) {
- if (r1.width == 0) {
- r1.x -= 1; r1.width += 2;
- r2.x -= 1; r2.width += 2;
- moveout = 0;
- }
-
- if (r1.x < r.x)
- r1.x = r2.x = r.x;
- if (r1.width > r.width)
- r1.width = r2.width = r.width;
- if (r1.y == r2.y-1) {
- r1.x = r2.x = r.x;
- r1.width = r2.width = r.width;
- }
-
- if ((r1.width > 0) && (r1.y+r1.height < r2.y)) {
- /* distinct rectangles */
- result &= app_fill_arc_rect(g, r1,
- p0, p1, p2,
- start_angle, end_angle, pbrush, FALSE);
- result &= app_fill_arc_rect(g, r2,
- p0, p1, p2,
- start_angle, end_angle, pbrush, FALSE);
- }
-
- /* move down */
- r1.y += 1;
- r2.y -= 1;
- }
-
- if (moveout) {
- /* move outwards */
- r1.x -= 1; r1.width += 2;
- r2.x -= 1; r2.width += 2;
- }
- }
- if (r1.y < r2.y) {
- /* overlap */
- r1.x = r.x;
- r1.width = r.width;
- r1.height = r2.y+r2.height-r1.y;
- while (r1.height > 0) {
- result &= app_fill_arc_rect(g,
- rect(r1.x, r1.y, r1.width, 1),
- p0, p1, p2, start_angle, end_angle, pbrush, FALSE);
- r1.y += 1;
- r1.height -= 1;
- }
- }
- else if (x <= a) {
- /* crossover, draw final line */
- r1.x = r.x;
- r1.width = r.width;
- r1.height = r1.y+r1.height-r2.y;
- r1.y = r2.y;
- while (r1.height > 0) {
- result &= app_fill_arc_rect(g,
- rect(r1.x, r1.y, r1.width, 1),
- p0, p1, p2, start_angle, end_angle, pbrush, FALSE);
- r1.y += 1;
- r1.height -= 1;
- }
- }
- return result;
+ /* if angles differ by 360 degrees or more, close the shape */
+ if ((start_angle + 360 <= end_angle) ||
+ (start_angle - 360 >= end_angle))
+ {
+ return app_fill_ellipse(g, r, pbrush);
+ }
+
+ /* make start_angle >= 0 and <= 360 */
+ while (start_angle < 0)
+ start_angle += 360;
+ start_angle %= 360;
+
+ /* make end_angle >= 0 and <= 360 */
+ while (end_angle < 0)
+ end_angle += 360;
+ end_angle %= 360;
+
+ /* draw nothing if the angles are equal */
+ if (start_angle == end_angle)
+ return 1;
+
+ /* find arc wedge line end points */
+ p1 = app_boundary_point(r, start_angle);
+ p2 = app_boundary_point(r, end_angle);
+ if (Chord)
+ p0 = pt((p1.x+p2.x)/2,(p1.y+p2.y)/2);
+ else
+ p0 = pt(r.x + r.width/2, r.y + r.height/2);
+
+ /* initialise rectangles to be drawn */
+ r1.x = r.x + a;
+ r1.y = r.y;
+ r1.width = r.width & 1; /* i.e. if width is odd */
+ r1.height = 1;
+
+ r2 = r1;
+ r2.y = r.y + r.height - 1;
+
+ while (y > 0)
+ {
+ moveout = movedown = 0;
+
+ if (t + a2*y < xcrit) /* e(x+1,y-1/2) <= 0 */
+ {
+ /* move outwards to encounter edge */
+ x += 1;
+ t += dxt;
+ dxt += d2xt;
+
+ moveout = 1;
+ }
+ else if (t - b2*x >= ycrit) /* e(x+1/2,y-1) > 0 */
+ {
+ /* drop down one line */
+ y -= 1;
+ t += dyt;
+ dyt += d2yt;
+
+ movedown = 1;
+ }
+ else
+ {
+ /* drop diagonally down and out */
+ x += 1;
+ y -= 1;
+ t += dxt + dyt;
+ dxt += d2xt;
+ dyt += d2yt;
+
+ moveout = 1;
+ movedown = 1;
+ }
+
+ if (movedown)
+ {
+ if (r1.width == 0)
+ {
+ r1.x -= 1;
+ r1.width += 2;
+ r2.x -= 1;
+ r2.width += 2;
+ moveout = 0;
+ }
+
+ if (r1.x < r.x)
+ r1.x = r2.x = r.x;
+ if (r1.width > r.width)
+ r1.width = r2.width = r.width;
+ if (r1.y == r2.y-1)
+ {
+ r1.x = r2.x = r.x;
+ r1.width = r2.width = r.width;
+ }
+
+ if ((r1.width > 0) && (r1.y+r1.height < r2.y))
+ {
+ /* distinct rectangles */
+ result &= app_fill_arc_rect(g, r1,
+ p0, p1, p2,
+ start_angle, end_angle, pbrush, FALSE);
+ result &= app_fill_arc_rect(g, r2,
+ p0, p1, p2,
+ start_angle, end_angle, pbrush, FALSE);
+ }
+
+ /* move down */
+ r1.y += 1;
+ r2.y -= 1;
+ }
+
+ if (moveout)
+ {
+ /* move outwards */
+ r1.x -= 1;
+ r1.width += 2;
+ r2.x -= 1;
+ r2.width += 2;
+ }
+ }
+ if (r1.y < r2.y)
+ {
+ /* overlap */
+ r1.x = r.x;
+ r1.width = r.width;
+ r1.height = r2.y+r2.height-r1.y;
+ while (r1.height > 0)
+ {
+ result &= app_fill_arc_rect(g,
+ rect(r1.x, r1.y, r1.width, 1),
+ p0, p1, p2, start_angle, end_angle, pbrush, FALSE);
+ r1.y += 1;
+ r1.height -= 1;
+ }
+ }
+ else if (x <= a)
+ {
+ /* crossover, draw final line */
+ r1.x = r.x;
+ r1.width = r.width;
+ r1.height = r1.y+r1.height-r2.y;
+ r1.y = r2.y;
+ while (r1.height > 0)
+ {
+ result &= app_fill_arc_rect(g,
+ rect(r1.x, r1.y, r1.width, 1),
+ p0, p1, p2, start_angle, end_angle, pbrush, FALSE);
+ r1.y += 1;
+ r1.height -= 1;
+ }
+ }
+ return result;
}
int app_draw_arc(DC *g, Rect r, int start_angle, int end_angle, PBRUSH pbrushPen, BOOL Chord)
{
- /* Outer ellipse: e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */
-
- int a = r.width / 2;
- int b = r.height / 2;
- int x = 0;
- int y = b;
- long a2 = a*a;
- long b2 = b*b;
- long xcrit = (3 * a2 / 4) + 1;
- long ycrit = (3 * b2 / 4) + 1;
- long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */
- long dxt = b2*(3+x+x);
- long dyt = a2*(3-y-y);
- int d2xt = b2+b2;
- int d2yt = a2+a2;
-
- int w = pbrushPen->ptPenWidth.x;
-
- /* Inner ellipse: E(X,Y) = B*B*X*X + A*A*Y*Y - A*A*B*B */
-
- int A = a-w > 0 ? a-w : 0;
- int B = b-w > 0 ? b-w : 0;
- int X = 0;
- int Y = B;
- long A2 = A*A;
- long B2 = B*B;
- long XCRIT = (3 * A2 / 4) + 1;
- long YCRIT = (3 * B2 / 4) + 1;
- long T = B2 + A2 - 2*A2*B; /* T = E(X+1,Y-1) */
- long DXT = B2*(3+X+X);
- long DYT = A2*(3-Y-Y);
- int D2XT = B2+B2;
- int D2YT = A2+A2;
-
- /* arc rectangle calculations */
- int movedown, moveout;
- int innerX = 0, prevx, prevy, W;
- Rect r1, r2;
- int result = 1;
-
- /* line descriptions */
- POINT p0, p1, p2;
+ /* Outer ellipse: e(x,y) = b*b*x*x + a*a*y*y - a*a*b*b */
+
+ int a = r.width / 2;
+ int b = r.height / 2;
+ int x = 0;
+ int y = b;
+ long a2 = a*a;
+ long b2 = b*b;
+ long xcrit = (3 * a2 / 4) + 1;
+ long ycrit = (3 * b2 / 4) + 1;
+ long t = b2 + a2 - 2*a2*b; /* t = e(x+1,y-1) */
+ long dxt = b2*(3+x+x);
+ long dyt = a2*(3-y-y);
+ int d2xt = b2+b2;
+ int d2yt = a2+a2;
+
+ int w = pbrushPen->ptPenWidth.x;
+
+ /* Inner ellipse: E(X,Y) = B*B*X*X + A*A*Y*Y - A*A*B*B */
+
+ int A = a-w > 0 ? a-w : 0;
+ int B = b-w > 0 ? b-w : 0;
+ int X = 0;
+ int Y = B;
+ long A2 = A*A;
+ long B2 = B*B;
+ long XCRIT = (3 * A2 / 4) + 1;
+ long YCRIT = (3 * B2 / 4) + 1;
+ long T = B2 + A2 - 2*A2*B; /* T = E(X+1,Y-1) */
+ long DXT = B2*(3+X+X);
+ long DYT = A2*(3-Y-Y);
+ int D2XT = B2+B2;
+ int D2YT = A2+A2;
+
+ /* arc rectangle calculations */
+ int movedown, moveout;
+ int innerX = 0, prevx, prevy, W;
+ Rect r1, r2;
+ int result = 1;
+
+ /* line descriptions */
+ POINT p0, p1, p2;
// START_DEBUG();
- /* if angles differ by 360 degrees or more, close the shape */
- if ((start_angle + 360 <= end_angle) ||
- (start_angle - 360 >= end_angle))
- {
- return app_draw_ellipse(g, r, pbrushPen);
- }
-
- /* make start_angle >= 0 and <= 360 */
- while (start_angle < 0)
- start_angle += 360;
- start_angle %= 360;
-
- /* make end_angle >= 0 and <= 360 */
- while (end_angle < 0)
- end_angle += 360;
- end_angle %= 360;
-
- /* draw nothing if the angles are equal */
- if (start_angle == end_angle)
- return 1;
-
- /* find arc wedge line end points */
- p1 = app_boundary_point(r, start_angle);
- p2 = app_boundary_point(r, end_angle);
- if (Chord)
- p0 = pt((p1.x+p2.x)/2,(p1.y+p2.y)/2);
- else
- p0 = pt(r.x + r.width/2, r.y + r.height/2);
-
- /* determine ellipse rectangles */
- r1.x = r.x + a;
- r1.y = r.y;
- r1.width = r.width & 1; /* i.e. if width is odd */
- r1.height = 1;
-
- r2 = r1;
- r2.y = r.y + r.height - 1;
-
- prevx = r1.x;
- prevy = r1.y;
-
- while (y > 0)
- {
- while (Y == y)
- {
- innerX = X;
-
- if (T + A2*Y < XCRIT) /* E(X+1,Y-1/2) <= 0 */
- {
- /* move outwards to encounter edge */
- X += 1;
- T += DXT;
- DXT += D2XT;
- }
- else if (T - B2*X >= YCRIT) /* e(x+1/2,y-1) > 0 */
- {
- /* drop down one line */
- Y -= 1;
- T += DYT;
- DYT += D2YT;
- }
- else {
- /* drop diagonally down and out */
- X += 1;
- Y -= 1;
- T += DXT + DYT;
- DXT += D2XT;
- DYT += D2YT;
- }
- }
-
- movedown = moveout = 0;
-
- W = x - innerX;
- if (r1.x + W < prevx)
- W = prevx - r1.x;
- if (W < w)
- W = w;
-
- if (t + a2*y < xcrit) /* e(x+1,y-1/2) <= 0 */
- {
- /* move outwards to encounter edge */
- x += 1;
- t += dxt;
- dxt += d2xt;
-
- moveout = 1;
- }
- else if (t - b2*x >= ycrit) /* e(x+1/2,y-1) > 0 */
- {
- /* drop down one line */
- y -= 1;
- t += dyt;
- dyt += d2yt;
-
- movedown = 1;
- }
- else {
- /* drop diagonally down and out */
- x += 1;
- y -= 1;
- t += dxt + dyt;
- dxt += d2xt;
- dyt += d2yt;
-
- movedown = 1;
- moveout = 1;
- }
-
- if (movedown) {
- if (r1.width == 0) {
- r1.x -= 1; r1.width += 2;
- r2.x -= 1; r2.width += 2;
- moveout = 0;
- }
-
- if (r1.x < r.x)
- r1.x = r2.x = r.x;
- if (r1.width > r.width)
- r1.width = r2.width = r.width;
- if (r1.y == r2.y-1) {
- r1.x = r2.x = r.x;
- r1.width = r2.width = r.width;
- }
-
- if ((r1.y < r.y+w) || (r1.x+W >= r1.x+r1.width-W))
- {
- result &= app_fill_arc_rect(g, r1,
- p0, p1, p2,
- start_angle, end_angle, pbrushPen, TRUE);
- result &= app_fill_arc_rect(g, r2,
- p0, p1, p2,
- start_angle, end_angle, pbrushPen, TRUE);
-
- prevx = r1.x;
- prevy = r1.y;
- }
- else if (r1.y+r1.height < r2.y)
- {
- /* draw distinct rectangles */
- result &= app_fill_arc_rect(g, rect(
- r1.x,r1.y,W,1),
- p0, p1, p2,
- start_angle, end_angle, pbrushPen, TRUE);
- result &= app_fill_arc_rect(g, rect(
- r1.x+r1.width-W,r1.y,W,1),
- p0, p1, p2,
- start_angle, end_angle, pbrushPen, TRUE);
- result &= app_fill_arc_rect(g, rect(
- r2.x,r2.y,W,1),
- p0, p1, p2,
- start_angle, end_angle, pbrushPen, TRUE);
- result &= app_fill_arc_rect(g, rect(
- r2.x+r2.width-W,r2.y,W,1),
- p0, p1, p2,
- start_angle, end_angle, pbrushPen, TRUE);
-
- prevx = r1.x;
- prevy = r1.y;
- }
-
- /* move down */
- r1.y += 1;
- r2.y -= 1;
- }
-
- if (moveout) {
- /* move outwards */
- r1.x -= 1; r1.width += 2;
- r2.x -= 1; r2.width += 2;
- }
- }
- if ((x <= a) && (prevy < r2.y)) {
- /* draw final lines */
- r1.height = r1.y+r1.height-r2.y;
- r1.y = r2.y;
-
- W = w;
- if (r.x + W != prevx)
- W = prevx - r.x;
- if (W < w)
- W = w;
-
- if (W+W >= r.width) {
- while (r1.height > 0) {
- result &= app_fill_arc_rect(g, rect(r.x,
- r1.y, r.width, 1), p0, p1, p2,
- start_angle, end_angle, pbrushPen, TRUE);
- r1.y += 1;
- r1.height -= 1;
- }
- return result;
- }
-
- while (r1.height > 0) {
- result &= app_fill_arc_rect(g, rect(r.x, r1.y,
- W, 1), p0, p1, p2,
- start_angle, end_angle, pbrushPen, TRUE);
- result &= app_fill_arc_rect(g, rect(r.x+r.width-W,
- r1.y, W, 1), p0, p1, p2,
- start_angle, end_angle, pbrushPen, TRUE);
- r1.y += 1;
- r1.height -= 1;
- }
- }
-
- return result;
+ /* if angles differ by 360 degrees or more, close the shape */
+ if ((start_angle + 360 <= end_angle) ||
+ (start_angle - 360 >= end_angle))
+ {
+ return app_draw_ellipse(g, r, pbrushPen);
+ }
+
+ /* make start_angle >= 0 and <= 360 */
+ while (start_angle < 0)
+ start_angle += 360;
+ start_angle %= 360;
+
+ /* make end_angle >= 0 and <= 360 */
+ while (end_angle < 0)
+ end_angle += 360;
+ end_angle %= 360;
+
+ /* draw nothing if the angles are equal */
+ if (start_angle == end_angle)
+ return 1;
+
+ /* find arc wedge line end points */
+ p1 = app_boundary_point(r, start_angle);
+ p2 = app_boundary_point(r, end_angle);
+ if (Chord)
+ p0 = pt((p1.x+p2.x)/2,(p1.y+p2.y)/2);
+ else
+ p0 = pt(r.x + r.width/2, r.y + r.height/2);
+
+ /* determine ellipse rectangles */
+ r1.x = r.x + a;
+ r1.y = r.y;
+ r1.width = r.width & 1; /* i.e. if width is odd */
+ r1.height = 1;
+
+ r2 = r1;
+ r2.y = r.y + r.height - 1;
+
+ prevx = r1.x;
+ prevy = r1.y;
+
+ while (y > 0)
+ {
+ while (Y == y)
+ {
+ innerX = X;
+
+ if (T + A2*Y < XCRIT) /* E(X+1,Y-1/2) <= 0 */
+ {
+ /* move outwards to encounter edge */
+ X += 1;
+ T += DXT;
+ DXT += D2XT;
+ }
+ else if (T - B2*X >= YCRIT) /* e(x+1/2,y-1) > 0 */
+ {
+ /* drop down one line */
+ Y -= 1;
+ T += DYT;
+ DYT += D2YT;
+ }
+ else
+ {
+ /* drop diagonally down and out */
+ X += 1;
+ Y -= 1;
+ T += DXT + DYT;
+ DXT += D2XT;
+ DYT += D2YT;
+ }
+ }
+
+ movedown = moveout = 0;
+
+ W = x - innerX;
+ if (r1.x + W < prevx)
+ W = prevx - r1.x;
+ if (W < w)
+ W = w;
+
+ if (t + a2*y < xcrit) /* e(x+1,y-1/2) <= 0 */
+ {
+ /* move outwards to encounter edge */
+ x += 1;
+ t += dxt;
+ dxt += d2xt;
+
+ moveout = 1;
+ }
+ else if (t - b2*x >= ycrit) /* e(x+1/2,y-1) > 0 */
+ {
+ /* drop down one line */
+ y -= 1;
+ t += dyt;
+ dyt += d2yt;
+
+ movedown = 1;
+ }
+ else
+ {
+ /* drop diagonally down and out */
+ x += 1;
+ y -= 1;
+ t += dxt + dyt;
+ dxt += d2xt;
+ dyt += d2yt;
+
+ movedown = 1;
+ moveout = 1;
+ }
+
+ if (movedown)
+ {
+ if (r1.width == 0)
+ {
+ r1.x -= 1;
+ r1.width += 2;
+ r2.x -= 1;
+ r2.width += 2;
+ moveout = 0;
+ }
+
+ if (r1.x < r.x)
+ r1.x = r2.x = r.x;
+ if (r1.width > r.width)
+ r1.width = r2.width = r.width;
+ if (r1.y == r2.y-1)
+ {
+ r1.x = r2.x = r.x;
+ r1.width = r2.width = r.width;
+ }
+
+ if ((r1.y < r.y+w) || (r1.x+W >= r1.x+r1.width-W))
+ {
+ result &= app_fill_arc_rect(g, r1,
+ p0, p1, p2,
+ start_angle, end_angle, pbrushPen, TRUE);
+ result &= app_fill_arc_rect(g, r2,
+ p0, p1, p2,
+ start_angle, end_angle, pbrushPen, TRUE);
+
+ prevx = r1.x;
+ prevy = r1.y;
+ }
+ else if (r1.y+r1.height < r2.y)
+ {
+ /* draw distinct rectangles */
+ result &= app_fill_arc_rect(g, rect(
+ r1.x,r1.y,W,1),
+ p0, p1, p2,
+ start_angle, end_angle, pbrushPen, TRUE);
+ result &= app_fill_arc_rect(g, rect(
+ r1.x+r1.width-W,r1.y,W,1),
+ p0, p1, p2,
+ start_angle, end_angle, pbrushPen, TRUE);
+ result &= app_fill_arc_rect(g, rect(
+ r2.x,r2.y,W,1),
+ p0, p1, p2,
+ start_angle, end_angle, pbrushPen, TRUE);
+ result &= app_fill_arc_rect(g, rect(
+ r2.x+r2.width-W,r2.y,W,1),
+ p0, p1, p2,
+ start_angle, end_angle, pbrushPen, TRUE);
+
+ prevx = r1.x;
+ prevy = r1.y;
+ }
+
+ /* move down */
+ r1.y += 1;
+ r2.y -= 1;
+ }
+
+ if (moveout)
+ {
+ /* move outwards */
+ r1.x -= 1;
+ r1.width += 2;
+ r2.x -= 1;
+ r2.width += 2;
+ }
+ }
+ if ((x <= a) && (prevy < r2.y))
+ {
+ /* draw final lines */
+ r1.height = r1.y+r1.height-r2.y;
+ r1.y = r2.y;
+
+ W = w;
+ if (r.x + W != prevx)
+ W = prevx - r.x;
+ if (W < w)
+ W = w;
+
+ if (W+W >= r.width)
+ {
+ while (r1.height > 0)
+ {
+ result &= app_fill_arc_rect(g, rect(r.x,
+ r1.y, r.width, 1), p0, p1, p2,
+ start_angle, end_angle, pbrushPen, TRUE);
+ r1.y += 1;
+ r1.height -= 1;
+ }
+ return result;
+ }
+
+ while (r1.height > 0)
+ {
+ result &= app_fill_arc_rect(g, rect(r.x, r1.y,
+ W, 1), p0, p1, p2,
+ start_angle, end_angle, pbrushPen, TRUE);
+ result &= app_fill_arc_rect(g, rect(r.x+r.width-W,
+ r1.y, W, 1), p0, p1, p2,
+ start_angle, end_angle, pbrushPen, TRUE);
+ r1.y += 1;
+ r1.height -= 1;
+ }
+ }
+
+ return result;
}
/* ReactOS Interface *********************************************************/
PBRUSH pbrush,
BOOL Pen)
{
- DWORD ROP = PATCOPY;
- RECTL DestRect;
- SURFACE *psurf;
- POINTL BrushOrigin;
- BOOL Ret = TRUE;
- PDC_ATTR pdcattr;
-
- ASSERT(pbrush);
-
- psurf = dc->dclevel.pSurface;
- if (psurf == NULL)
- {
- EngSetLastError(ERROR_INVALID_HANDLE);
- return 0;
- }
-
- if (!(pbrush->flAttrs & GDIBRUSH_IS_NULL))
- {
- pdcattr = dc->pdcattr;
-
- /* fix negative spaces */
- if (Width < 0)
- {
- XLeft += Width;
- Width = 0 - Width;
- }
- if (Height < 0)
- {
- YLeft += Height;
- Height = 0 - Height;
- }
-
- DestRect.left = XLeft;
- DestRect.right = XLeft + Width;
-
- DestRect.top = YLeft;
- DestRect.bottom = YLeft + Height;
-
- BrushOrigin.x = pbrush->ptOrigin.x;
- BrushOrigin.y = pbrush->ptOrigin.y;
-
- if (pdcattr->jROP2 == R2_XORPEN)
- ROP = PATINVERT;
- else
- ROP = PATCOPY;
-
- Ret = IntEngBitBlt(
- &psurf->SurfObj,
- NULL,
- NULL,
- dc->rosdc.CombinedClip,
- NULL,
- &DestRect,
- NULL,
- NULL,
- Pen ? &dc->eboLine.BrushObject : &dc->eboFill.BrushObject,
- &BrushOrigin,
- ROP3_TO_ROP4(ROP));
- }
-
- return (int)Ret;
+ DWORD ROP = ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY);
+ RECTL DestRect;
+ SURFACE *psurf;
+ POINTL BrushOrigin;
+ BOOL Ret = TRUE;
+ PDC_ATTR pdcattr;
+
+ ASSERT(pbrush);
+
+ psurf = dc->dclevel.pSurface;
+ if (psurf == NULL)
+ {
+ EngSetLastError(ERROR_INVALID_HANDLE);
+ return 0;
+ }
+
+ if (!(pbrush->flAttrs & GDIBRUSH_IS_NULL))
+ {
+ pdcattr = dc->pdcattr;
+
+ /* fix negative spaces */
+ if (Width < 0)
+ {
+ XLeft += Width;
+ Width = 0 - Width;
+ }
+ if (Height < 0)
+ {
+ YLeft += Height;
+ Height = 0 - Height;
+ }
+
+ DestRect.left = XLeft;
+ DestRect.right = XLeft + Width;
+
+ DestRect.top = YLeft;
+ DestRect.bottom = YLeft + Height;
+
+ BrushOrigin.x = pbrush->ptOrigin.x;
+ BrushOrigin.y = pbrush->ptOrigin.y;
+
+ if (pdcattr->jROP2 == R2_XORPEN)
+ ROP = ROP4_FROM_INDEX(R3_OPINDEX_PATINVERT);
+
+ Ret = IntEngBitBlt(
+ &psurf->SurfObj,
+ NULL,
+ NULL,
+ dc->rosdc.CombinedClip,
+ NULL,
+ &DestRect,
+ NULL,
+ NULL,
+ Pen ? &dc->eboLine.BrushObject : &dc->eboFill.BrushObject,
+ &BrushOrigin,
+ ROP);
+ }
+
+ return (int)Ret;
}
BOOL
double EndArc,
ARCTYPE arctype)
{
- PDC_ATTR pdcattr;
- PBRUSH pbrush;
- int Start = ceil(StartArc);
- int End = ceil(EndArc);
- BOOL Chord = (arctype == GdiTypeChord), ret;
-
- pdcattr = dc->pdcattr;
-
- pbrush = BRUSH_LockBrush(pdcattr->hbrush);
- if (!pbrush)
- {
- DPRINT1("FillArc Fail\n");
- EngSetLastError(ERROR_INTERNAL_ERROR);
- return FALSE;
- }
- // Sort out alignment here.
- ret = app_fill_arc(dc, rect( XLeft, YLeft, Width, Height),
- (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start,
- (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End,
- pbrush, Chord);
-
- BRUSH_UnlockBrush(pbrush);
- return ret;
+ PDC_ATTR pdcattr;
+ PBRUSH pbrush;
+ int Start = ceil(StartArc);
+ int End = ceil(EndArc);
+ BOOL Chord = (arctype == GdiTypeChord), ret;
+
+ pdcattr = dc->pdcattr;
+
+ pbrush = BRUSH_ShareLockBrush(pdcattr->hbrush);
+ if (!pbrush)
+ {
+ DPRINT1("FillArc Fail\n");
+ EngSetLastError(ERROR_INTERNAL_ERROR);
+ return FALSE;
+ }
+ // Sort out alignment here.
+ ret = app_fill_arc(dc, rect( XLeft, YLeft, Width, Height),
+ (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start,
+ (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End,
+ pbrush, Chord);
+
+ BRUSH_ShareUnlockBrush(pbrush);
+ return ret;
}
BOOL
ARCTYPE arctype,
PBRUSH pbrush)
{
- int Start = ceil(StartArc);
- int End = ceil(EndArc);
- BOOL Chord = (arctype == GdiTypeChord);
- // Sort out alignment here.
- return app_draw_arc(dc, rect( XLeft, YLeft, Width, Height),
- (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start,
- (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End,
- pbrush, Chord);
+ int Start = ceil(StartArc);
+ int End = ceil(EndArc);
+ BOOL Chord = (arctype == GdiTypeChord);
+ // Sort out alignment here.
+ return app_draw_arc(dc, rect( XLeft, YLeft, Width, Height),
+ (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -End : -Start,
+ (dc->dclevel.flPath & DCPATH_CLOCKWISE) ? -Start : -End,
+ pbrush, Chord);
}
BOOL
INT Height,
PBRUSH pbrush)
{
- return (BOOL)app_draw_ellipse(dc, rect( XLeft, YLeft, Width, Height), pbrush);
+ return (BOOL)app_draw_ellipse(dc, rect( XLeft, YLeft, Width, Height), pbrush);
}
BOOL
INT Height,
PBRUSH pbrush)
{
- return (BOOL)app_fill_ellipse(dc, rect( XLeft, YLeft, Width, Height), pbrush);
+ return (BOOL)app_fill_ellipse(dc, rect( XLeft, YLeft, Width, Height), pbrush);
}
BOOL
INT Hellipse,
PBRUSH pbrush)
{
- Rect r;
- int rx, ry; /* radius in x and y directions */
-
- // x y Width Height
- r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top));
- rx = Wellipse/2;
- ry = Hellipse/2;
-
- if (Wellipse > r.width)
- {
- if (Hellipse > r.height) // > W > H
- app_fill_ellipse(dc, r, pbrush);
- else // > W < H
- {
- app_fill_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse),
- 0, 180, pbrush,FALSE);
- app_fill_arc(dc, rect(r.x, Bottom - Hellipse - 1, r.width - 1, Hellipse),
- 180, 360, pbrush, FALSE);
- }
- }
- else if(Hellipse > r.height) // < W > H
- {
- app_fill_arc(dc, rect(r.x, r.y, Wellipse, r.height - 1),
- 90, 270, pbrush, FALSE);
- app_fill_arc(dc, rect(Right - Wellipse - 1, r.y, Wellipse, r.height - 1),
- 270, 90, pbrush,FALSE);
- }
- else // < W < H
- {
- app_fill_arc(dc, rect(r.x, r.y, rx+rx, ry+ry),
- 90, 180, pbrush, FALSE);
-
- app_fill_arc(dc, rect(r.x, r.y+r.height-ry-ry, rx+rx, ry+ry),
- 180, 270, pbrush, FALSE);
-
- app_fill_arc(dc, rect(r.x+r.width-rx-rx, r.y+r.height-ry-ry, rx+rx, ry+ry),
- 270, 360, pbrush,FALSE);
-
- app_fill_arc(dc, rect(r.x+r.width-rx-rx, r.y, rx+rx, ry+ry),
- 0, 90, pbrush,FALSE);
- }
- if (Wellipse < r.width)
- {
- app_fill_rect(dc, rect(r.x+rx, r.y, r.width-rx-rx, ry+1), pbrush, FALSE);
- app_fill_rect(dc, rect(r.x+rx, r.y+r.height-ry+1, r.width-rx-rx, ry-1), pbrush, FALSE);
- }
- if (Hellipse < r.height)
- {
- app_fill_rect(dc, rect(r.x, r.y+ry+1, r.width, r.height-ry-ry), pbrush, FALSE);
- }
-
- return TRUE;
+ Rect r;
+ int rx, ry; /* radius in x and y directions */
+
+ // x y Width Height
+ r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top));
+ rx = Wellipse/2;
+ ry = Hellipse/2;
+
+ if (Wellipse > r.width)
+ {
+ if (Hellipse > r.height) // > W > H
+ app_fill_ellipse(dc, r, pbrush);
+ else // > W < H
+ {
+ app_fill_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse),
+ 0, 180, pbrush,FALSE);
+ app_fill_arc(dc, rect(r.x, Bottom - Hellipse - 1, r.width - 1, Hellipse),
+ 180, 360, pbrush, FALSE);
+ }
+ }
+ else if(Hellipse > r.height) // < W > H
+ {
+ app_fill_arc(dc, rect(r.x, r.y, Wellipse, r.height - 1),
+ 90, 270, pbrush, FALSE);
+ app_fill_arc(dc, rect(Right - Wellipse - 1, r.y, Wellipse, r.height - 1),
+ 270, 90, pbrush,FALSE);
+ }
+ else // < W < H
+ {
+ app_fill_arc(dc, rect(r.x, r.y, rx+rx, ry+ry),
+ 90, 180, pbrush, FALSE);
+
+ app_fill_arc(dc, rect(r.x, r.y+r.height-ry-ry, rx+rx, ry+ry),
+ 180, 270, pbrush, FALSE);
+
+ app_fill_arc(dc, rect(r.x+r.width-rx-rx, r.y+r.height-ry-ry, rx+rx, ry+ry),
+ 270, 360, pbrush,FALSE);
+
+ app_fill_arc(dc, rect(r.x+r.width-rx-rx, r.y, rx+rx, ry+ry),
+ 0, 90, pbrush,FALSE);
+ }
+ if (Wellipse < r.width)
+ {
+ app_fill_rect(dc, rect(r.x+rx, r.y, r.width-rx-rx, ry+1), pbrush, FALSE);
+ app_fill_rect(dc, rect(r.x+rx, r.y+r.height-ry+1, r.width-rx-rx, ry-1), pbrush, FALSE);
+ }
+ if (Hellipse < r.height)
+ {
+ app_fill_rect(dc, rect(r.x, r.y+ry+1, r.width, r.height-ry-ry), pbrush, FALSE);
+ }
+
+ return TRUE;
}
INT Hellipse,
PBRUSH pbrushPen)
{
- Rect r;
- int rx, ry; /* radius in x and y directions */
- int w = pbrushPen->ptPenWidth.x;
-
- r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top));
- rx = Wellipse/2;
- ry = Hellipse/2;
-
- if (Wellipse > r.width)
- {
- if (Hellipse > r.height) // > W > H
- app_draw_ellipse(dc, r, pbrushPen);
- else // > W < H
- {
- app_draw_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse - 1),
+ Rect r;
+ int rx, ry; /* radius in x and y directions */
+ int w = pbrushPen->ptPenWidth.x;
+
+ r = rect( Left, Top, abs(Right-Left), abs(Bottom-Top));
+ rx = Wellipse/2;
+ ry = Hellipse/2;
+
+ if (Wellipse > r.width)
+ {
+ if (Hellipse > r.height) // > W > H
+ app_draw_ellipse(dc, r, pbrushPen);
+ else // > W < H
+ {
+ app_draw_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse - 1),
0, 180, pbrushPen, FALSE);
- app_draw_arc(dc, rect(r.x, Bottom - Hellipse, r.width - 1, Hellipse - 1),
+ app_draw_arc(dc, rect(r.x, Bottom - Hellipse, r.width - 1, Hellipse - 1),
180, 360, pbrushPen, FALSE);
- }
- }
- else if(Hellipse > r.height) // < W > H
- {
+ }
+ }
+ else if(Hellipse > r.height) // < W > H
+ {
app_draw_arc(dc, rect(r.x, r.y, Wellipse - 1, r.height - 1),
- 90, 270, pbrushPen, FALSE);
+ 90, 270, pbrushPen, FALSE);
app_draw_arc(dc, rect(Right - Wellipse, r.y, Wellipse - 1, r.height - 1),
- 270, 90, pbrushPen, FALSE);
- }
- else // < W < H
- {
- app_draw_arc(dc, rect(r.x, r.y, rx+rx, ry+ry),
- 90, 180, pbrushPen, FALSE);
-
- app_draw_arc(dc, rect(r.x,r.y+r.height-ry-ry,rx+rx,ry+ry),
- 180, 270, pbrushPen, FALSE);
-
- app_draw_arc(dc, rect(r.x+r.width-rx-rx, r.y+r.height-ry-ry, rx+rx, ry+ry),
- 270, 360, pbrushPen, FALSE);
-
- app_draw_arc(dc, rect(r.x+r.width-rx-rx,r.y,rx+rx,ry+ry),
- 0, 90, pbrushPen, FALSE);
- }
- if ( Hellipse < r.height)
- {
- app_fill_rect(dc, rect(r.x, r.y+ry+1, w, r.height-ry-ry), pbrushPen, TRUE);
-
-
- app_fill_rect(dc, rect(r.x+r.width-w, r.y+ry+1, w, r.height-ry-ry),
- pbrushPen, TRUE);
- }
- if ( Wellipse < r.width)
- {
- app_fill_rect(dc, rect(r.x+rx, r.y+r.height-w, r.width-rx-rx, w),
- pbrushPen, TRUE);
-
- app_fill_rect(dc, rect(r.x+rx, r.y, r.width-rx-rx, w), pbrushPen, TRUE);
- }
- return TRUE;
+ 270, 90, pbrushPen, FALSE);
+ }
+ else // < W < H
+ {
+ app_draw_arc(dc, rect(r.x, r.y, rx+rx, ry+ry),
+ 90, 180, pbrushPen, FALSE);
+
+ app_draw_arc(dc, rect(r.x,r.y+r.height-ry-ry,rx+rx,ry+ry),
+ 180, 270, pbrushPen, FALSE);
+
+ app_draw_arc(dc, rect(r.x+r.width-rx-rx, r.y+r.height-ry-ry, rx+rx, ry+ry),
+ 270, 360, pbrushPen, FALSE);
+
+ app_draw_arc(dc, rect(r.x+r.width-rx-rx,r.y,rx+rx,ry+ry),
+ 0, 90, pbrushPen, FALSE);
+ }
+ if ( Hellipse < r.height)
+ {
+ app_fill_rect(dc, rect(r.x, r.y+ry+1, w, r.height-ry-ry), pbrushPen, TRUE);
+
+
+ app_fill_rect(dc, rect(r.x+r.width-w, r.y+ry+1, w, r.height-ry-ry),
+ pbrushPen, TRUE);
+ }
+ if ( Wellipse < r.width)
+ {
+ app_fill_rect(dc, rect(r.x+rx, r.y+r.height-w, r.width-rx-rx, w),
+ pbrushPen, TRUE);
+
+ app_fill_rect(dc, rect(r.x+rx, r.y, r.width-rx-rx, w), pbrushPen, TRUE);
+ }
+ return TRUE;
}
projects / reactos.git / blobdiff