mirror of
https://github.com/gnustep/libs-back.git
synced 2025-04-22 23:42:16 +00:00
* Source/cairo/CairoGState.m
(-DPSsetstrokeadjust:): Implement. (-DPSinitgraphics): Set _strokeadjust to 1 by default. (-_adjustPath:): Implement new method that place the path to pixel boundaries. (-_setPath:): Change method definition adding fillOrClip argument. Use _adjustPath: method. (-DPSclip): Change call of _setPath: to new format. (-DPSeoclip): Ditto. (-DPSeofill): Ditto. (-DPSfill): Ditto. (-DPSstroke): Ditto. (-compositerect:op:): Ditto. * Headers/cairo/CairoGState.h: Define _strokeadjust variable. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@25299 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
stoyan
parent
ace7413c28
commit
de22ab0657
2 changed files with 91 additions and 8 deletions
|
|
@ -34,6 +34,8 @@
|
|||
@public
|
||||
cairo_t *_ct;
|
||||
CairoSurface *_surface;
|
||||
|
||||
int _strokeadjust;
|
||||
}
|
||||
|
||||
- (void) GSCurrentSurface: (CairoSurface **)surface: (int *)x : (int *)y;
|
||||
|
|
|
|||
|
|
@ -375,6 +375,8 @@
|
|||
cairo_set_line_width(_ct, 1.0);
|
||||
cairo_set_operator(_ct, CAIRO_OPERATOR_OVER);
|
||||
cairo_new_path(_ct);
|
||||
|
||||
_strokeadjust = 1;
|
||||
}
|
||||
|
||||
- (void) DPScurrentflat: (float *)flatness
|
||||
|
|
@ -525,20 +527,99 @@
|
|||
|
||||
- (void) DPSsetstrokeadjust: (int)b
|
||||
{
|
||||
// FIXME
|
||||
_strokeadjust = b;
|
||||
}
|
||||
|
||||
/*
|
||||
* Path operations
|
||||
*/
|
||||
|
||||
- (void) _setPath
|
||||
- (void) _adjustPath: (float)offs
|
||||
{
|
||||
unsigned count = [path elementCount];
|
||||
NSBezierPathElement type, last_type = NSNotFound;
|
||||
NSPoint points[3], last_points[3];
|
||||
unsigned i;
|
||||
|
||||
last_points[0].x = 0.0;
|
||||
last_points[0].y = 0.0;
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
type = [path elementAtIndex:i associatedPoints:points];
|
||||
|
||||
if (type == NSCurveToBezierPathElement) break;
|
||||
|
||||
if (type == NSClosePathBezierPathElement)
|
||||
{
|
||||
[path elementAtIndex:0 associatedPoints:points];
|
||||
if (fabs(last_points[0].x - points[0].x) < 1.0)
|
||||
{
|
||||
last_points[0].x = floorf(last_points[0].x) + offs;
|
||||
points[0].x = last_points[0].x;
|
||||
}
|
||||
else if (fabs(last_points[0].y - points[0].y) < 1.0)
|
||||
{
|
||||
last_points[0].y = floorf(last_points[0].y) + offs;
|
||||
points[0].y = last_points[0].y;
|
||||
}
|
||||
[path setAssociatedPoints:points atIndex:0];
|
||||
[path setAssociatedPoints:last_points atIndex:i-1];
|
||||
}
|
||||
else if (fabs(last_points[0].x - points[0].x) < 1.0)
|
||||
{ // vertical
|
||||
points[0].x = floorf(points[0].x) + offs;
|
||||
points[0].y = floorf(points[0].y) + 0.0;
|
||||
[path setAssociatedPoints:points atIndex:i];
|
||||
if (type == NSLineToBezierPathElement)
|
||||
{
|
||||
last_points[0].x = points[0].x;
|
||||
[path setAssociatedPoints:last_points atIndex:i-1];
|
||||
}
|
||||
}
|
||||
else if (fabs(last_points[0].y - points[0].y) < 1.0)
|
||||
{ // horizontal
|
||||
points[0].x = floorf(points[0].x) + 0.0;
|
||||
points[0].y = floorf(points[0].y) + offs;
|
||||
[path setAssociatedPoints:points atIndex:i];
|
||||
if (type == NSLineToBezierPathElement)
|
||||
{
|
||||
last_points[0].y = points[0].y;
|
||||
[path setAssociatedPoints:last_points atIndex:i-1];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
points[0].x = floorf(points[0].x);
|
||||
points[0].y = floorf(points[0].y);
|
||||
[path setAssociatedPoints:points atIndex:i];
|
||||
}
|
||||
|
||||
last_type = type;
|
||||
last_points[0].x = points[0].x;
|
||||
last_points[0].y = points[0].y;
|
||||
}
|
||||
}
|
||||
|
||||
- (void) _setPath: (BOOL)fillOrClip
|
||||
{
|
||||
unsigned count = [path elementCount];
|
||||
unsigned i;
|
||||
SEL elmsel = @selector(elementAtIndex:associatedPoints:);
|
||||
IMP elmidx = [path methodForSelector: elmsel];
|
||||
|
||||
if (_strokeadjust)
|
||||
{
|
||||
float offs;
|
||||
|
||||
if ((remainderf(cairo_get_line_width(_ct), 2.0) == 0.0)
|
||||
|| fillOrClip == YES)
|
||||
offs = 0.0;
|
||||
else
|
||||
offs = 0.5;
|
||||
|
||||
[self _adjustPath:offs];
|
||||
}
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
NSBezierPathElement type;
|
||||
|
|
@ -571,7 +652,7 @@
|
|||
{
|
||||
if (_ct)
|
||||
{
|
||||
[self _setPath];
|
||||
[self _setPath:YES];
|
||||
cairo_clip(_ct);
|
||||
}
|
||||
}
|
||||
|
|
@ -580,7 +661,7 @@
|
|||
{
|
||||
if (_ct)
|
||||
{
|
||||
[self _setPath];
|
||||
[self _setPath:YES];
|
||||
cairo_set_fill_rule(_ct, CAIRO_FILL_RULE_EVEN_ODD);
|
||||
cairo_clip(_ct);
|
||||
cairo_set_fill_rule(_ct, CAIRO_FILL_RULE_WINDING);
|
||||
|
|
@ -591,7 +672,7 @@
|
|||
{
|
||||
if (_ct)
|
||||
{
|
||||
[self _setPath];
|
||||
[self _setPath:YES];
|
||||
cairo_set_fill_rule(_ct, CAIRO_FILL_RULE_EVEN_ODD);
|
||||
cairo_fill(_ct);
|
||||
cairo_set_fill_rule(_ct, CAIRO_FILL_RULE_WINDING);
|
||||
|
|
@ -602,7 +683,7 @@
|
|||
{
|
||||
if (_ct)
|
||||
{
|
||||
[self _setPath];
|
||||
[self _setPath:YES];
|
||||
cairo_fill(_ct);
|
||||
}
|
||||
}
|
||||
|
|
@ -619,7 +700,7 @@
|
|||
{
|
||||
if (_ct)
|
||||
{
|
||||
[self _setPath];
|
||||
[self _setPath:NO];
|
||||
cairo_stroke(_ct);
|
||||
}
|
||||
}
|
||||
|
|
@ -967,7 +1048,7 @@ _set_op(cairo_t *ct, NSCompositingOperation op)
|
|||
// This is almost a rectclip::::, but the path stays unchanged.
|
||||
path = [NSBezierPath bezierPathWithRect: aRect];
|
||||
[path transformUsingAffineTransform: ctm];
|
||||
[self _setPath];
|
||||
[self _setPath:YES];
|
||||
cairo_clip(_ct);
|
||||
cairo_paint(_ct);
|
||||
cairo_restore(_ct);
|
||||
|
|
|
|||
Loading…
Reference in a new issue